openstack
/
tempest
Code Issues Proposed changes

Replace the use of 'os_adm' with 'os_admin' 

Property 'os_adm' has been moved to 'os_admin' in version Pike, and
it will be removed in version Queens. This patch is to replace the
usage of 'os_adm' with 'os_admin' in Tempest tests.

Change-Id: Ie4cf457d0a521910a82e41e7dad775df75d56587
This commit is contained in:
jeremy.zhang 2017-05-24 19:58:34 +08:00
parent bd863d30a3
commit d2c0394cc0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tempest/api/compute/admin/test_delete_server.py
View File

@ -29,7 +29,7 @@ class DeleteServersAdminTestJSON(base.BaseV2ComputeAdminTest):
def setup_clients(cls):
super(DeleteServersAdminTestJSON, cls).setup_clients()
cls.non_admin_client = cls.servers_client
cls.admin_client = cls.os_adm.servers_client
cls.admin_client = cls.os_admin.servers_client
@decorators.idempotent_id('99774678-e072-49d1-9d2a-49a59bc56063')
def test_delete_server_while_in_error_state(self):

2
tempest/api/compute/admin/test_servers.py
View File

@ -133,7 +133,7 @@ class ServersAdminTestJSON(base.BaseV2ComputeAdminTest):
# self.create_test_server() here as this method creates the server
# in the "primary" (i.e non-admin) tenant.
test_server, _ = compute.create_test_server(
self.os_adm, wait_until="ACTIVE", name=name, **network_kwargs)
self.os_admin, wait_until="ACTIVE", name=name, **network_kwargs)
self.addCleanup(self.client.delete_server, test_server['id'])
server = self.client.show_server(test_server['id'])['server']
self.assertEqual(server['status'], 'ACTIVE')

2
tempest/api/volume/admin/test_volume_quota_classes.py
View File

@ -73,7 +73,7 @@ class VolumeQuotaClassesTest(base.BaseVolumeAdminTest):
# Verify current project's default quotas
default_quotas = self.admin_quotas_client.show_default_quota_set(
self.os_adm.credentials.tenant_id)['quota_set']
self.os_admin.credentials.tenant_id)['quota_set']
self.assertThat(default_quotas.items(),
matchers.ContainsAll(body.items()))