Render operation outputs

Closes #118, #119
tliron · Dec 22, 2022 · d573cd9 · d573cd9
1 parent 56a2ebf
commit d573cd9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/tosca/grammars/tosca_v2_0/interface-assignment.go b/tosca/grammars/tosca_v2_0/interface-assignment.go
@@ -73,19 +73,19 @@ func (self *InterfaceAssignment) GetDefinitionForRelationship(relationship *Rela
 
 func (self *InterfaceAssignment) RenderForNodeTemplate(nodeTemplate *NodeTemplate, definition *InterfaceDefinition) {
 	self.Inputs.RenderInputs(definition.InputDefinitions, self.Context.FieldChild("inputs", nil))
-	self.Operations.Render(definition.OperationDefinitions, self.Context.FieldChild("operations", nil))
+	self.Operations.RenderForNodeTemplate(nodeTemplate, definition.OperationDefinitions, self.Context.FieldChild("operations", nil))
 	self.Notifications.RenderForNodeTemplate(nodeTemplate, definition.NotificationDefinitions, self.Context.FieldChild("notifications", nil))
 }
 
 func (self *InterfaceAssignment) RenderForRelationship(relationship *RelationshipAssignment, definition *InterfaceDefinition) {
 	self.Inputs.RenderInputs(definition.InputDefinitions, self.Context.FieldChild("inputs", nil))
-	self.Operations.Render(definition.OperationDefinitions, self.Context.FieldChild("operations", nil))
+	self.Operations.RenderForRelationship(relationship, definition.OperationDefinitions, self.Context.FieldChild("operations", nil))
 	self.Notifications.RenderForRelationship(relationship, definition.NotificationDefinitions, self.Context.FieldChild("notifications", nil))
 }
 
 func (self *InterfaceAssignment) RenderForGroup(definition *InterfaceDefinition) {
 	self.Inputs.RenderInputs(definition.InputDefinitions, self.Context.FieldChild("inputs", nil))
-	self.Operations.Render(definition.OperationDefinitions, self.Context.FieldChild("operations", nil))
+	self.Operations.RenderForGroup(definition.OperationDefinitions, self.Context.FieldChild("operations", nil))
 	self.Notifications.RenderForGroup(definition.NotificationDefinitions, self.Context.FieldChild("notifications", nil))
 }
 

diff --git a/tosca/grammars/tosca_v2_0/operation-assignment.go b/tosca/grammars/tosca_v2_0/operation-assignment.go
@@ -102,7 +102,28 @@ func (self OperationAssignments) CopyUnassigned(assignments OperationAssignments
 	}
 }
 
-func (self OperationAssignments) Render(definitions OperationDefinitions, context *tosca.Context) {
+func (self OperationAssignments) RenderForNodeTemplate(nodeTemplate *NodeTemplate, definitions OperationDefinitions, context *tosca.Context) {
+	self.render(definitions, context)
+	for _, assignment := range self {
+		assignment.Outputs.RenderForNodeTemplate(nodeTemplate)
+	}
+}
+
+func (self OperationAssignments) RenderForRelationship(relationship *RelationshipAssignment, definitions OperationDefinitions, context *tosca.Context) {
+	self.render(definitions, context)
+	for _, assignment := range self {
+		assignment.Outputs.RenderForRelationship(relationship)
+	}
+}
+
+func (self OperationAssignments) RenderForGroup(definitions OperationDefinitions, context *tosca.Context) {
+	self.render(definitions, context)
+	for _, assignment := range self {
+		assignment.Outputs.RenderForGroup()
+	}
+}
+
+func (self OperationAssignments) render(definitions OperationDefinitions, context *tosca.Context) {
 	for key, definition := range definitions {
 		assignment, ok := self[key]