Merge "Modify describe method of core-library networking classes"

This commit is contained in:
Jenkins 2015-12-09 09:59:46 +00:00 committed by Gerrit Code Review
commit b4df107b3e
4 changed files with 29 additions and 21 deletions

@ -39,17 +39,17 @@ Workflow:
Then:
- $reporter: $.environment.reporter
- $.network.deploy()
- $networkData: $.network.describe()
- $aapPortName: format('AllowedAddressPairsPort-{0}', $.id())
- $template:
heat_template_version: '2013-05-23'
resources:
$aapPortName:
type: 'OS::Neutron::Port'
properties:
network_id: $.network.describe().netRef
network_id: $networkData.netId
replacement_policy: AUTO
fixed_ips:
- subnet_id: $.network.describe().subnetRef
- subnet_id: $networkData.subnetId
outputs:
$aapPortName+'-virtualIp':
value:
@ -58,7 +58,7 @@ Workflow:
- $.environment.stack.updateTemplate($template)
- If: $.assignFloatingIp
Then:
- $extNetId: $.network.describe().floatingIpNeRef
- $extNetId: $networkData.floatingIpNetId
- $fip_name: format('Shared-Floating-ip-{0}', $.id())
- $template:

@ -107,10 +107,10 @@ Workflow:
Body:
- $.deploy()
- $fipName: null
- $floatingIpNeRef: null
- $floatingIpNetRef: null
- If: $assignFloatingIp
Then:
- $floatingIpNeRef: $._externalNetworkId
- $floatingIpNetRef: $._externalNetworkId
- $fipName: format('fip-{0}-{1}', $.id(), $instance.name)
- Return: $.joinInstanceToNetwork(
@ -120,17 +120,21 @@ Workflow:
netRef => $._internalNetworkId,
subnetRef => $._internalSubnetworkId,
floatingIpResourceName => $fipName,
floatingIpNeRef => $floatingIpNeRef
floatingIpNetRef => $floatingIpNetRef
)
describe:
Body:
- $.deploy()
- $subnet: $._netExplorer.listSubnetworks().where(
$.network_id = $this._internalNetworkId).first()
- Return:
provider: Neutron
netRef: $._internalNetworkId
subnetRef: $._internalSubnetworkId
floatingIpNeRef: $._externalNetworkId
netId: $._internalNetworkId
netName: $.internalNetworkName
subnetId: $._internalSubnetworkId
cidr: $subnet.cidr
dns: $._netExplorer.getDefaultDns()
gateway: $subnet.gateway_ip
floatingIpNetId: $._externalNetworkId

@ -153,7 +153,7 @@ Methods:
netRef => $netRef,
subnetRef => $subnetRef,
floatingIpResourceName => $fipName,
floatingIpNeRef => $extNetId
floatingIpNetRef => $extNetId
)
# (sjmc7) This is a workaround for https://bugs.launchpad.net/heat/+bug/1299259
@ -172,13 +172,17 @@ Methods:
describe:
Body:
- $.deploy()
- $subnet: $._netExplorer.listSubnetworks().where(
$.network_id = $this.openstackId).first()
- Return:
provider: Neutron
netRef:
get_resource: $._getNetworkName()
subnetRef:
get_resource: $._getSubnetName()
floatingIpNeRef: $._getExternalNetId()
netName: $.name
netId: $.openstackId
subnetId: $subnet.id
cidr: $subnet.cidr
dns: $.dnsNameservers
gateway: $subnet.gateway_ip
floatingIpNetId: $._getExternalNetId()
_getRouterInterfaceName:

@ -35,7 +35,7 @@ Methods:
Contract: $
- floatingIpResourceName:
Contract: $.string()
- floatingIpNeRef:
- floatingIpNetRef:
Contract: $
Body:
- $portName: format('port-{0}-{1}', $.id(), $instance.name)
@ -74,7 +74,7 @@ Methods:
- $patchTemplate: $patchTemplate.mergeWith($template)
- $instanceFipOutput: null
- If: $floatingIpResourceName != null and $floatingIpNeRef != null
- If: $floatingIpResourceName != null and $floatingIpNetRef != null
Then:
- $instanceFipOutput: $instance.name + '-floatingIPaddress'
- $template:
@ -82,7 +82,7 @@ Methods:
$floatingIpResourceName:
type: 'OS::Neutron::FloatingIP'
properties:
floating_network: $floatingIpNeRef
floating_network: $floatingIpNetRef
port_id:
get_resource: $portName
outputs: