From 3361a522936d19fc7c7e08ad597e761829d16019 Mon Sep 17 00:00:00 2001 From: Ivan Kolodyazhny Date: Tue, 19 Feb 2019 12:53:44 +0200 Subject: [PATCH] Finally remove vitrage.conf usage Change-Id: Icda2c43a72277cb3511593a4e17cdf1b471d8d3b Story: 2004053 Task: 28634 Task: 27631 --- vitrage_tempest_plugin/tests/base.py | 4 +--- vitrage_tempest_plugin/tests/common/tempest_clients.py | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/vitrage_tempest_plugin/tests/base.py b/vitrage_tempest_plugin/tests/base.py index 5ca44a7..eae0333 100644 --- a/vitrage_tempest_plugin/tests/base.py +++ b/vitrage_tempest_plugin/tests/base.py @@ -27,7 +27,6 @@ from testtools.matchers import Not from vitrage.graph.driver.networkx_graph import NXGraph from vitrage.graph import Edge from vitrage.graph import Vertex -from vitrage import service from vitrage_tempest_plugin.tests.common.constants import AODH_DATASOURCE from vitrage_tempest_plugin.tests.common.constants import \ @@ -131,8 +130,7 @@ class BaseVitrageTempest(test.BaseTestCase): warnings.filterwarnings(action="ignore", message="unclosed", category=ResourceWarning) - cls.conf = service.prepare_service([]) - TempestClients.class_init(cls.conf, cls.os_primary.credentials) + TempestClients.class_init(cls.os_primary.credentials) cls.vitrage_client = TempestClients.vitrage() cls.vitrage_client_for_demo_user = \ TempestClients.vitrage_client_for_user() diff --git a/vitrage_tempest_plugin/tests/common/tempest_clients.py b/vitrage_tempest_plugin/tests/common/tempest_clients.py index 1534739..f7dbe8a 100644 --- a/vitrage_tempest_plugin/tests/common/tempest_clients.py +++ b/vitrage_tempest_plugin/tests/common/tempest_clients.py @@ -45,8 +45,7 @@ def driver_module(driver): class TempestClients(object): @classmethod - def class_init(cls, conf, creds=None): - cls._conf = conf + def class_init(cls, creds): cls.creds = creds cls._vitrage = None cls._ceilometer = None