Merge "Remove unused variable"

This commit is contained in:
Jenkins 2017-03-02 10:50:03 +00:00 committed by Gerrit Code Review
commit 6533dd857a
5 changed files with 5 additions and 5 deletions

View File

@ -49,7 +49,7 @@ class ServerAddressesTestJSON(base.BaseV2ComputeTest):
# We do not know the exact network configuration, but an instance
# should at least have a single public or private address
self.assertGreaterEqual(len(addresses), 1)
for network_name, network_addresses in addresses.items():
for network_addresses in addresses.values():
self.assertGreaterEqual(len(network_addresses), 1)
for address in network_addresses:
self.assertTrue(address['addr'])

View File

@ -912,7 +912,7 @@ class NetworkScenarioTest(ScenarioTest):
# The target login is assumed to have been configured for
# key-based authentication by cloud-init.
try:
for net_name, ip_addresses in server['addresses'].items():
for ip_addresses in server['addresses'].values():
for ip_address in ip_addresses:
self.check_vm_connectivity(ip_address['addr'],
username,

View File

@ -82,7 +82,7 @@ class TestAggregatesBasicOps(manager.ScenarioTest):
aggregate = self.aggregates_client.set_metadata(aggregate['id'],
metadata=meta)
for key, value in meta.items():
for key in meta.keys():
self.assertEqual(meta[key],
aggregate['aggregate']['metadata'][key])

View File

@ -94,7 +94,7 @@ class TestMinimumBasicScenario(manager.ScenarioTest):
raise exceptions.TimeoutException(msg)
def _get_floating_ip_in_server_addresses(self, floating_ip, server):
for network_name, addresses in server['addresses'].items():
for addresses in server['addresses'].values():
for address in addresses:
if (address['OS-EXT-IPS:type'] == 'floating' and
address['addr'] == floating_ip['ip']):

View File

@ -110,7 +110,7 @@ class TestGettingAddress(manager.NetworkScenarioTest):
@staticmethod
def define_server_ips(srv):
ips = {'4': None, '6': []}
for net_name, nics in srv['addresses'].items():
for nics in srv['addresses'].values():
for nic in nics:
if nic['version'] == 6:
ips['6'].append(nic['addr'])