trivial: Further deprecation item cleanup

Centralize and replace deprecated attributes.

Change-Id: I14739372d6570b67918ecbc1653ad74375f7f70c

whitebox_tempest_plugin/tests/scenario/base.py

@@ -26,14 +26,17 @@ LOG = logging.getLogger(__name__)
 
 class BaseTest(base.BaseV2ComputeAdminTest):
 
+    @classmethod
+    def setup_clients(cls):
+        super(BaseTest, cls).setup_clients()
+        cls.servers_client = cls.os_admin.servers_client
+        cls.flavors_client = cls.os_admin.flavors_client
+
     def _create_nova_flavor(self, name, ram, vcpus, disk, fid):
         # This function creates a flavor with provided parameters
-        flavor = self.flvclient.create_flavor(name=name,
-                                              ram=ram,
-                                              vcpus=vcpus,
-                                              disk=disk,
-                                              id=fid)['flavor']
-        return flavor
+        body = self.flavors_client.create_flavor(
+            name=name, ram=ram, vcpus=vcpus, disk=disk, id=fid)
+        return body['flavor']
 
     def _create_nova_instance(self, flavor=None, image=None, cleanup=True):
         if flavor is None:

whitebox_tempest_plugin/tests/scenario/test_pointer_device_type.py

@@ -39,9 +39,8 @@ class PointerDeviceTypeFromImages(base.BaseTest):
     @classmethod
     def setup_clients(cls):
         super(PointerDeviceTypeFromImages, cls).setup_clients()
-        cls.servers_client = cls.os_adm.servers_client
-        cls.flvclient = cls.os_adm.flavors_client
-        cls.image_client = cls.os_adm.compute_images_client
+        cls.compute_images_client = cls.os_admin.compute_images_client
+        cls.hypervisor_client = cls.os_admin.hypervisor_client
 
     @classmethod
     def resource_setup(cls):
@@ -49,8 +48,8 @@ class PointerDeviceTypeFromImages(base.BaseTest):
 
     def _set_image_metadata_item(self, image):
         req_metadata = {'hw_pointer_model': 'usbtablet'}
-        self.image_client.set_image_metadata(image, req_metadata)
-        resp_metadata = (self.image_client.list_image_metadata(image)
+        self.compute_images_client.set_image_metadata(image, req_metadata)
+        resp_metadata = (self.compute_images_client.list_image_metadata(image)
                          ['metadata'])
         self.assertEqual(req_metadata, resp_metadata)
 
@@ -58,7 +57,7 @@ class PointerDeviceTypeFromImages(base.BaseTest):
         # Retrieve the server's hypervizor hostname
         server = self.servers_client.show_server(server_id)['server']
         hostname = server['OS-EXT-SRV-ATTR:host']
-        hypers = self.os_adm.hypervisor_client.list_hypervisors(
+        hypers = self.hypervisor_client.list_hypervisors(
             detail=True)['hypervisors']
 
         compute_node_address = None

whitebox_tempest_plugin/tests/scenario/test_refresh_quota_usages.py

@@ -33,12 +33,6 @@ LOG = logging.getLogger(__name__)
 
 class RefreshQuotaUsages(base.BaseTest):
 
-    @classmethod
-    def setup_clients(cls):
-        super(RefreshQuotaUsages, cls).setup_clients()
-        cls.servers_client = cls.os_adm.servers_client
-        cls.flvclient = cls.os_adm.flavors_client
-
     @classmethod
     def resource_setup(cls):
         super(RefreshQuotaUsages, cls).resource_setup()