openstack/vitrage-tempest-plugin
Code Issues Proposed changes

Merge "make the os clients dynamiclly imported"

Browse Source
This commit is contained in:
Jenkins 2016-10-05 08:00:18 +00:00 committed by Gerrit Code Review
commit 9a4cddba6d
3 changed files with 9 additions and 9 deletions
vitrage_tempest_tests/tests/api
alarms
base.py
base.py
templates
base.py

4
vitrage_tempest_tests/tests/api/alarms/base.py

@ -17,7 +17,7 @@ import time
from oslo_log import log as logging
from vitrage import clients
from vitrage import os_clients
from vitrage_tempest_tests.tests.api.base import BaseApiTest
LOG = logging.getLogger(__name__)
@ -32,7 +32,7 @@ class BaseAlarmsTest(BaseApiTest):
@classmethod
def setUpClass(cls):
super(BaseAlarmsTest, cls).setUpClass()
cls.ceilometer_client = clients.ceilometer_client(cls.conf)
cls.ceilometer_client = os_clients.ceilometer_client(cls.conf)
def _create_ceilometer_alarm(self, resource_id=None,
name=None, unic=True):

10
vitrage_tempest_tests/tests/api/base.py

@ -17,7 +17,6 @@ import time
from oslo_log import log as logging
from oslotest import base
from vitrage import clients
from vitrage.common.constants import EntityCategory
from vitrage.common.constants import VertexProperties as VProps
from vitrage.datasources.aodh import AODH_DATASOURCE
@ -34,6 +33,7 @@ from vitrage.graph import Edge
from vitrage.graph import NXGraph
from vitrage.graph import Vertex
from vitrage import keystone_client
from vitrage import os_clients
from vitrage import service
import vitrage_tempest_tests.tests.utils as utils
from vitrageclient import client as v_client
@ -55,10 +55,10 @@ class BaseApiTest(base.BaseTestCase):
cls.vitrage_client = \
v_client.Client('1', session=keystone_client.get_session(cls.conf))
cls.nova_client = clients.nova_client(cls.conf)
cls.cinder_client = clients.cinder_client(cls.conf)
cls.neutron_client = clients.neutron_client(cls.conf)
cls.heat_client = clients.heat_client(cls.conf)
cls.nova_client = os_clients.nova_client(cls.conf)
cls.cinder_client = os_clients.cinder_client(cls.conf)
cls.neutron_client = os_clients.neutron_client(cls.conf)
cls.heat_client = os_clients.heat_client(cls.conf)
cls.num_default_networks = \
len(cls.neutron_client.list_networks()['networks'])

4
vitrage_tempest_tests/tests/api/templates/base.py

@ -15,7 +15,7 @@ import json
from oslo_log import log as logging
from vitrage import clients
from vitrage import os_clients
from vitrage_tempest_tests.tests.api.base import BaseApiTest
import vitrage_tempest_tests.tests.utils as utils
@ -40,7 +40,7 @@ class BaseTemplateTest(BaseApiTest):
@classmethod
def setUpClass(cls):
super(BaseTemplateTest, cls).setUpClass()
cls.ceilometer_client = clients.ceilometer_client(cls.conf)
cls.ceilometer_client = os_clients.ceilometer_client(cls.conf)
def _compare_template_lists(self, api_templates, cli_templates):
self.assertNotEqual(len(api_templates), 0,