Merge "Added keypairs negative tests, removed unused client objects"
diff --git a/tempest/tests/compute/test_server_addresses.py b/tempest/tests/compute/test_server_addresses.py
index 4f4bfb3..6658ccc 100644
--- a/tempest/tests/compute/test_server_addresses.py
+++ b/tempest/tests/compute/test_server_addresses.py
@@ -59,9 +59,12 @@
# We do not know the exact network configuration, but an instance
# should at least have a single public or private address
- self.assertTrue('public' in addresses and len(addresses['public']) > 0
- or 'private' in addresses
- and len(addresses['private']) > 0)
+ self.assertGreaterEqual(len(addresses), 1)
+ for network_name, network_addresses in addresses.iteritems():
+ self.assertGreaterEqual(len(network_addresses), 1)
+ for address in network_addresses:
+ self.assertTrue(address['addr'])
+ self.assertTrue(address['version'])
@attr(type='smoke', category='server-addresses')
def test_list_server_addresses_by_network(self):
diff --git a/tempest/tests/test_floating_ips_actions.py b/tempest/tests/test_floating_ips_actions.py
index 1c0331c..9d7ed6c 100644
--- a/tempest/tests/test_floating_ips_actions.py
+++ b/tempest/tests/test_floating_ips_actions.py
@@ -24,7 +24,6 @@
cls.servers_client.wait_for_server_status(server['id'], 'ACTIVE')
cls.server_id = server['id']
resp, body = cls.servers_client.get_server(server['id'])
- cls.fixed_ip_addr = body['addresses']['private'][0]['addr']
#Floating IP creation
resp, body = cls.client.create_floating_ip()
cls.floating_ip_id = body['id']
diff --git a/tempest/tests/test_volumes_list.py b/tempest/tests/test_volumes_list.py
index 4a4c7d1..01ce394 100644
--- a/tempest/tests/test_volumes_list.py
+++ b/tempest/tests/test_volumes_list.py
@@ -25,7 +25,8 @@
cls.volume_list.append(volume)
cls.volume_id_list.append(volume['id'])
- def teardown(cls):
+ @classmethod
+ def tearDownClass(cls):
#Delete the created Volumes
for i in range(3):
resp, _ = cls.client.delete_volume(cls.volume_id_list[i])