openstack
/
deb-heat
Code Issues Proposed changes

Merge "Allow update inplace for allowed_address_pairs" into stable/newton

This commit is contained in:
Jenkins 2016-09-20 08:46:34 +00:00 committed by Gerrit Code Review
parent 80081db9f8 5443453fbb
commit 663d6e6f21
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,7 +250,8 @@ class Port(neutron.NeutronResource):
]
),
},
)
),
update_allowed=True,
),
VNIC_TYPE: properties.Schema(
properties.Schema.STRING,

11
heat/tests/openstack/neutron/test_neutron_port.py
View File

@ -933,7 +933,7 @@ class UpdatePortTest(common.HeatTestCase):
return_value=fake_groups_list)
props = {'network_id': u'net1234',
'name': utils.PhysName(stack.name, 'port'),
'name': str(utils.PhysName(stack.name, 'port')),
'admin_state_up': True,
'device_owner': u'network:dhcp'}
@ -970,6 +970,15 @@ class UpdatePortTest(common.HeatTestCase):
update_props)())
update_port.assset_called_once_with(update_dict)
# check, that update does not cause of Update Replace
create_snippet = rsrc_defn.ResourceDefinition(port.name, port.type(),
props)
after_props, before_props = port._prepare_update_props(update_snippet,
create_snippet)
self.assertIsNotNone(
port.update_template_diff_properties(after_props, before_props))
# update with empty prop_diff
scheduler.TaskRunner(port.handle_update, update_snippet, {}, {})()
self.assertEqual(1, update_port.call_count)