openstack/vitrage-tempest-plugin
Code Issues Proposed changes

Finally remove vitrage.conf usage

Browse Source 
Change-Id: Icda2c43a72277cb3511593a4e17cdf1b471d8d3b
Story: 2004053
Task: 28634
Task: 27631
This commit is contained in:
Ivan Kolodyazhny 2019-02-19 12:53:44 +02:00
parent be69eba436
commit 3361a52293
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vitrage_tempest_plugin/tests/base.py
View File

@ -27,7 +27,6 @@ from testtools.matchers import Not
from vitrage.graph.driver.networkx_graph import NXGraph from vitrage.graph.driver.networkx_graph import NXGraph
from vitrage.graph import Edge from vitrage.graph import Edge
from vitrage.graph import Vertex 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 AODH_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import \ from vitrage_tempest_plugin.tests.common.constants import \
@ -131,8 +130,7 @@ class BaseVitrageTempest(test.BaseTestCase):
warnings.filterwarnings(action="ignore", warnings.filterwarnings(action="ignore",
message="unclosed", message="unclosed",
category=ResourceWarning) category=ResourceWarning)
cls.conf = service.prepare_service([]) TempestClients.class_init(cls.os_primary.credentials)
TempestClients.class_init(cls.conf, cls.os_primary.credentials)
cls.vitrage_client = TempestClients.vitrage() cls.vitrage_client = TempestClients.vitrage()
cls.vitrage_client_for_demo_user = \ cls.vitrage_client_for_demo_user = \
TempestClients.vitrage_client_for_user() TempestClients.vitrage_client_for_user()

3
vitrage_tempest_plugin/tests/common/tempest_clients.py
View File

@ -45,8 +45,7 @@ def driver_module(driver):
class TempestClients(object): class TempestClients(object):
@classmethod @classmethod
def class_init(cls, conf, creds=None): def class_init(cls, creds):
cls._conf = conf
cls.creds = creds cls.creds = creds
cls._vitrage = None cls._vitrage = None
cls._ceilometer = None cls._ceilometer = None