test_list_servers_by_admin for preexisting servers
test_list_servers_by_admin has been implemented by corresponding to
test_list_servers_by_admin_with_all_tenants which specifies an option
all_tenants. As the bug report, test_list_servers_by_admin expected
admin user should not have any pre-existing servers, but it is possible
on some clouds.
As the original purpose of test_list_servers_by_admin, it is fine to
verify the server list doesn't contain the other tenants' servers.
Then this patch changes test_list_servers_by_admin to do that.
In addition, this patch moves test_list_servers_by_admin to next to
test_list_servers_by_admin_with_all_tenants for comparing them easily.
Change-Id: I4ba5bedef154c1313b6c60f24f177ae3d9ac15ef
Closes-Bug: #1295369
diff --git a/tempest/api/compute/admin/test_servers.py b/tempest/api/compute/admin/test_servers.py
index dd4a533..80c4951 100755
--- a/tempest/api/compute/admin/test_servers.py
+++ b/tempest/api/compute/admin/test_servers.py
@@ -47,13 +47,6 @@
wait_until='ACTIVE')
cls.s2_id = server['id']
- @test.idempotent_id('51717b38-bdc1-458b-b636-1cf82d99f62f')
- def test_list_servers_by_admin(self):
- # Listing servers by admin user returns empty list by default
- body = self.client.list_servers(detail=True)
- servers = body['servers']
- self.assertEqual([], servers)
-
@test.idempotent_id('06f960bb-15bb-48dc-873d-f96e89be7870')
def test_list_servers_filter_by_error_status(self):
# Filter the list of servers by server error status
@@ -77,6 +70,19 @@
servers = body['servers']
self.assertEqual([], servers)
+ @test.idempotent_id('51717b38-bdc1-458b-b636-1cf82d99f62f')
+ def test_list_servers_by_admin(self):
+ # Listing servers by admin user returns a list which doesn't
+ # contain the other tenants' server by default
+ body = self.client.list_servers(detail=True)
+ servers = body['servers']
+
+ # This case is for the test environments which contain
+ # the existing servers before testing
+ servers_name = [server['name'] for server in servers]
+ self.assertNotIn(self.s1_name, servers_name)
+ self.assertNotIn(self.s2_name, servers_name)
+
@test.idempotent_id('9f5579ae-19b4-4985-a091-2a5d56106580')
def test_list_servers_by_admin_with_all_tenants(self):
# Listing servers by admin user with all tenants parameter