openstack/vitrage-tempest-plugin
Code Issues Proposed changes

Add constants for datasources

Browse Source 
It's the next patch in series of decopling vitrage-tempest-plugin from
the vitrage itself. All required constants were copied to
vitrage-tempest-plugin.

Partial implements: https://storyboard.openstack.org/#!/story/2004053

Change-Id: I262a6286922d6d38687c5f1f247a42f3b49fd4c2
This commit is contained in:
Ivan Kolodyazhny 2018-12-21 23:42:46 +02:00
parent b0e1c01c31
commit 76ef399b9f
11 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vitrage_tempest_plugin/tests/api/alarms/base.py
View File

@ -12,27 +12,17 @@
# License for the specific language governing permissions and limitations
# under the License.
from vitrage.datasources.aodh.properties import AodhProperties as AodhProps
from vitrage_tempest_plugin.tests.base import BaseVitrageTempest
from vitrage_tempest_plugin.tests.common.constants import AodhProperties
from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients
class BaseAlarmsTest(BaseVitrageTempest):
"""Topology test class for Vitrage API tests."""
def setUp(self):
super(BaseAlarmsTest, self).setUp()
def tearDown(self):
super(BaseAlarmsTest, self).tearDown()
@classmethod
def setUpClass(cls):
super(BaseAlarmsTest, cls).setUpClass()
def _check_num_alarms(self, num_alarms=0, state=''):
if len(TempestClients.aodh().alarm.list()) != num_alarms:
return False
return all(alarm[AodhProps.STATE].upper() == state.upper()
return all(alarm[AodhProperties.STATE].upper() == state.upper()
for alarm in TempestClients.aodh().alarm.list())

2
vitrage_tempest_plugin/tests/api/alarms/test_alarms.py
View File

@ -17,10 +17,10 @@ import json
from oslo_log import log as logging
from testtools import matchers
from vitrage.datasources.aodh import AODH_DATASOURCE
from vitrage_tempest_plugin.tests.api.alarms.base import BaseAlarmsTest
from vitrage_tempest_plugin.tests.base import IsNotEmpty
from vitrage_tempest_plugin.tests.common import aodh_utils
from vitrage_tempest_plugin.tests.common.constants import AODH_DATASOURCE
from vitrage_tempest_plugin.tests.common import general_utils as g_utils
from vitrage_tempest_plugin.tests.common import nova_utils
from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients

10
vitrage_tempest_plugin/tests/api/rca/base.py
View File

@ -17,22 +17,22 @@ import json
from oslo_log import log as logging
from testtools import matchers
from vitrage.datasources.aodh import AODH_DATASOURCE
from vitrage.datasources import NOVA_HOST_DATASOURCE
from vitrage.datasources import NOVA_INSTANCE_DATASOURCE
from vitrage.entity_graph.mappings.operational_alarm_severity \
import OperationalAlarmSeverity
from vitrage.entity_graph.mappings.operational_resource_state \
import OperationalResourceState
from vitrage.evaluator.actions.evaluator_event_transformer \
import VITRAGE_DATASOURCE
from vitrage_tempest_plugin.tests.api.alarms.base import BaseAlarmsTest
from vitrage_tempest_plugin.tests.base import IsNotEmpty
from vitrage_tempest_plugin.tests.common import aodh_utils
from vitrage_tempest_plugin.tests.common.constants import AODH_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import EdgeLabel
from vitrage_tempest_plugin.tests.common.constants import EdgeProperties
from vitrage_tempest_plugin.tests.common.constants import NOVA_HOST_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import \
NOVA_INSTANCE_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import VertexProperties \
as VProps
from vitrage_tempest_plugin.tests.common.constants import VITRAGE_DATASOURCE
from vitrage_tempest_plugin.tests.common import general_utils as g_utils
from vitrage_tempest_plugin.tests.common import nova_utils
from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients

7
vitrage_tempest_plugin/tests/api/resources/test_resources.py
View File

@ -18,12 +18,13 @@ from oslo_log import log as logging
from testtools import matchers
import unittest
from vitrage.datasources import CINDER_VOLUME_DATASOURCE
from vitrage.datasources import NOVA_INSTANCE_DATASOURCE
from vitrage_tempest_plugin.tests.base import BaseVitrageTempest
from vitrage_tempest_plugin.tests.base import IsEmpty
from vitrage_tempest_plugin.tests.base import IsNotEmpty
from vitrage_tempest_plugin.tests.common.constants import \
CINDER_VOLUME_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import \
NOVA_INSTANCE_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import VertexProperties as \
VProps
from vitrage_tempest_plugin.tests.common import nova_utils

2
vitrage_tempest_plugin/tests/api/topology/test_topology.py
View File

@ -14,10 +14,10 @@
from oslo_log import log as logging
from vitrage.datasources import OPENSTACK_CLUSTER
from vitrage_tempest_plugin.tests.api.topology.base import BaseTopologyTest
from vitrage_tempest_plugin.tests.base import IsEmpty
from vitrage_tempest_plugin.tests.common.constants import OPENSTACK_CLUSTER
from vitrage_tempest_plugin.tests.common.constants import VertexProperties as \
VProps
import vitrage_tempest_plugin.tests.utils as utils

22
vitrage_tempest_plugin/tests/base.py
View File

@ -25,22 +25,26 @@ from oslotest import base
from testtools.matchers import HasLength
from testtools.matchers import Not
from vitrage.datasources.aodh import AODH_DATASOURCE
from vitrage.datasources.cinder.volume import CINDER_VOLUME_DATASOURCE
from vitrage.datasources.heat.stack import HEAT_STACK_DATASOURCE
from vitrage.datasources.neutron.network import NEUTRON_NETWORK_DATASOURCE
from vitrage.datasources.neutron.port import NEUTRON_PORT_DATASOURCE
from vitrage.datasources import NOVA_HOST_DATASOURCE
from vitrage.datasources import NOVA_INSTANCE_DATASOURCE
from vitrage.datasources import NOVA_ZONE_DATASOURCE
from vitrage.datasources import OPENSTACK_CLUSTER
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 \
CINDER_VOLUME_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import EdgeProperties
from vitrage_tempest_plugin.tests.common.constants import EntityCategory
from vitrage_tempest_plugin.tests.common.constants import HEAT_STACK_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import \
NEUTRON_NETWORK_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import \
NEUTRON_PORT_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import NOVA_HOST_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import \
NOVA_INSTANCE_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import NOVA_ZONE_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import OPENSTACK_CLUSTER
from vitrage_tempest_plugin.tests.common.constants import VertexProperties \
as VProps
from vitrage_tempest_plugin.tests.common import general_utils

13
vitrage_tempest_plugin/tests/common/constants.py
View File

@ -13,6 +13,19 @@
# License for the specific language governing permissions and limitations
# under the License.
AODH_DATASOURCE = 'aodh'
CINDER_VOLUME_DATASOURCE = 'cinder.volume'
HEAT_STACK_DATASOURCE = 'heat.stack'
NEUTRON_NETWORK_DATASOURCE = 'neutron.network'
NEUTRON_PORT_DATASOURCE = 'neutron.port'
NOVA_HOST_DATASOURCE = 'nova.host'
NOVA_INSTANCE_DATASOURCE = 'nova.instance'
NOVA_ZONE_DATASOURCE = 'nova.zone'
OPENSTACK_CLUSTER = 'openstack.cluster'
VITRAGE_DATASOURCE = 'vitrage'
DOCTOR_DATASOURCE = 'doctor'
class VertexProperties(object):
VITRAGE_CATEGORY = 'vitrage_category'

5
vitrage_tempest_plugin/tests/common/vitrage_utils.py
View File

@ -16,12 +16,13 @@ import os
from oslo_log import log as logging
from vitrage.datasources import NOVA_HOST_DATASOURCE
from vitrage.datasources import NOVA_INSTANCE_DATASOURCE
from vitrage.graph.driver.networkx_graph import NXGraph
from vitrage.graph import Edge
from vitrage.graph import Vertex
from vitrage_tempest_plugin.tests.common.constants import NOVA_HOST_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import \
NOVA_INSTANCE_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import TemplateStatus
from vitrage_tempest_plugin.tests.common.constants import TemplateTypes
from vitrage_tempest_plugin.tests.common import general_utils as g_utils

6
vitrage_tempest_plugin/tests/e2e/test_basic_actions.py
View File

@ -15,13 +15,11 @@ import time
from oslo_log import log as logging
from vitrage.datasources.doctor import DOCTOR_DATASOURCE
from vitrage.evaluator.actions.evaluator_event_transformer import \
VITRAGE_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import DOCTOR_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import EntityCategory
from vitrage_tempest_plugin.tests.common.constants import VertexProperties \
as VProps
from vitrage_tempest_plugin.tests.common.constants import VITRAGE_DATASOURCE
from vitrage_tempest_plugin.tests.common import general_utils as g_utils
from vitrage_tempest_plugin.tests.common import nova_utils
from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients

3
vitrage_tempest_plugin/tests/e2e/test_basic_template_actions.py
View File

@ -14,11 +14,10 @@
from oslo_log import log as logging
import time
from vitrage.evaluator.actions.evaluator_event_transformer import \
VITRAGE_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import EntityCategory
from vitrage_tempest_plugin.tests.common.constants import VertexProperties \
as VProps
from vitrage_tempest_plugin.tests.common.constants import VITRAGE_DATASOURCE
from vitrage_tempest_plugin.tests.common import vitrage_utils as v_util
from vitrage_tempest_plugin.tests.e2e.test_actions_base import TestActionsBase
from vitrage_tempest_plugin.tests import utils

5
vitrage_tempest_plugin/tests/e2e/test_overlapping_actions.py
View File

@ -15,13 +15,12 @@ import time
from oslo_log import log as logging
from vitrage.datasources.doctor import DOCTOR_DATASOURCE
from vitrage.evaluator.actions.evaluator_event_transformer import \
VITRAGE_DATASOURCE
from vitrage_tempest_plugin.tests.base import IsEmpty
from vitrage_tempest_plugin.tests.common.constants import DOCTOR_DATASOURCE
from vitrage_tempest_plugin.tests.common.constants import EntityCategory
from vitrage_tempest_plugin.tests.common.constants import VertexProperties \
as VProps
from vitrage_tempest_plugin.tests.common.constants import VITRAGE_DATASOURCE
from vitrage_tempest_plugin.tests.common import general_utils as g_utils
from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients
from vitrage_tempest_plugin.tests.common import vitrage_utils as v_utils