From f4cf8b36a684447fcaa45c1e9c72e5ce689c688b Mon Sep 17 00:00:00 2001 From: Snihyr Kostyantyn Date: Wed, 31 Aug 2016 13:03:39 +0300 Subject: [PATCH] Fix NetworkExplorer creation After I4dbf40c65042e9a354f3bfadfcd63a63e6e3e418 NetworkExplorer require CloudRegion subclass in owners chain Change-Id: I238e3bd6792312e780bd565c9cd9cf2735f5e25c Closes-bug: #1620271 --- meta/io.murano/Classes/resources/ExistingNeutronNetwork.yaml | 5 ++--- meta/io.murano/Classes/resources/NeutronNetworkBase.yaml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/io.murano/Classes/resources/ExistingNeutronNetwork.yaml b/meta/io.murano/Classes/resources/ExistingNeutronNetwork.yaml index b7c7e4d0..bb4bbd78 100644 --- a/meta/io.murano/Classes/resources/ExistingNeutronNetwork.yaml +++ b/meta/io.murano/Classes/resources/ExistingNeutronNetwork.yaml @@ -38,8 +38,7 @@ Properties: Workflow: initialize: Body: - - $environment: $.find(std:Environment).require() - - $._netExplorer: new(sys:NetworkExplorer, $environment) + - $._netExplorer: new(sys:NetworkExplorer, $this.getRegion()) - $._networks: null - $._subnetworks: null - $._ports: null @@ -99,7 +98,7 @@ Workflow: _getNetworks: Body: - - If: $._networks = null + - If: not $._networks Then: $._networks: $._netExplorer.listNetworks() - Return: $._networks diff --git a/meta/io.murano/Classes/resources/NeutronNetworkBase.yaml b/meta/io.murano/Classes/resources/NeutronNetworkBase.yaml index 9e93c2d0..ca7d63d7 100644 --- a/meta/io.murano/Classes/resources/NeutronNetworkBase.yaml +++ b/meta/io.murano/Classes/resources/NeutronNetworkBase.yaml @@ -24,7 +24,7 @@ Methods: Body: - $._environment: $.find(std:Environment) - $._region: $.getRegion() - - $._netExplorer: new(sys:NetworkExplorer, $this) + - $._netExplorer: new(sys:NetworkExplorer, $this._region) - $._securityGroupsEnabled: $._netExplorer.listNeutronExtensions().alias.contains('security-group') joinInstanceToNetwork: