Change server create to use tracked create_server
Change server creation process to the resource tracked create_server
will make easier to do the cleanup.
Change-Id: I5deec3747cde35f4ddc73b2d7631c54f58a6a55b
diff --git a/tempest/tests/compute/servers/test_server_addresses.py b/tempest/tests/compute/servers/test_server_addresses.py
index 4807d1e..cb8e85e 100644
--- a/tempest/tests/compute/servers/test_server_addresses.py
+++ b/tempest/tests/compute/servers/test_server_addresses.py
@@ -29,16 +29,7 @@
super(ServerAddressesTest, cls).setUpClass()
cls.client = cls.servers_client
- cls.name = rand_name('server')
- resp, cls.server = cls.client.create_server(cls.name,
- cls.image_ref,
- cls.flavor_ref)
- cls.client.wait_for_server_status(cls.server['id'], 'ACTIVE')
-
- @classmethod
- def tearDownClass(cls):
- cls.client.delete_server(cls.server['id'])
- super(ServerAddressesTest, cls).tearDownClass()
+ resp, cls.server = cls.create_server(wait_until='ACTIVE')
@attr(type='negative', category='server-addresses')
def test_list_server_addresses_invalid_server_id(self):
diff --git a/tempest/tests/compute/servers/test_server_metadata.py b/tempest/tests/compute/servers/test_server_metadata.py
index bc523de..69c0ad9 100644
--- a/tempest/tests/compute/servers/test_server_metadata.py
+++ b/tempest/tests/compute/servers/test_server_metadata.py
@@ -32,18 +32,10 @@
resp, tenants = cls.admin_client.list_tenants()
cls.tenant_id = [tnt['id'] for tnt in tenants if tnt['name'] ==
cls.client.tenant_name][0]
- resp, server = cls.create_server(meta={})
+ resp, server = cls.create_server(meta={}, wait_until='ACTIVE')
cls.server_id = server['id']
- #Wait for the server to become active
- cls.client.wait_for_server_status(cls.server_id, 'ACTIVE')
-
- @classmethod
- def tearDownClass(cls):
- cls.client.delete_server(cls.server_id)
- super(ServerMetadataTestJSON, cls).tearDownClass()
-
def setUp(self):
super(ServerMetadataTestJSON, self).setUp()
meta = {'key1': 'value1', 'key2': 'value2'}
diff --git a/tempest/tests/compute/servers/test_virtual_interfaces.py b/tempest/tests/compute/servers/test_virtual_interfaces.py
index 4c48366..476a556 100644
--- a/tempest/tests/compute/servers/test_virtual_interfaces.py
+++ b/tempest/tests/compute/servers/test_virtual_interfaces.py
@@ -30,20 +30,10 @@
@classmethod
def setUpClass(cls):
super(VirtualInterfacesTestJSON, cls).setUpClass()
- cls.name = rand_name('server')
cls.client = cls.servers_client
- resp, server = cls.servers_client.create_server(cls.name,
- cls.image_ref,
- cls.flavor_ref)
+ resp, server = cls.create_server(wait_until='ACTIVE')
cls.server_id = server['id']
- cls.servers_client.wait_for_server_status(cls.server_id, 'ACTIVE')
-
- @classmethod
- def tearDownClass(cls):
- cls.servers_client.delete_server(cls.server_id)
- super(VirtualInterfacesTestJSON, cls).tearDownClass()
-
@attr(type='positive')
def test_list_virtual_interfaces(self):
# Positive test:Should be able to GET the virtual interfaces list