Cleanup test_list_server_filters setup/teardown
The test_list_server_filters test class was doing a lot of
setup/teardown work that is now handled in the parent class. We still
have to explicitly set the name since some tests use it for filtering
but otherwise we can rely on the parent class to do most of the heavy
lifting here.
This change makes it so that the instances have a name based on the test
class rather than just a random integer which is hard to use for
debugging leaked instances.
This change also removes the get call from setup and moves it into the
test cases that actually need to use it (which are currently being
skipped anyway).
Closes-Bug: 1235411
Change-Id: I66813c900059dd4232de645c225032e58e9aecde
diff --git a/tempest/api/compute/servers/test_list_server_filters.py b/tempest/api/compute/servers/test_list_server_filters.py
index a56bdf3..48faae0 100644
--- a/tempest/api/compute/servers/test_list_server_filters.py
+++ b/tempest/api/compute/servers/test_list_server_filters.py
@@ -58,32 +58,26 @@
raise RuntimeError("Image %s (image_ref_alt) was not found!" %
cls.image_ref_alt)
- cls.s1_name = rand_name('server')
- resp, cls.s1 = cls.client.create_server(cls.s1_name, cls.image_ref,
- cls.flavor_ref)
- cls.s2_name = rand_name('server')
- resp, cls.s2 = cls.client.create_server(cls.s2_name, cls.image_ref_alt,
- cls.flavor_ref)
- cls.s3_name = rand_name('server')
- resp, cls.s3 = cls.client.create_server(cls.s3_name, cls.image_ref,
- cls.flavor_ref_alt)
+ cls.s1_name = rand_name(cls.__name__ + '-instance')
+ resp, cls.s1 = cls.create_server(name=cls.s1_name,
+ image_id=cls.image_ref,
+ flavor=cls.flavor_ref,
+ wait_until='ACTIVE')
- cls.client.wait_for_server_status(cls.s1['id'], 'ACTIVE')
- resp, cls.s1 = cls.client.get_server(cls.s1['id'])
- cls.client.wait_for_server_status(cls.s2['id'], 'ACTIVE')
- resp, cls.s2 = cls.client.get_server(cls.s2['id'])
- cls.client.wait_for_server_status(cls.s3['id'], 'ACTIVE')
- resp, cls.s3 = cls.client.get_server(cls.s3['id'])
+ cls.s2_name = rand_name(cls.__name__ + '-instance')
+ resp, cls.s2 = cls.create_server(name=cls.s2_name,
+ image_id=cls.image_ref_alt,
+ flavor=cls.flavor_ref,
+ wait_until='ACTIVE')
+
+ cls.s3_name = rand_name(cls.__name__ + '-instance')
+ resp, cls.s3 = cls.create_server(name=cls.s3_name,
+ image_id=cls.image_ref,
+ flavor=cls.flavor_ref_alt,
+ wait_until='ACTIVE')
cls.fixed_network_name = cls.config.compute.fixed_network_name
- @classmethod
- def tearDownClass(cls):
- cls.client.delete_server(cls.s1['id'])
- cls.client.delete_server(cls.s2['id'])
- cls.client.delete_server(cls.s3['id'])
- super(ListServerFiltersTestJSON, cls).tearDownClass()
-
@utils.skip_unless_attr('multiple_images', 'Only one image found')
@attr(type='gate')
def test_list_servers_filter_by_image(self):
@@ -185,8 +179,8 @@
@attr(type='gate')
def test_list_servers_filtered_by_name_wildcard(self):
- # List all servers that contains 'server' in name
- params = {'name': 'server'}
+ # List all servers that contains '-instance' in name
+ params = {'name': '-instance'}
resp, body = self.client.list_servers(params)
servers = body['servers']
@@ -210,6 +204,7 @@
def test_list_servers_filtered_by_ip(self):
# Filter servers by ip
# Here should be listed 1 server
+ resp, self.s1 = self.client.get_server(self.s1['id'])
ip = self.s1['addresses'][self.fixed_network_name][0]['addr']
params = {'ip': ip}
resp, body = self.client.list_servers(params)
@@ -226,6 +221,7 @@
# Filter servers by regex ip
# List all servers filtered by part of ip address.
# Here should be listed all servers
+ resp, self.s1 = self.client.get_server(self.s1['id'])
ip = self.s1['addresses'][self.fixed_network_name][0]['addr'][0:-3]
params = {'ip': ip}
resp, body = self.client.list_servers(params)