[core] Resolve outbound channel targets for all role types

teo · teo · commit 48bd01b06090 · 2018-10-26T13:05:34.000+02:00
diff --git a/core/workflow/aggregatorrole.go b/core/workflow/aggregatorrole.go
@@ -55,6 +55,7 @@ func (r *aggregatorRole) UnmarshalYAML(unmarshal func(interface{}) error) (err e
 	*r = role
 	for _, v := range r.Roles {
 		v.setParent(r)
+		v.resolveOutboundChannelTargets()
 	}
 	return
 }
diff --git a/core/workflow/iteratorrole.go b/core/workflow/iteratorrole.go
@@ -26,7 +26,8 @@ package workflow
 
 import (
 	"errors"
-			"strconv"
+	"strconv"
+
 	"github.com/AliceO2Group/Control/core/task"
 	"github.com/AliceO2Group/Control/core/task/constraint"
 )
@@ -116,6 +117,15 @@ func (f *iteratorInfo) UnmarshalYAML(unmarshal func(interface{}) error) (err err
 	return
 }
 
+func (i *iteratorRole) resolveOutboundChannelTargets() {
+	if i == nil || i.Roles == nil {
+		return
+	}
+	for _, r := range i.Roles {
+		r.resolveOutboundChannelTargets()
+	}
+}
+
 func (i *iteratorRole) expandTemplate() (err error) {
 	values := make(templateMap)
 
diff --git a/core/workflow/role.go b/core/workflow/role.go
@@ -47,6 +47,7 @@ type Role interface {
 	GenerateTaskDescriptors() task.Descriptors
 	getConstraints() constraint.Constraints
 	setParent(role Updatable)
+	resolveOutboundChannelTargets()
 }
 
 type Updatable interface {
diff --git a/core/workflow/rolebase.go b/core/workflow/rolebase.go
@@ -25,17 +25,18 @@
 package workflow
 
 import (
-	"github.com/AliceO2Group/Control/core/task/channel"
-	"github.com/AliceO2Group/Control/common/logger"
-	"github.com/sirupsen/logrus"
-	"github.com/jinzhu/copier"
 	"bytes"
 	"fmt"
 	"text/template"
 
+	"github.com/AliceO2Group/Control/common/logger"
+	"github.com/AliceO2Group/Control/core/task/channel"
+	"github.com/jinzhu/copier"
+	"github.com/sirupsen/logrus"
+
 	"github.com/AliceO2Group/Control/core/task"
-	"github.com/pborman/uuid"
 	"github.com/AliceO2Group/Control/core/task/constraint"
+	"github.com/pborman/uuid"
 )
 
 var log = logger.New(logrus.StandardLogger(), "workflow")
@@ -79,8 +80,6 @@ func (r *roleBase) UnmarshalYAML(unmarshal func(interface{}) error) (err error)
 	if err == nil {
 		*r = roleBase(role)
 	}
-
-	r.resolveOutboundChannelTargets()
 	return
 }
 
@@ -102,9 +101,12 @@ func (r *roleBase) resolveOutboundChannelTargets() {
 			}
 			return p.GetPath()
 		},
-		"up": func(levels uint) string {
+		"up": func(levels int) string {
+			if levels <= 0 {
+				return r.GetPath()
+			}
 			var p _parentRole = r
-			for i := levels - 1; i >= 0; i-- {
+			for i := 0; i < levels; i++ {
 				p = p.GetParentRole()
 				if p == nil {
 					log.WithFields(logrus.Fields{"error": "role has no ancestor", "role": r.GetPath()}).Error("workflow configuration error")
@@ -115,7 +117,7 @@ func (r *roleBase) resolveOutboundChannelTargets() {
 		},
 	}
 
-	for _, ch := range r.Connect {
+	for i, ch := range r.Connect {
 		tmpl := template.New(r.GetPath())
 		parsed, err := tmpl.Funcs(funcMap).Parse(ch.Target)
 		if err != nil {
@@ -129,7 +131,7 @@ func (r *roleBase) resolveOutboundChannelTargets() {
 			continue
 		}
 		// Finally we write the result back to the target string
-		ch.Target = buf.String()
+		r.Connect[i].Target = buf.String()
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ func (r *aggregatorRole) UnmarshalYAML(unmarshal func(interface{}) error) (err e`
`55`	`55`	`*r = role`
`56`	`56`	`for _, v := range r.Roles {`
`57`	`57`	`v.setParent(r)`
	`58`	`+ v.resolveOutboundChannelTargets()`
`58`	`59`	`}`
`59`	`60`	`return`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ type Role interface {`
`47`	`47`	`GenerateTaskDescriptors() task.Descriptors`
`48`	`48`	`getConstraints() constraint.Constraints`
`49`	`49`	`setParent(role Updatable)`
	`50`	`+ resolveOutboundChannelTargets()`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`type Updatable interface {`