From eddfa6f0e0b155ca633d7a8bc5e9701518085215 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Mon, 16 Sep 2019 16:45:38 -0400 Subject: [PATCH] Remove SchedulerReportClient from AggregateRequestFiltersTest Before Ibd7aa4f8c4ea787774becece324d9051521c44b6 in Rocky the AggregateRequestFiltersTest tests were manually mirroring nova host aggregate membership to placement resource provider aggregate membership. But since that change, and I'm not sure why it wasn't removed in that change, the compute API automatically mirrors the aggregate membership to placement so we don't need that manual hack in the test code and is removed here. Change-Id: Id895223471c9bc1356c5547b8e11d92420f9a956 --- nova/tests/functional/test_aggregates.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/nova/tests/functional/test_aggregates.py b/nova/tests/functional/test_aggregates.py index f4929716f9..0cacaad057 100644 --- a/nova/tests/functional/test_aggregates.py +++ b/nova/tests/functional/test_aggregates.py @@ -14,10 +14,7 @@ import time from oslo_utils.fixture import uuidsentinel as uuids -from nova.scheduler.client import report - import nova.conf -from nova import context as nova_context from nova.scheduler import weights from nova import test from nova.tests import fixtures as nova_fixtures @@ -73,9 +70,6 @@ class AggregateRequestFiltersTest( self._start_compute('host1') self._start_compute('host2') - self.context = nova_context.get_admin_context() - self.report_client = report.SchedulerReportClient() - self.flavors = self.api.get_flavors() # Aggregate with only host1 @@ -121,15 +115,6 @@ class AggregateRequestFiltersTest( agg = self.aggregates[agg] self.admin_api.add_host_to_aggregate(agg['id'], host) - host_uuid = self._get_provider_uuid_by_host(host) - - # Make sure we have a view of the provider we're about to mess with - # FIXME(efried): This should be a thing we can do without internals - self.report_client._ensure_resource_provider( - self.context, host_uuid, name=host) - self.report_client.aggregate_add_host(self.context, agg['uuid'], - host_name=host) - def _wait_for_state_change(self, server, from_status): for i in range(0, 50): server = self.api.get_server(server['id'])