Merge "functional: Drop '_api' suffix from placement fixture"

Author: Zuul

nova/tests/functional/compute/test_resource_tracker.py

@@ -419,7 +419,7 @@ def test_allocation_ratio_overwritten_from_config(self):
 
         rt = compute_service.manager.rt
 
-        inv = self.placement_api.get(
+        inv = self.placement.get(
             '/resource_providers/%s/inventories' % rp_uuid).body
         ratios = {'VCPU': 16.1, 'MEMORY_MB': 1.6, 'DISK_GB': 1.1}
 

nova/tests/functional/integrated_helpers.py

@@ -444,46 +444,46 @@ class PlacementHelperMixin:
     """A helper mixin for interacting with placement."""
 
     def _get_all_resource_classes(self):
-        resp = self.placement_api.get(
+        resp = self.placement.get(
             '/resource_classes', version='1.2'
         ).body['resource_classes']
         return [d['name'] for d in resp]
 
     def _get_all_providers(self):
-        return self.placement_api.get(
+        return self.placement.get(
             '/resource_providers', version='1.14'
         ).body['resource_providers']
 
     def _get_all_rp_uuids_in_a_tree(self, in_tree_rp_uuid):
-        rps = self.placement_api.get(
+        rps = self.placement.get(
             '/resource_providers?in_tree=%s' % in_tree_rp_uuid,
             version='1.20',
         ).body['resource_providers']
         return [rp['uuid'] for rp in rps]
 
     def _post_resource_provider(self, rp_name):
-        return self.placement_api.post(
+        return self.placement.post(
             '/resource_providers', version='1.20', body={'name': rp_name}
         ).body
 
     def _get_resource_provider_by_uuid(self, rp_uuid):
-        return self.placement_api.get(
+        return self.placement.get(
             '/resource_providers/%s' % rp_uuid, version='1.15',
         ).body
 
     def _get_provider_uuid_by_name(self, name):
-        return self.placement_api.get(
+        return self.placement.get(
             '/resource_providers?name=%s' % name,
         ).body['resource_providers'][0]['uuid']
 
     def _get_provider_usages(self, provider_uuid):
-        return self.placement_api.get(
+        return self.placement.get(
             '/resource_providers/%s/usages' % provider_uuid
         ).body['usages']
 
     # TODO(stephenfin): Rename to '_get_provider_allocations'
     def _get_allocations_by_provider_uuid(self, rp_uuid):
-        return self.placement_api.get(
+        return self.placement.get(
             '/resource_providers/%s/allocations' % rp_uuid
         ).body['allocations']
 
@@ -493,7 +493,7 @@ def _get_provider_traits(self, rp_uuid):
         :param rp_uuid: UUID of the resource provider to update
         :returns: Dict object with the results.
         """
-        return self.placement_api.get(
+        return self.placement.get(
             '/resource_providers/%s/traits' % rp_uuid, version='1.6'
         ).body['traits']
 
@@ -506,10 +506,10 @@ def _set_provider_traits(self, rp_uuid, traits):
         :param traits: List of trait strings to set on the provider.
         :returns: APIResponse object with the results.
         """
-        provider = self.placement_api.get(
+        provider = self.placement.get(
             '/resource_providers/%s' % rp_uuid
         ).body
-        return self.placement_api.put(
+        return self.placement.put(
             '/resource_providers/%s/traits' % rp_uuid,
             {
                 'resource_provider_generation': provider['generation'],
@@ -519,7 +519,7 @@ def _set_provider_traits(self, rp_uuid, traits):
         )
 
     def _get_provider_inventory(self, rp_uuid):
-        return self.placement_api.get(
+        return self.placement.get(
             '/resource_providers/%s/inventories' % rp_uuid
         ).body['inventories']
 
@@ -531,7 +531,7 @@ def _set_inventory(self, rp_uuid, inv_body):
         :param inv_body: inventory to set on the provider
         :returns: APIResponse object with the results
         """
-        return self.placement_api.post(
+        return self.placement.post(
             '/resource_providers/%s/inventories' % rp_uuid,
             version='1.15', body=inv_body
         ).body
@@ -544,21 +544,21 @@ def _update_inventory(self, rp_uuid, inv_body):
         :param inv_body: inventory to set on the provider
         :returns: APIResponse object with the results
         """
-        return self.placement_api.put(
+        return self.placement.put(
             '/resource_providers/%s/inventories' % rp_uuid, body=inv_body,
         ).body
 
     def _get_provider_aggregates(self, rp_uuid):
-        return self.placement_api.get(
+        return self.placement.get(
             '/resource_providers/%s/aggregates' % rp_uuid, version='1.1'
         ).body['aggregates']
 
     # TODO(stephenfin): Rename '_set_provider_aggregates'
     def _set_aggregate(self, rp_uuid, agg_id):
-        provider = self.placement_api.get(
+        provider = self.placement.get(
             '/resource_providers/%s' % rp_uuid
         ).body
-        return self.placement_api.put(
+        return self.placement.put(
             '/resource_providers/%s/aggregates' % rp_uuid,
             body={
                 'aggregates': [agg_id],
@@ -568,13 +568,13 @@ def _set_aggregate(self, rp_uuid, agg_id):
         ).body
 
     def _get_all_traits(self):
-        return self.placement_api.get('/traits', version='1.6').body['traits']
+        return self.placement.get('/traits', version='1.6').body['traits']
 
     def _create_trait(self, trait):
-        return self.placement_api.put('/traits/%s' % trait, {}, version='1.6')
+        return self.placement.put('/traits/%s' % trait, {}, version='1.6')
 
     def _delete_trait(self, trait):
-        return self.placement_api.delete('/traits/%s' % trait, version='1.6')
+        return self.placement.delete('/traits/%s' % trait, version='1.6')
 
     def assertRequestMatchesUsage(self, requested_resources, root_rp_uuid):
         # It matches the usages of the whole tree against the request
@@ -673,7 +673,7 @@ class PlacementInstanceHelperMixin(InstanceHelperMixin, PlacementHelperMixin):
 
     # TODO(stephenfin): Rename to '_get_server_allocations'
     def _get_allocations_by_server_uuid(self, server_uuid):
-        return self.placement_api.get(
+        return self.placement.get(
             '/allocations/%s' % server_uuid
         ).body['allocations']
 
@@ -995,9 +995,7 @@ def setUp(self):
 
         self.useFixture(cast_as_call.CastAsCall(self))
 
-        placement = self.useFixture(func_fixtures.PlacementFixture())
-        self.placement_api = placement.api
-
+        self.placement = self.useFixture(func_fixtures.PlacementFixture()).api
         self.neutron = self.useFixture(nova_fixtures.NeutronFixture(self))
         self.cinder = self.useFixture(nova_fixtures.CinderFixture(self))
 
@@ -1067,13 +1065,12 @@ def setUp(self):
 
         self.policy = self.useFixture(policy_fixture.RealPolicyFixture())
         self.neutron = self.useFixture(nova_fixtures.NeutronFixture(self))
+        self.placement = self.useFixture(func_fixtures.PlacementFixture()).api
         self.useFixture(nova_fixtures.AllServicesCurrent())
 
         fake_notifier.stub_notifier(self)
         self.addCleanup(fake_notifier.reset)
 
-        placement = self.useFixture(func_fixtures.PlacementFixture())
-        self.placement_api = placement.api
         self.api_fixture = self.useFixture(nova_fixtures.OSAPIFixture(
             api_version='v2.1'))
 

nova/tests/functional/libvirt/base.py

@@ -165,7 +165,7 @@ def start_compute(host, host_info):
             # host_info do not change with every iteration of the for loop.
             self.computes[host] = start_compute(host, host_info)
             if save_rp_uuids:
-                self.compute_rp_uuids[host] = self.placement_api.get(
+                self.compute_rp_uuids[host] = self.placement.get(
                     '/resource_providers?name=%s' % host).body[
                     'resource_providers'][0]['uuid']
 

nova/tests/functional/libvirt/test_numa_servers.py

@@ -68,7 +68,7 @@ def _run_build_test(self, flavor_id, end_status='ACTIVE',
         # 'start_service' to make sure there isn't a mismatch
         self.compute = self.start_service('compute', host='compute1')
 
-        compute_rp_uuid = self.placement_api.get(
+        compute_rp_uuid = self.placement.get(
             '/resource_providers?name=compute1').body[
             'resource_providers'][0]['uuid']
 
@@ -94,7 +94,7 @@ def _run_build_test(self, flavor_id, end_status='ACTIVE',
             self.assertFalse(self.mock_filter.called)
 
         if expected_usage:
-            compute_usage = self.placement_api.get(
+            compute_usage = self.placement.get(
                 '/resource_providers/%s/usages' % compute_rp_uuid).body[
                     'usages']
             self.assertEqual(expected_usage, compute_usage)
@@ -524,7 +524,7 @@ def test_resize_vcpu_to_pcpu(self):
                 expected_usage = {'VCPU': 0, 'PCPU': 0, 'DISK_GB': 0,
                                   'MEMORY_MB': 0}
 
-            compute_usage = self.placement_api.get(
+            compute_usage = self.placement.get(
                 '/resource_providers/%s/usages' % compute_rp_uuid).body[
                     'usages']
             self.assertEqual(expected_usage, compute_usage)
@@ -565,7 +565,7 @@ def test_resize_vcpu_to_pcpu(self):
                 expected_usage = {'VCPU': 0, 'PCPU': 2, 'DISK_GB': 20,
                                   'MEMORY_MB': 2048}
 
-            compute_usage = self.placement_api.get(
+            compute_usage = self.placement.get(
                 '/resource_providers/%s/usages' % compute_rp_uuid).body[
                     'usages']
             self.assertEqual(expected_usage, compute_usage)
@@ -594,7 +594,7 @@ def test_resize_vcpu_to_pcpu(self):
                 expected_usage = {'VCPU': 0, 'PCPU': 2, 'DISK_GB': 20,
                                   'MEMORY_MB': 2048}
 
-            compute_usage = self.placement_api.get(
+            compute_usage = self.placement.get(
                 '/resource_providers/%s/usages' % compute_rp_uuid).body[
                     'usages']
             self.assertEqual(expected_usage, compute_usage)
@@ -729,7 +729,7 @@ def test_vcpu_to_pcpu_reshape(self):
         # ensure there is no PCPU inventory being reported
 
         for host, compute_rp_uuid in self.compute_rp_uuids.items():
-            compute_inventory = self.placement_api.get(
+            compute_inventory = self.placement.get(
                 '/resource_providers/%s/inventories' % compute_rp_uuid).body[
                     'inventories']
             self.assertEqual(8, compute_inventory['VCPU']['total'])
@@ -755,20 +755,20 @@ def test_vcpu_to_pcpu_reshape(self):
 
         compute_rp_uuid = self.compute_rp_uuids['test_compute0']
 
-        compute_inventory = self.placement_api.get(
+        compute_inventory = self.placement.get(
             '/resource_providers/%s/inventories' % compute_rp_uuid).body[
                 'inventories']
-        compute_usages = self.placement_api.get(
+        compute_usages = self.placement.get(
             '/resource_providers/%s/usages' % compute_rp_uuid).body[
                 'usages']
         self.assertEqual(4, compute_usages['VCPU'])
 
         compute_rp_uuid = self.compute_rp_uuids['test_compute1']
 
-        compute_inventory = self.placement_api.get(
+        compute_inventory = self.placement.get(
             '/resource_providers/%s/inventories' % compute_rp_uuid).body[
                 'inventories']
-        compute_usages = self.placement_api.get(
+        compute_usages = self.placement.get(
             '/resource_providers/%s/usages' % compute_rp_uuid).body[
                 'usages']
         self.assertEqual(0, compute_usages['VCPU'])
@@ -792,18 +792,18 @@ def test_vcpu_to_pcpu_reshape(self):
 
         compute_rp_uuid = self.compute_rp_uuids['test_compute0']
 
-        compute_inventory = self.placement_api.get(
+        compute_inventory = self.placement.get(
             '/resource_providers/%s/inventories' % compute_rp_uuid).body[
                 'inventories']
         self.assertEqual(8, compute_inventory['VCPU']['total'])
         self.assertNotIn('PCPU', compute_inventory)
-        compute_usages = self.placement_api.get(
+        compute_usages = self.placement.get(
             '/resource_providers/%s/usages' % compute_rp_uuid).body[
                 'usages']
         self.assertEqual(4, compute_usages['VCPU'])
         self.assertNotIn('PCPU', compute_usages)
 
-        allocations = self.placement_api.get(
+        allocations = self.placement.get(
             '/allocations/%s' % server1['id']).body['allocations']
         # the flavor has disk=10 and ephemeral=10
         self.assertEqual(
@@ -815,18 +815,18 @@ def test_vcpu_to_pcpu_reshape(self):
 
         compute_rp_uuid = self.compute_rp_uuids['test_compute1']
 
-        compute_inventory = self.placement_api.get(
+        compute_inventory = self.placement.get(
             '/resource_providers/%s/inventories' % compute_rp_uuid).body[
                 'inventories']
         self.assertEqual(8, compute_inventory['VCPU']['total'])
         self.assertNotIn('PCPU', compute_inventory)
-        compute_usages = self.placement_api.get(
+        compute_usages = self.placement.get(
             '/resource_providers/%s/usages' % compute_rp_uuid).body[
                 'usages']
         self.assertEqual(2, compute_usages['VCPU'])
         self.assertNotIn('PCPU', compute_usages)
 
-        allocations = self.placement_api.get(
+        allocations = self.placement.get(
             '/allocations/%s' % server2['id']).body['allocations']
         # the flavor has disk=10 and ephemeral=10
         self.assertEqual(
@@ -854,18 +854,18 @@ def test_vcpu_to_pcpu_reshape(self):
 
         compute_rp_uuid = self.compute_rp_uuids['test_compute0']
 
-        compute_inventory = self.placement_api.get(
+        compute_inventory = self.placement.get(
             '/resource_providers/%s/inventories' % compute_rp_uuid).body[
                 'inventories']
         self.assertEqual(8, compute_inventory['PCPU']['total'])
         self.assertNotIn('VCPU', compute_inventory)
-        compute_usages = self.placement_api.get(
+        compute_usages = self.placement.get(
             '/resource_providers/%s/usages' % compute_rp_uuid).body[
                 'usages']
         self.assertEqual(4, compute_usages['PCPU'])
         self.assertNotIn('VCPU', compute_usages)
 
-        allocations = self.placement_api.get(
+        allocations = self.placement.get(
             '/allocations/%s' % server1['id']).body['allocations']
         # the flavor has disk=10 and ephemeral=10
         self.assertEqual(
@@ -877,18 +877,18 @@ def test_vcpu_to_pcpu_reshape(self):
 
         compute_rp_uuid = self.compute_rp_uuids['test_compute1']
 
-        compute_inventory = self.placement_api.get(
+        compute_inventory = self.placement.get(
             '/resource_providers/%s/inventories' % compute_rp_uuid).body[
                 'inventories']
         self.assertEqual(8, compute_inventory['PCPU']['total'])
         self.assertNotIn('VCPU', compute_inventory)
-        compute_usages = self.placement_api.get(
+        compute_usages = self.placement.get(
             '/resource_providers/%s/usages' % compute_rp_uuid).body[
                 'usages']
         self.assertEqual(2, compute_usages['PCPU'])
         self.assertNotIn('VCPU', compute_usages)
 
-        allocations = self.placement_api.get(
+        allocations = self.placement.get(
             '/allocations/%s' % server2['id']).body['allocations']
         # the flavor has disk=10 and ephemeral=10
         self.assertEqual(
@@ -903,20 +903,20 @@ def test_vcpu_to_pcpu_reshape(self):
 
         compute_rp_uuid = self.compute_rp_uuids['test_compute0']
 
-        compute_inventory = self.placement_api.get(
+        compute_inventory = self.placement.get(
             '/resource_providers/%s/inventories' % compute_rp_uuid).body[
                 'inventories']
         self.assertEqual(8, compute_inventory['PCPU']['total'])
         self.assertNotIn('VCPU', compute_inventory)
-        compute_usages = self.placement_api.get(
+        compute_usages = self.placement.get(
             '/resource_providers/%s/usages' % compute_rp_uuid).body[
                 'usages']
         self.assertEqual(6, compute_usages['PCPU'])
         self.assertNotIn('VCPU', compute_usages)
 
         # check the allocations for this server specifically
 
-        allocations = self.placement_api.get(
+        allocations = self.placement.get(
             '/allocations/%s' % server3['id']).body[
                 'allocations']
         self.assertEqual(