diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-25 03:23:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-25 03:23:03 +0000 |
| commit | 0fa75da8248b6b3281e283dea895f4f09f60469a (patch) | |
| tree | d263392019b2582977aa31444213f52c4d203c9e | |
| parent | 13aaa7e7aeeb51ebdb1b4284b72aac2ddf2edc70 (diff) | |
| parent | 97d8f9c3d6ddfe1195217a12a1d5fa3ffe262379 (diff) | |
| download | heat-0fa75da8248b6b3281e283dea895f4f09f60469a.tar.gz | |
Merge "Don't pass value_specs when creating internal port" into stable/mitaka
| -rw-r--r-- | heat/engine/resources/openstack/nova/server_network_mixin.py | 3 | ||||
| -rw-r--r-- | heat/tests/openstack/nova/test_server.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/heat/engine/resources/openstack/nova/server_network_mixin.py b/heat/engine/resources/openstack/nova/server_network_mixin.py index e6430c591..288b53b05 100644 --- a/heat/engine/resources/openstack/nova/server_network_mixin.py +++ b/heat/engine/resources/openstack/nova/server_network_mixin.py @@ -110,6 +110,9 @@ class ServerNetworkMixin(object): extra_props = net_data.get(self.NETWORK_PORT_EXTRA) if extra_props is not None: + specs = extra_props.pop(neutron_port.Port.VALUE_SPECS) + if specs: + kwargs.update(specs) port_extra_keys = list(neutron_port.Port.EXTRA_PROPERTIES) port_extra_keys.remove(neutron_port.Port.ALLOWED_ADDRESS_PAIRS) for key in port_extra_keys: diff --git a/heat/tests/openstack/nova/test_server.py b/heat/tests/openstack/nova/test_server.py index cec477f27..6a883bbd3 100644 --- a/heat/tests/openstack/nova/test_server.py +++ b/heat/tests/openstack/nova/test_server.py @@ -3735,6 +3735,7 @@ class ServerInternalPortTest(common.HeatTestCase): network = {'network': '4321', 'subnet': '1234', 'fixed_ip': '127.0.0.1', 'port_extra_properties': { + 'value_specs': {}, 'mac_address': '00:00:00:00:00:00', 'allowed_address_pairs': [ {'ip_address': '127.0.0.1', |