Merge "py34: heat.tests.neutron"

This commit is contained in:
Jenkins 2015-08-03 03:34:43 +00:00 committed by Gerrit Code Review
commit 9a2345b74e
2 changed files with 4 additions and 1 deletions

View File

@ -348,7 +348,7 @@ class Port(neutron.NeutronResource):
def _prepare_port_properties(self, props, prepare_for_update=False):
for fixed_ip in props.get(self.FIXED_IPS, []):
for key, value in fixed_ip.items():
for key, value in list(fixed_ip.items()):
if value is None:
fixed_ip.pop(key)
if fixed_ip.get(self.FIXED_IP_SUBNET):

View File

@ -57,10 +57,13 @@ heat.tests.manila.test_manila_share_type
heat.tests.manila.test_share_network
heat.tests.mistral.test_mistral_cron_trigger
heat.tests.neutron.test_extraroute
heat.tests.neutron.test_neutron
heat.tests.neutron.test_neutron_firewall
heat.tests.neutron.test_neutron_floating_ip
heat.tests.neutron.test_neutron_metering
heat.tests.neutron.test_neutron_net
heat.tests.neutron.test_neutron_network_gateway
heat.tests.neutron.test_neutron_port
heat.tests.neutron.test_neutron_provider_net
heat.tests.neutron.test_neutron_router
heat.tests.neutron.test_neutron_security_group