openstack
/
heat
Code Issues Proposed changes

Delete fixed_ips if it's empty list 

If neutronclient gets fixed_ips = [], created port will not get assigned
ip address. In current patch fixed_ips will be deleted from properties,
if it is empty list. So created port always gets assigned ip address.

Change-Id: I8344180b07ffb61019264f44d23aa400aa1ace31
Closes-bug: #1271597
This commit is contained in:
Sergey Kraynev 2014-01-23 09:37:28 -05:00
parent 2361051705
commit 0cfdd6e280
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/engine/resources/neutron/port.py
View File

@ -162,6 +162,9 @@ class Port(neutron.NeutronResource):
self._prepare_list_properties(props)
if not props['fixed_ips']:
del(props['fixed_ips'])
port = self.neutron().create_port({'port': props})['port']
self.resource_id_set(port['id'])

9
heat/tests/test_neutron.py
View File

@ -1770,7 +1770,6 @@ class NeutronPortTest(HeatTestCase):
neutronclient.Client.create_port({'port': {
'network_id': u'net1234',
'name': utils.PhysName('test_stack', 'port'),
'fixed_ips': [],
'admin_state_up': True}}
).AndReturn({'port': {
"status": "BUILD",
@ -1780,7 +1779,11 @@ class NeutronPortTest(HeatTestCase):
'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
).AndReturn({'port': {
"status": "ACTIVE",
"id": "fc68ea2c-b60b-4b4f-bd82-94ec81110766"
"id": "fc68ea2c-b60b-4b4f-bd82-94ec81110766",
"fixed_ips": {
"subnet_id": "d0e971a6-a6b4-4f4c-8c88-b75e9c120b7e",
"ip_address": "10.0.0.2"
}
}})
self.m.ReplayAll()
@ -1803,7 +1806,6 @@ class NeutronPortTest(HeatTestCase):
'mac_address': u'00-B0-D0-86-BB-F7'
}],
'name': utils.PhysName('test_stack', 'port'),
'fixed_ips': [],
'admin_state_up': True}}
).AndReturn({'port': {
"status": "BUILD",
@ -1834,7 +1836,6 @@ class NeutronPortTest(HeatTestCase):
'ip_address': u'10.0.3.21',
}],
'name': utils.PhysName('test_stack', 'port'),
'fixed_ips': [],
'admin_state_up': True}}
).AndReturn({'port': {
"status": "BUILD",