openstack
/
murano
Code Issues Proposed changes

Merge "Fix NetworkExplorer creation"

This commit is contained in:
Jenkins 2016-09-12 14:05:58 +00:00 committed by Gerrit Code Review
parent 379930313c f4cf8b36a6
commit b2e16d8627
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/io.murano/Classes/resources/ExistingNeutronNetwork.yaml
View File

@ -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

2
meta/io.murano/Classes/resources/NeutronNetworkBase.yaml
View File

@ -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: