diff --git a/meta/io.murano/Classes/Application.yaml b/meta/io.murano/Classes/Application.yaml index e36b1eb2..173eaa8b 100644 --- a/meta/io.murano/Classes/Application.yaml +++ b/meta/io.murano/Classes/Application.yaml @@ -3,7 +3,7 @@ Namespaces: Name: Application -Workflow: +Methods: reportDeployed: Arguments: - title: diff --git a/meta/io.murano/Classes/Environment.yaml b/meta/io.murano/Classes/Environment.yaml index 302d5903..26a1c04e 100644 --- a/meta/io.murano/Classes/Environment.yaml +++ b/meta/io.murano/Classes/Environment.yaml @@ -38,7 +38,7 @@ Properties: Contract: $.class(sys:StatusReporter) Usage: Runtime -Workflow: +Methods: initialize: Body: - $this.agentListener: new(sys:AgentListener, name => $.name) diff --git a/meta/io.murano/Classes/Object.yaml b/meta/io.murano/Classes/Object.yaml index 1d35eaad..ccc23c91 100644 --- a/meta/io.murano/Classes/Object.yaml +++ b/meta/io.murano/Classes/Object.yaml @@ -2,5 +2,5 @@ Namespaces: =: io.murano Name: Object -Workflow: +Methods: initialize: diff --git a/meta/io.murano/Classes/SecurityGroupManager.yaml b/meta/io.murano/Classes/SecurityGroupManager.yaml index fc389dfd..9297e682 100644 --- a/meta/io.murano/Classes/SecurityGroupManager.yaml +++ b/meta/io.murano/Classes/SecurityGroupManager.yaml @@ -13,7 +13,7 @@ Properties: Usage: Runtime Default: format('MuranoSecurityGroup-{0}', $.environment.name) -Workflow: +Methods: addGroupIngress: Arguments: - rules: diff --git a/meta/io.murano/Classes/resources/Instance.yaml b/meta/io.murano/Classes/resources/Instance.yaml index e4388d31..346c231d 100644 --- a/meta/io.murano/Classes/resources/Instance.yaml +++ b/meta/io.murano/Classes/resources/Instance.yaml @@ -45,7 +45,7 @@ Properties: Contract: $.string() Default: null -Workflow: +Methods: initialize: Body: - $.environment: $.find(std:Environment).require() diff --git a/meta/io.murano/Classes/resources/LinuxInstance.yaml b/meta/io.murano/Classes/resources/LinuxInstance.yaml index 0b3e666c..62aa5e1d 100644 --- a/meta/io.murano/Classes/resources/LinuxInstance.yaml +++ b/meta/io.murano/Classes/resources/LinuxInstance.yaml @@ -6,7 +6,7 @@ Name: LinuxInstance Extends: Instance -Workflow: +Methods: createDefaultInstanceSecurityGroupRules: Arguments: - groupName: diff --git a/meta/io.murano/Classes/resources/LinuxMuranoInstance.yaml b/meta/io.murano/Classes/resources/LinuxMuranoInstance.yaml index 04561f0e..32d387d9 100644 --- a/meta/io.murano/Classes/resources/LinuxMuranoInstance.yaml +++ b/meta/io.murano/Classes/resources/LinuxMuranoInstance.yaml @@ -8,7 +8,7 @@ Name: LinuxMuranoInstance Extends: - LinuxInstance -Workflow: +Methods: prepareUserData: Body: - $environment: $.find(std:Environment).require() diff --git a/meta/io.murano/Classes/resources/LinuxUDInstance.yaml b/meta/io.murano/Classes/resources/LinuxUDInstance.yaml index 84896739..53a68667 100644 --- a/meta/io.murano/Classes/resources/LinuxUDInstance.yaml +++ b/meta/io.murano/Classes/resources/LinuxUDInstance.yaml @@ -13,7 +13,7 @@ Properties: Usage: InOut Default: null -Workflow: +Methods: prepareUserData: Body: - Return: $.customUserData diff --git a/meta/io.murano/Classes/resources/Network.yaml b/meta/io.murano/Classes/resources/Network.yaml index 49297712..2d57315d 100644 --- a/meta/io.murano/Classes/resources/Network.yaml +++ b/meta/io.murano/Classes/resources/Network.yaml @@ -3,7 +3,7 @@ Namespaces: Name: Network -Workflow: +Methods: getNetworkReference: getSubnetReference: getExternalNetId: diff --git a/meta/io.murano/Classes/resources/NeutronNetwork.yaml b/meta/io.murano/Classes/resources/NeutronNetwork.yaml index f7fef216..63df7867 100644 --- a/meta/io.murano/Classes/resources/NeutronNetwork.yaml +++ b/meta/io.murano/Classes/resources/NeutronNetwork.yaml @@ -35,7 +35,7 @@ Properties: Contract: $.bool().notNull() Default: true -Workflow: +Methods: initialize: Body: - $.environment: $.find(std:Environment).require() diff --git a/meta/io.murano/Classes/resources/WindowsInstance.yaml b/meta/io.murano/Classes/resources/WindowsInstance.yaml index e4d66393..4e31c59b 100644 --- a/meta/io.murano/Classes/resources/WindowsInstance.yaml +++ b/meta/io.murano/Classes/resources/WindowsInstance.yaml @@ -6,7 +6,7 @@ Name: WindowsInstance Extends: Instance -Workflow: +Methods: createDefaultInstanceSecurityGroupRules: Arguments: - groupName: diff --git a/murano/dsl/class_loader.py b/murano/dsl/class_loader.py index a7ffad48..304bc014 100644 --- a/murano/dsl/class_loader.py +++ b/murano/dsl/class_loader.py @@ -75,7 +75,8 @@ class MuranoClassLoader(object): spec = typespec.PropertySpec(property_spec, ns_resolver) type_obj.add_property(property_name, spec) - for method_name, payload in data.get('Workflow', {}).iteritems(): + methods = data.get('Methods') or data.get('Workflow') or {} + for method_name, payload in methods.iteritems(): type_obj.add_method(method_name, payload) self._loaded_types[name] = type_obj