diff --git a/.coveragerc b/.coveragerc index 2858b74..a0d8da5 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,6 +1,6 @@ [run] branch = True -source = virtage_tempest_plugin +source = vitrage_tempest_plugin [report] ignore_errors = True diff --git a/setup.cfg b/setup.cfg index 5026b86..b88713f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [metadata] -name = vitrage_tempest_tests +name = vitrage_tempest_plugin summary = Tempest plugin for Vitrage project description-file = README.rst @@ -21,11 +21,11 @@ classifier = [files] packages = - vitrage_tempest_tests + vitrage_tempest_plugin [entry_points] tempest.test_plugins = - vitrage_tests = vitrage_tempest_tests.plugin:VitrageTempestPlugin + vitrage_tests = vitrage_tempest_plugin.plugin:VitrageTempestPlugin [build_sphinx] all-files = 1 @@ -37,15 +37,15 @@ build-dir = doc/build upload-dir = doc/build/html [compile_catalog] -directory = vitrage_tempest_tests/locale -domain = vitrage_tempest_tests +directory = vitrage_tempest_plugin/locale +domain = vitrage_tempest_plugin [update_catalog] -domain = vitrage_tempest_tests -output_dir = vitrage_tempest_tests/locale -input_file = vitrage_tempest_tests/locale/vitrage_tempest_tests.pot +domain = vitrage_tempest_plugin +output_dir = vitrage_tempest_plugin/locale +input_file = vitrage_tempest_plugin/locale/vitrage_tempest_plugin.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = vitrage_tempest_tests/locale/vitrage_tempest_tests.pot +output_file = vitrage_tempest_plugin/locale/vitrage_tempest_plugin.pot diff --git a/vitrage_tempest_tests/README.rst b/vitrage_tempest_plugin/README.rst similarity index 100% rename from vitrage_tempest_tests/README.rst rename to vitrage_tempest_plugin/README.rst diff --git a/vitrage_tempest_tests/__init__.py b/vitrage_tempest_plugin/__init__.py similarity index 100% rename from vitrage_tempest_tests/__init__.py rename to vitrage_tempest_plugin/__init__.py diff --git a/vitrage_tempest_tests/config.py b/vitrage_tempest_plugin/config.py similarity index 100% rename from vitrage_tempest_tests/config.py rename to vitrage_tempest_plugin/config.py diff --git a/vitrage_tempest_tests/plugin.py b/vitrage_tempest_plugin/plugin.py similarity index 93% rename from vitrage_tempest_tests/plugin.py rename to vitrage_tempest_plugin/plugin.py index ba526a5..7fa345a 100644 --- a/vitrage_tempest_tests/plugin.py +++ b/vitrage_tempest_plugin/plugin.py @@ -19,14 +19,14 @@ import os # noinspection PyPackageRequirements from tempest.test_discover import plugins -from vitrage_tempest_tests import config as config_rca_service +from vitrage_tempest_plugin import config as config_rca_service class VitrageTempestPlugin(plugins.TempestPlugin): def load_tests(self): base_path = os.path.split(os.path.dirname( os.path.abspath(__file__)))[0] - test_dir = "vitrage_tempest_tests/tests" + test_dir = "vitrage_tempest_plugin/tests" full_test_dir = os.path.join(base_path, test_dir) return full_test_dir, base_path diff --git a/vitrage_tempest_tests/services/__init__.py b/vitrage_tempest_plugin/services/__init__.py similarity index 100% rename from vitrage_tempest_tests/services/__init__.py rename to vitrage_tempest_plugin/services/__init__.py diff --git a/vitrage_tempest_tests/tests/__init__.py b/vitrage_tempest_plugin/tests/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/__init__.py rename to vitrage_tempest_plugin/tests/__init__.py diff --git a/vitrage_tempest_tests/tests/api/__init__.py b/vitrage_tempest_plugin/tests/api/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/api/__init__.py rename to vitrage_tempest_plugin/tests/api/__init__.py diff --git a/vitrage_tempest_tests/tests/api/alarms/__init__.py b/vitrage_tempest_plugin/tests/api/alarms/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/api/alarms/__init__.py rename to vitrage_tempest_plugin/tests/api/alarms/__init__.py diff --git a/vitrage_tempest_tests/tests/api/alarms/base.py b/vitrage_tempest_plugin/tests/api/alarms/base.py similarity index 89% rename from vitrage_tempest_tests/tests/api/alarms/base.py rename to vitrage_tempest_plugin/tests/api/alarms/base.py index 142e556..3fc04b0 100644 --- a/vitrage_tempest_tests/tests/api/alarms/base.py +++ b/vitrage_tempest_plugin/tests/api/alarms/base.py @@ -13,8 +13,8 @@ # under the License. from vitrage.datasources.aodh.properties import AodhProperties as AodhProps -from vitrage_tempest_tests.tests.base import BaseVitrageTempest -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests.base import BaseVitrageTempest +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients class BaseAlarmsTest(BaseVitrageTempest): diff --git a/vitrage_tempest_tests/tests/api/alarms/test_alarms.py b/vitrage_tempest_plugin/tests/api/alarms/test_alarms.py similarity index 88% rename from vitrage_tempest_tests/tests/api/alarms/test_alarms.py rename to vitrage_tempest_plugin/tests/api/alarms/test_alarms.py index 4f25142..e563796 100644 --- a/vitrage_tempest_tests/tests/api/alarms/test_alarms.py +++ b/vitrage_tempest_plugin/tests/api/alarms/test_alarms.py @@ -17,13 +17,13 @@ import json from oslo_log import log as logging from vitrage.datasources.aodh import AODH_DATASOURCE -from vitrage_tempest_tests.tests.api.alarms.base import BaseAlarmsTest -from vitrage_tempest_tests.tests.common import aodh_utils -from vitrage_tempest_tests.tests.common import general_utils as g_utils -from vitrage_tempest_tests.tests.common import nova_utils -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests.common import vitrage_utils as v_utils -from vitrage_tempest_tests.tests import utils +from vitrage_tempest_plugin.tests.api.alarms.base import BaseAlarmsTest +from vitrage_tempest_plugin.tests.common import aodh_utils +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 +from vitrage_tempest_plugin.tests.common import vitrage_utils as v_utils +from vitrage_tempest_plugin.tests import utils import unittest diff --git a/vitrage_tempest_tests/tests/api/event/__init__.py b/vitrage_tempest_plugin/tests/api/event/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/api/event/__init__.py rename to vitrage_tempest_plugin/tests/api/event/__init__.py diff --git a/vitrage_tempest_tests/tests/api/event/base.py b/vitrage_tempest_plugin/tests/api/event/base.py similarity index 95% rename from vitrage_tempest_tests/tests/api/event/base.py rename to vitrage_tempest_plugin/tests/api/event/base.py index 86f0508..d03e5a7 100644 --- a/vitrage_tempest_tests/tests/api/event/base.py +++ b/vitrage_tempest_plugin/tests/api/event/base.py @@ -15,7 +15,7 @@ from datetime import datetime from oslo_log import log as logging -from vitrage_tempest_tests.tests.e2e.test_basic_actions import TestActionsBase +from vitrage_tempest_plugin.tests.e2e.test_basic_actions import TestActionsBase LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/api/event/test_events.py b/vitrage_tempest_plugin/tests/api/event/test_events.py similarity index 94% rename from vitrage_tempest_tests/tests/api/event/test_events.py rename to vitrage_tempest_plugin/tests/api/event/test_events.py index 7ddea5b..1bcf122 100644 --- a/vitrage_tempest_tests/tests/api/event/test_events.py +++ b/vitrage_tempest_plugin/tests/api/event/test_events.py @@ -20,9 +20,9 @@ from oslo_log import log as logging from vitrage.common.constants import EntityCategory from vitrage.common.constants import EventProperties as EventProps from vitrage.common.constants import VertexProperties as VProps -from vitrage_tempest_tests.tests.api.event.base import BaseTestEvents -from vitrage_tempest_tests.tests.common.vitrage_utils import DOWN -from vitrage_tempest_tests.tests.utils import wait_for_answer +from vitrage_tempest_plugin.tests.api.event.base import BaseTestEvents +from vitrage_tempest_plugin.tests.common.vitrage_utils import DOWN +from vitrage_tempest_plugin.tests.utils import wait_for_answer LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/api/rca/__init__.py b/vitrage_tempest_plugin/tests/api/rca/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/api/rca/__init__.py rename to vitrage_tempest_plugin/tests/api/rca/__init__.py diff --git a/vitrage_tempest_tests/tests/api/rca/base.py b/vitrage_tempest_plugin/tests/api/rca/base.py similarity index 95% rename from vitrage_tempest_tests/tests/api/rca/base.py rename to vitrage_tempest_plugin/tests/api/rca/base.py index 2dd8ebd..024190a 100644 --- a/vitrage_tempest_tests/tests/api/rca/base.py +++ b/vitrage_tempest_plugin/tests/api/rca/base.py @@ -28,12 +28,12 @@ from vitrage.entity_graph.mappings.operational_resource_state \ import OperationalResourceState from vitrage.evaluator.actions.evaluator_event_transformer \ import VITRAGE_DATASOURCE -from vitrage_tempest_tests.tests.api.alarms.base import BaseAlarmsTest -from vitrage_tempest_tests.tests.common import aodh_utils -from vitrage_tempest_tests.tests.common import general_utils as g_utils -from vitrage_tempest_tests.tests.common import nova_utils -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests.common import vitrage_utils +from vitrage_tempest_plugin.tests.api.alarms.base import BaseAlarmsTest +from vitrage_tempest_plugin.tests.common import aodh_utils +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 +from vitrage_tempest_plugin.tests.common import vitrage_utils LOG = logging.getLogger(__name__) RCA_ALARM_NAME = 'rca_test_host_alarm' diff --git a/vitrage_tempest_tests/tests/api/rca/test_rca.py b/vitrage_tempest_plugin/tests/api/rca/test_rca.py similarity index 94% rename from vitrage_tempest_tests/tests/api/rca/test_rca.py rename to vitrage_tempest_plugin/tests/api/rca/test_rca.py index a59dd32..a9b05bc 100644 --- a/vitrage_tempest_tests/tests/api/rca/test_rca.py +++ b/vitrage_tempest_plugin/tests/api/rca/test_rca.py @@ -15,12 +15,12 @@ from oslo_log import log as logging from vitrage.common.constants import VertexProperties as VProps -from vitrage_tempest_tests.tests.api.rca.base import BaseRcaTest -from vitrage_tempest_tests.tests.api.rca.base import RCA_ALARM_NAME -from vitrage_tempest_tests.tests.common import nova_utils -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests.common import vitrage_utils as v_utils -from vitrage_tempest_tests.tests import utils +from vitrage_tempest_plugin.tests.api.rca.base import BaseRcaTest +from vitrage_tempest_plugin.tests.api.rca.base import RCA_ALARM_NAME +from vitrage_tempest_plugin.tests.common import nova_utils +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests.common import vitrage_utils as v_utils +from vitrage_tempest_plugin.tests import utils import unittest diff --git a/vitrage_tempest_tests/tests/api/resources/__init__.py b/vitrage_tempest_plugin/tests/api/resources/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/api/resources/__init__.py rename to vitrage_tempest_plugin/tests/api/resources/__init__.py diff --git a/vitrage_tempest_tests/tests/api/resources/test_resources.py b/vitrage_tempest_plugin/tests/api/resources/test_resources.py similarity index 98% rename from vitrage_tempest_tests/tests/api/resources/test_resources.py rename to vitrage_tempest_plugin/tests/api/resources/test_resources.py index 3866bc8..ec07341 100644 --- a/vitrage_tempest_tests/tests/api/resources/test_resources.py +++ b/vitrage_tempest_plugin/tests/api/resources/test_resources.py @@ -21,9 +21,9 @@ import unittest from vitrage.common.constants import VertexProperties as VProps from vitrage.datasources import CINDER_VOLUME_DATASOURCE from vitrage.datasources import NOVA_INSTANCE_DATASOURCE -from vitrage_tempest_tests.tests.base import BaseVitrageTempest -from vitrage_tempest_tests.tests.common import nova_utils -from vitrage_tempest_tests.tests import utils +from vitrage_tempest_plugin.tests.base import BaseVitrageTempest +from vitrage_tempest_plugin.tests.common import nova_utils +from vitrage_tempest_plugin.tests import utils from vitrageclient.exceptions import ClientException LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/api/templates/__init__.py b/vitrage_tempest_plugin/tests/api/templates/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/api/templates/__init__.py rename to vitrage_tempest_plugin/tests/api/templates/__init__.py diff --git a/vitrage_tempest_tests/tests/api/templates/base.py b/vitrage_tempest_plugin/tests/api/templates/base.py similarity index 96% rename from vitrage_tempest_tests/tests/api/templates/base.py rename to vitrage_tempest_plugin/tests/api/templates/base.py index 2b959e5..51d1f90 100644 --- a/vitrage_tempest_tests/tests/api/templates/base.py +++ b/vitrage_tempest_plugin/tests/api/templates/base.py @@ -16,10 +16,10 @@ import json from oslo_log import log as logging from vitrage.common.exception import VitrageError -from vitrage_tempest_tests.tests.base import BaseVitrageTempest -from vitrage_tempest_tests.tests.common import general_utils as g_utils -from vitrage_tempest_tests.tests.common import vitrage_utils -from vitrage_tempest_tests.tests import utils +from vitrage_tempest_plugin.tests.base import BaseVitrageTempest +from vitrage_tempest_plugin.tests.common import general_utils as g_utils +from vitrage_tempest_plugin.tests.common import vitrage_utils +from vitrage_tempest_plugin.tests import utils LOG = logging.getLogger(__name__) @@ -29,7 +29,7 @@ class BaseTemplateTest(BaseVitrageTempest): """Template test class for Vitrage API tests.""" DEFAULT_PATH = '/etc/vitrage/templates/' - TEST_PATH = '/opt/stack/vitrage/vitrage_tempest_tests/' \ + TEST_PATH = '/opt/stack/vitrage/vitrage_tempest_plugin/' \ + 'tests/resources/templates/api/' NON_EXIST_FILE = 'non_exist_file.yaml' diff --git a/vitrage_tempest_tests/tests/api/templates/test_template.py b/vitrage_tempest_plugin/tests/api/templates/test_template.py similarity index 97% rename from vitrage_tempest_tests/tests/api/templates/test_template.py rename to vitrage_tempest_plugin/tests/api/templates/test_template.py index 9a757d9..f9be04a 100644 --- a/vitrage_tempest_tests/tests/api/templates/test_template.py +++ b/vitrage_tempest_plugin/tests/api/templates/test_template.py @@ -19,11 +19,11 @@ from oslo_log import log as logging from vitrage.common.constants import TemplateStatus from vitrage.common.constants import TemplateTypes as TTypes from vitrage.utils import file -from vitrage_tempest_tests.tests.api.templates.base import BaseTemplateTest -from vitrage_tempest_tests.tests.common import general_utils as g_utils -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests.common import vitrage_utils as v_utils -import vitrage_tempest_tests.tests.utils as utils +from vitrage_tempest_plugin.tests.api.templates.base import BaseTemplateTest +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 +import vitrage_tempest_plugin.tests.utils as utils LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/api/templates/test_template_v2.py b/vitrage_tempest_plugin/tests/api/templates/test_template_v2.py similarity index 96% rename from vitrage_tempest_tests/tests/api/templates/test_template_v2.py rename to vitrage_tempest_plugin/tests/api/templates/test_template_v2.py index 3b3d761..764093a 100644 --- a/vitrage_tempest_tests/tests/api/templates/test_template_v2.py +++ b/vitrage_tempest_plugin/tests/api/templates/test_template_v2.py @@ -14,7 +14,7 @@ from oslo_log import log as logging -from vitrage_tempest_tests.tests.api.templates.base import BaseTemplateTest +from vitrage_tempest_plugin.tests.api.templates.base import BaseTemplateTest LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/api/topology/__init__.py b/vitrage_tempest_plugin/tests/api/topology/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/api/topology/__init__.py rename to vitrage_tempest_plugin/tests/api/topology/__init__.py diff --git a/vitrage_tempest_tests/tests/api/topology/base.py b/vitrage_tempest_plugin/tests/api/topology/base.py similarity index 95% rename from vitrage_tempest_tests/tests/api/topology/base.py rename to vitrage_tempest_plugin/tests/api/topology/base.py index c25cddb..d560d3e 100644 --- a/vitrage_tempest_tests/tests/api/topology/base.py +++ b/vitrage_tempest_plugin/tests/api/topology/base.py @@ -17,10 +17,10 @@ import time from vitrage.common.constants import VertexProperties as VProps -from vitrage_tempest_tests.tests.base import BaseVitrageTempest -from vitrage_tempest_tests.tests.base import LOG -from vitrage_tempest_tests.tests.common import cinder_utils -from vitrage_tempest_tests.tests.common import nova_utils +from vitrage_tempest_plugin.tests.base import BaseVitrageTempest +from vitrage_tempest_plugin.tests.base import LOG +from vitrage_tempest_plugin.tests.common import cinder_utils +from vitrage_tempest_plugin.tests.common import nova_utils class BaseTopologyTest(BaseVitrageTempest): diff --git a/vitrage_tempest_tests/tests/api/topology/test_topology.py b/vitrage_tempest_plugin/tests/api/topology/test_topology.py similarity index 99% rename from vitrage_tempest_tests/tests/api/topology/test_topology.py rename to vitrage_tempest_plugin/tests/api/topology/test_topology.py index 6720b3c..76234ec 100644 --- a/vitrage_tempest_tests/tests/api/topology/test_topology.py +++ b/vitrage_tempest_plugin/tests/api/topology/test_topology.py @@ -16,8 +16,8 @@ from oslo_log import log as logging from vitrage.common.constants import VertexProperties as VProps from vitrage.datasources import OPENSTACK_CLUSTER -from vitrage_tempest_tests.tests.api.topology.base import BaseTopologyTest -import vitrage_tempest_tests.tests.utils as utils +from vitrage_tempest_plugin.tests.api.topology.base import BaseTopologyTest +import vitrage_tempest_plugin.tests.utils as utils from vitrageclient.exceptions import ClientException import unittest diff --git a/vitrage_tempest_tests/tests/api/webhook/__init__.py b/vitrage_tempest_plugin/tests/api/webhook/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/api/webhook/__init__.py rename to vitrage_tempest_plugin/tests/api/webhook/__init__.py diff --git a/vitrage_tempest_tests/tests/api/webhook/test_webhook.py b/vitrage_tempest_plugin/tests/api/webhook/test_webhook.py similarity index 97% rename from vitrage_tempest_tests/tests/api/webhook/test_webhook.py rename to vitrage_tempest_plugin/tests/api/webhook/test_webhook.py index 2113f6b..eb8d296 100644 --- a/vitrage_tempest_tests/tests/api/webhook/test_webhook.py +++ b/vitrage_tempest_plugin/tests/api/webhook/test_webhook.py @@ -14,8 +14,8 @@ from oslo_log import log as logging -from vitrage_tempest_tests.tests.base import BaseVitrageTempest -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests.base import BaseVitrageTempest +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients from vitrageclient.exceptions import ClientException LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/base.py b/vitrage_tempest_plugin/tests/base.py similarity index 98% rename from vitrage_tempest_tests/tests/base.py rename to vitrage_tempest_plugin/tests/base.py index 4f1aba1..f72cd58 100644 --- a/vitrage_tempest_tests/tests/base.py +++ b/vitrage_tempest_plugin/tests/base.py @@ -38,8 +38,8 @@ 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_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests import utils +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests import utils import warnings diff --git a/vitrage_tempest_tests/tests/common/__init__.py b/vitrage_tempest_plugin/tests/common/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/common/__init__.py rename to vitrage_tempest_plugin/tests/common/__init__.py diff --git a/vitrage_tempest_tests/tests/common/aodh_utils.py b/vitrage_tempest_plugin/tests/common/aodh_utils.py similarity index 95% rename from vitrage_tempest_tests/tests/common/aodh_utils.py rename to vitrage_tempest_plugin/tests/common/aodh_utils.py index e650bee..2844ecd 100644 --- a/vitrage_tempest_tests/tests/common/aodh_utils.py +++ b/vitrage_tempest_plugin/tests/common/aodh_utils.py @@ -14,7 +14,7 @@ import random import time from vitrage.datasources.aodh.properties import AodhProperties as AodhProps -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients def create_aodh_alarm(resource_id=None, name=None, unic=True): diff --git a/vitrage_tempest_tests/tests/common/ceilometer_utils.py b/vitrage_tempest_plugin/tests/common/ceilometer_utils.py similarity index 95% rename from vitrage_tempest_tests/tests/common/ceilometer_utils.py rename to vitrage_tempest_plugin/tests/common/ceilometer_utils.py index 89c1a5b..2ab6363 100644 --- a/vitrage_tempest_tests/tests/common/ceilometer_utils.py +++ b/vitrage_tempest_plugin/tests/common/ceilometer_utils.py @@ -13,7 +13,7 @@ # under the License. import random import time -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients def create_ceilometer_alarm(resource_id=None, name=None, unic=True): diff --git a/vitrage_tempest_tests/tests/common/cinder_utils.py b/vitrage_tempest_plugin/tests/common/cinder_utils.py similarity index 92% rename from vitrage_tempest_tests/tests/common/cinder_utils.py rename to vitrage_tempest_plugin/tests/common/cinder_utils.py index 57bac80..6daf143 100644 --- a/vitrage_tempest_tests/tests/common/cinder_utils.py +++ b/vitrage_tempest_plugin/tests/common/cinder_utils.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. import time -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests.utils import wait_for_status +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests.utils import wait_for_status def create_volume_and_attach(name, size, instance_id, mount_point): diff --git a/vitrage_tempest_tests/tests/common/constants.py b/vitrage_tempest_plugin/tests/common/constants.py similarity index 100% rename from vitrage_tempest_tests/tests/common/constants.py rename to vitrage_tempest_plugin/tests/common/constants.py diff --git a/vitrage_tempest_tests/tests/common/general_utils.py b/vitrage_tempest_plugin/tests/common/general_utils.py similarity index 100% rename from vitrage_tempest_tests/tests/common/general_utils.py rename to vitrage_tempest_plugin/tests/common/general_utils.py diff --git a/vitrage_tempest_tests/tests/common/glance_utils.py b/vitrage_tempest_plugin/tests/common/glance_utils.py similarity index 89% rename from vitrage_tempest_tests/tests/common/glance_utils.py rename to vitrage_tempest_plugin/tests/common/glance_utils.py index 26fce81..d4b92a2 100644 --- a/vitrage_tempest_tests/tests/common/glance_utils.py +++ b/vitrage_tempest_plugin/tests/common/glance_utils.py @@ -11,7 +11,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients def get_first_image(): diff --git a/vitrage_tempest_tests/tests/common/heat_utils.py b/vitrage_tempest_plugin/tests/common/heat_utils.py similarity index 93% rename from vitrage_tempest_tests/tests/common/heat_utils.py rename to vitrage_tempest_plugin/tests/common/heat_utils.py index 7d561fe..a9823d5 100644 --- a/vitrage_tempest_tests/tests/common/heat_utils.py +++ b/vitrage_tempest_plugin/tests/common/heat_utils.py @@ -16,8 +16,8 @@ import time from heatclient.common import http from heatclient.common import template_utils -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests.utils import wait_for_status +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests.utils import wait_for_status def create_stacks(num_stacks, nested, template_file): diff --git a/vitrage_tempest_tests/tests/common/neutron_utils.py b/vitrage_tempest_plugin/tests/common/neutron_utils.py similarity index 82% rename from vitrage_tempest_tests/tests/common/neutron_utils.py rename to vitrage_tempest_plugin/tests/common/neutron_utils.py index 7c36aa8..2ea5a16 100644 --- a/vitrage_tempest_tests/tests/common/neutron_utils.py +++ b/vitrage_tempest_plugin/tests/common/neutron_utils.py @@ -11,8 +11,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from vitrage_tempest_tests.tests.common import general_utils as g_utils -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests.common import general_utils as g_utils +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients def get_public_network(): diff --git a/vitrage_tempest_tests/tests/common/nova_utils.py b/vitrage_tempest_plugin/tests/common/nova_utils.py similarity index 85% rename from vitrage_tempest_tests/tests/common/nova_utils.py rename to vitrage_tempest_plugin/tests/common/nova_utils.py index 178b422..829703a 100644 --- a/vitrage_tempest_tests/tests/common/nova_utils.py +++ b/vitrage_tempest_plugin/tests/common/nova_utils.py @@ -13,11 +13,11 @@ # under the License. import time -from vitrage_tempest_tests.tests.common import general_utils as g_utils -from vitrage_tempest_tests.tests.common import glance_utils -from vitrage_tempest_tests.tests.common import neutron_utils -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests.utils import wait_for_status +from vitrage_tempest_plugin.tests.common import general_utils as g_utils +from vitrage_tempest_plugin.tests.common import glance_utils +from vitrage_tempest_plugin.tests.common import neutron_utils +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests.utils import wait_for_status def create_instances(num_instances=1, set_public_network=False, name='vm'): diff --git a/vitrage_tempest_tests/tests/common/tempest_clients.py b/vitrage_tempest_plugin/tests/common/tempest_clients.py similarity index 100% rename from vitrage_tempest_tests/tests/common/tempest_clients.py rename to vitrage_tempest_plugin/tests/common/tempest_clients.py diff --git a/vitrage_tempest_tests/tests/common/vitrage_utils.py b/vitrage_tempest_plugin/tests/common/vitrage_utils.py similarity index 92% rename from vitrage_tempest_tests/tests/common/vitrage_utils.py rename to vitrage_tempest_plugin/tests/common/vitrage_utils.py index 58a0825..fb1d186 100644 --- a/vitrage_tempest_tests/tests/common/vitrage_utils.py +++ b/vitrage_tempest_plugin/tests/common/vitrage_utils.py @@ -18,9 +18,9 @@ from vitrage.common.constants import TemplateStatus from vitrage.common.constants import TemplateTypes from vitrage.datasources import NOVA_HOST_DATASOURCE from vitrage.datasources import NOVA_INSTANCE_DATASOURCE -from vitrage_tempest_tests.tests.common import general_utils as g_utils -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests.utils import wait_for_status +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.utils import wait_for_status LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/database/__init__.py b/vitrage_tempest_plugin/tests/database/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/database/__init__.py rename to vitrage_tempest_plugin/tests/database/__init__.py diff --git a/vitrage_tempest_tests/tests/database/test_persistor.py b/vitrage_tempest_plugin/tests/database/test_persistor.py similarity index 97% rename from vitrage_tempest_tests/tests/database/test_persistor.py rename to vitrage_tempest_plugin/tests/database/test_persistor.py index 251c84d..89ec4f1 100644 --- a/vitrage_tempest_tests/tests/database/test_persistor.py +++ b/vitrage_tempest_plugin/tests/database/test_persistor.py @@ -21,8 +21,8 @@ from vitrage.common.constants import DatasourceProperties as DSProps from vitrage.datasources import NEUTRON_PORT_DATASOURCE from vitrage.datasources import NOVA_INSTANCE_DATASOURCE from vitrage import storage -from vitrage_tempest_tests.tests.base import BaseVitrageTempest -from vitrage_tempest_tests.tests.common import nova_utils +from vitrage_tempest_plugin.tests.base import BaseVitrageTempest +from vitrage_tempest_plugin.tests.common import nova_utils LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/datasources/__init__.py b/vitrage_tempest_plugin/tests/datasources/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/datasources/__init__.py rename to vitrage_tempest_plugin/tests/datasources/__init__.py diff --git a/vitrage_tempest_tests/tests/datasources/test_aodh.py b/vitrage_tempest_plugin/tests/datasources/test_aodh.py similarity index 92% rename from vitrage_tempest_tests/tests/datasources/test_aodh.py rename to vitrage_tempest_plugin/tests/datasources/test_aodh.py index c4eebd6..5e63dd9 100644 --- a/vitrage_tempest_tests/tests/datasources/test_aodh.py +++ b/vitrage_tempest_plugin/tests/datasources/test_aodh.py @@ -13,12 +13,12 @@ # under the License. from oslo_log import log as logging -from vitrage_tempest_tests.tests import utils +from vitrage_tempest_plugin.tests import utils -from vitrage_tempest_tests.tests.api.alarms.base import BaseAlarmsTest -from vitrage_tempest_tests.tests.common import aodh_utils -from vitrage_tempest_tests.tests.common import nova_utils -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests.api.alarms.base import BaseAlarmsTest +from vitrage_tempest_plugin.tests.common import aodh_utils +from vitrage_tempest_plugin.tests.common import nova_utils +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/datasources/test_cinder_volume.py b/vitrage_tempest_plugin/tests/datasources/test_cinder_volume.py similarity index 95% rename from vitrage_tempest_tests/tests/datasources/test_cinder_volume.py rename to vitrage_tempest_plugin/tests/datasources/test_cinder_volume.py index 288c59a..ea9af04 100644 --- a/vitrage_tempest_tests/tests/datasources/test_cinder_volume.py +++ b/vitrage_tempest_plugin/tests/datasources/test_cinder_volume.py @@ -13,8 +13,8 @@ # under the License. from oslo_log import log as logging -from vitrage_tempest_tests.tests.api.topology.base import BaseTopologyTest -from vitrage_tempest_tests.tests import utils +from vitrage_tempest_plugin.tests.api.topology.base import BaseTopologyTest +from vitrage_tempest_plugin.tests import utils LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/datasources/test_heat_stack.py b/vitrage_tempest_plugin/tests/datasources/test_heat_stack.py similarity index 92% rename from vitrage_tempest_tests/tests/datasources/test_heat_stack.py rename to vitrage_tempest_plugin/tests/datasources/test_heat_stack.py index c30a1ae..6b36235 100644 --- a/vitrage_tempest_tests/tests/datasources/test_heat_stack.py +++ b/vitrage_tempest_plugin/tests/datasources/test_heat_stack.py @@ -13,12 +13,12 @@ # under the License. from oslo_log import log as logging -from vitrage_tempest_tests.tests import utils +from vitrage_tempest_plugin.tests import utils -from vitrage_tempest_tests.tests.api.topology.base import BaseTopologyTest -from vitrage_tempest_tests.tests.common.general_utils\ +from vitrage_tempest_plugin.tests.api.topology.base import BaseTopologyTest +from vitrage_tempest_plugin.tests.common.general_utils\ import tempest_resources_dir -from vitrage_tempest_tests.tests.common import heat_utils +from vitrage_tempest_plugin.tests.common import heat_utils LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/datasources/test_neutron.py b/vitrage_tempest_plugin/tests/datasources/test_neutron.py similarity index 93% rename from vitrage_tempest_tests/tests/datasources/test_neutron.py rename to vitrage_tempest_plugin/tests/datasources/test_neutron.py index fde1acc..c581fec 100644 --- a/vitrage_tempest_tests/tests/datasources/test_neutron.py +++ b/vitrage_tempest_plugin/tests/datasources/test_neutron.py @@ -15,10 +15,10 @@ from oslo_log import log as logging from vitrage.common.constants import VertexProperties as VProps -from vitrage_tempest_tests.tests.api.topology.base import BaseTopologyTest -from vitrage_tempest_tests.tests.common import general_utils as g_utils -from vitrage_tempest_tests.tests.common import nova_utils -from vitrage_tempest_tests.tests import utils +from vitrage_tempest_plugin.tests.api.topology.base import BaseTopologyTest +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 import utils LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/datasources/test_nova.py b/vitrage_tempest_plugin/tests/datasources/test_nova.py similarity index 94% rename from vitrage_tempest_tests/tests/datasources/test_nova.py rename to vitrage_tempest_plugin/tests/datasources/test_nova.py index f44af7e..b448cf9 100644 --- a/vitrage_tempest_tests/tests/datasources/test_nova.py +++ b/vitrage_tempest_plugin/tests/datasources/test_nova.py @@ -13,8 +13,8 @@ # under the License. from oslo_log import log as logging -from vitrage_tempest_tests.tests.api.topology.base import BaseTopologyTest -from vitrage_tempest_tests.tests import utils +from vitrage_tempest_plugin.tests.api.topology.base import BaseTopologyTest +from vitrage_tempest_plugin.tests import utils LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/datasources/test_static_physical.py b/vitrage_tempest_plugin/tests/datasources/test_static_physical.py similarity index 94% rename from vitrage_tempest_tests/tests/datasources/test_static_physical.py rename to vitrage_tempest_plugin/tests/datasources/test_static_physical.py index 302e03e..ce5aef1 100644 --- a/vitrage_tempest_tests/tests/datasources/test_static_physical.py +++ b/vitrage_tempest_plugin/tests/datasources/test_static_physical.py @@ -17,10 +17,10 @@ import socket import time from oslo_log import log as logging -from vitrage_tempest_tests.tests.base import BaseVitrageTempest -from vitrage_tempest_tests.tests.common.general_utils \ +from vitrage_tempest_plugin.tests.base import BaseVitrageTempest +from vitrage_tempest_plugin.tests.common.general_utils \ import tempest_resources_dir -from vitrage_tempest_tests.tests import utils +from vitrage_tempest_plugin.tests import utils LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/e2e/__init__.py b/vitrage_tempest_plugin/tests/e2e/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/e2e/__init__.py rename to vitrage_tempest_plugin/tests/e2e/__init__.py diff --git a/vitrage_tempest_tests/tests/e2e/test_actions_base.py b/vitrage_tempest_plugin/tests/e2e/test_actions_base.py similarity index 90% rename from vitrage_tempest_tests/tests/e2e/test_actions_base.py rename to vitrage_tempest_plugin/tests/e2e/test_actions_base.py index 95cdf9a..d197ce4 100644 --- a/vitrage_tempest_tests/tests/e2e/test_actions_base.py +++ b/vitrage_tempest_plugin/tests/e2e/test_actions_base.py @@ -16,10 +16,10 @@ import time from oslo_log import log as logging from vitrage.common.constants import VertexProperties as VProps -from vitrage_tempest_tests.tests.base import BaseVitrageTempest -from vitrage_tempest_tests.tests.common import general_utils as g_utils -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests.common import vitrage_utils +from vitrage_tempest_plugin.tests.base import BaseVitrageTempest +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 LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/e2e/test_basic_actions.py b/vitrage_tempest_plugin/tests/e2e/test_basic_actions.py similarity index 94% rename from vitrage_tempest_tests/tests/e2e/test_basic_actions.py rename to vitrage_tempest_plugin/tests/e2e/test_basic_actions.py index ccf574f..bc31a46 100644 --- a/vitrage_tempest_tests/tests/e2e/test_basic_actions.py +++ b/vitrage_tempest_plugin/tests/e2e/test_basic_actions.py @@ -20,12 +20,12 @@ from vitrage.common.constants import VertexProperties as VProps from vitrage.datasources.doctor import DOCTOR_DATASOURCE from vitrage.evaluator.actions.evaluator_event_transformer import \ VITRAGE_DATASOURCE -from vitrage_tempest_tests.tests.common import general_utils as g_utils -from vitrage_tempest_tests.tests.common import nova_utils -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests.common import vitrage_utils as v_utils -from vitrage_tempest_tests.tests.e2e.test_actions_base import TestActionsBase -from vitrage_tempest_tests.tests import utils +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 +from vitrage_tempest_plugin.tests.common import vitrage_utils as v_utils +from vitrage_tempest_plugin.tests.e2e.test_actions_base import TestActionsBase +from vitrage_tempest_plugin.tests import utils LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/e2e/test_basic_template_actions.py b/vitrage_tempest_plugin/tests/e2e/test_basic_template_actions.py similarity index 97% rename from vitrage_tempest_tests/tests/e2e/test_basic_template_actions.py rename to vitrage_tempest_plugin/tests/e2e/test_basic_template_actions.py index edc8613..b93bc89 100644 --- a/vitrage_tempest_tests/tests/e2e/test_basic_template_actions.py +++ b/vitrage_tempest_plugin/tests/e2e/test_basic_template_actions.py @@ -18,9 +18,9 @@ from vitrage.common.constants import EntityCategory from vitrage.common.constants import VertexProperties as VProps from vitrage.evaluator.actions.evaluator_event_transformer import \ VITRAGE_DATASOURCE -from vitrage_tempest_tests.tests.common import vitrage_utils as v_util -from vitrage_tempest_tests.tests.e2e.test_actions_base import TestActionsBase -from vitrage_tempest_tests.tests import utils +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 LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/e2e/test_e2e_webhook.py b/vitrage_tempest_plugin/tests/e2e/test_e2e_webhook.py similarity index 96% rename from vitrage_tempest_tests/tests/e2e/test_e2e_webhook.py rename to vitrage_tempest_plugin/tests/e2e/test_e2e_webhook.py index b761b94..3541a24 100644 --- a/vitrage_tempest_tests/tests/e2e/test_e2e_webhook.py +++ b/vitrage_tempest_plugin/tests/e2e/test_e2e_webhook.py @@ -21,14 +21,14 @@ from testtools import matchers from threading import Thread import time -from vitrage_tempest_tests.tests.base import IsEmpty -from vitrage_tempest_tests.tests.common.constants import VertexProperties as \ +from vitrage_tempest_plugin.tests.base import IsEmpty +from vitrage_tempest_plugin.tests.common.constants import VertexProperties as \ VProps -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests.common import vitrage_utils as v_utils +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests.common import vitrage_utils as v_utils -from vitrage_tempest_tests.tests.e2e.test_actions_base import TestActionsBase -from vitrage_tempest_tests.tests import utils +from vitrage_tempest_plugin.tests.e2e.test_actions_base import TestActionsBase +from vitrage_tempest_plugin.tests import utils LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/e2e/test_overlapping_actions.py b/vitrage_tempest_plugin/tests/e2e/test_overlapping_actions.py similarity index 96% rename from vitrage_tempest_tests/tests/e2e/test_overlapping_actions.py rename to vitrage_tempest_plugin/tests/e2e/test_overlapping_actions.py index ce0bb37..6ad9343 100644 --- a/vitrage_tempest_tests/tests/e2e/test_overlapping_actions.py +++ b/vitrage_tempest_plugin/tests/e2e/test_overlapping_actions.py @@ -20,11 +20,11 @@ from vitrage.common.constants import VertexProperties as VProps from vitrage.datasources.doctor import DOCTOR_DATASOURCE from vitrage.evaluator.actions.evaluator_event_transformer import \ VITRAGE_DATASOURCE -from vitrage_tempest_tests.tests.common import general_utils as g_utils -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests.common import vitrage_utils as v_utils -from vitrage_tempest_tests.tests.e2e.test_actions_base import TestActionsBase -from vitrage_tempest_tests.tests import utils +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 +from vitrage_tempest_plugin.tests.e2e.test_actions_base import TestActionsBase +from vitrage_tempest_plugin.tests import utils LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/notifiers/__init__.py b/vitrage_tempest_plugin/tests/notifiers/__init__.py similarity index 100% rename from vitrage_tempest_tests/tests/notifiers/__init__.py rename to vitrage_tempest_plugin/tests/notifiers/__init__.py diff --git a/vitrage_tempest_tests/tests/notifiers/test_mistral_notifier.py b/vitrage_tempest_plugin/tests/notifiers/test_mistral_notifier.py similarity index 95% rename from vitrage_tempest_tests/tests/notifiers/test_mistral_notifier.py rename to vitrage_tempest_plugin/tests/notifiers/test_mistral_notifier.py index 9392379..03bc5fd 100644 --- a/vitrage_tempest_tests/tests/notifiers/test_mistral_notifier.py +++ b/vitrage_tempest_plugin/tests/notifiers/test_mistral_notifier.py @@ -17,11 +17,11 @@ from oslo_log import log as logging from testtools.matchers import HasLength from vitrage import os_clients -from vitrage_tempest_tests.tests.api.event.base import BaseTestEvents -from vitrage_tempest_tests.tests.common.tempest_clients import TempestClients -from vitrage_tempest_tests.tests.common import vitrage_utils as v_utils -from vitrage_tempest_tests.tests import utils -from vitrage_tempest_tests.tests.utils import wait_for_status +from vitrage_tempest_plugin.tests.api.event.base import BaseTestEvents +from vitrage_tempest_plugin.tests.common.tempest_clients import TempestClients +from vitrage_tempest_plugin.tests.common import vitrage_utils as v_utils +from vitrage_tempest_plugin.tests import utils +from vitrage_tempest_plugin.tests.utils import wait_for_status LOG = logging.getLogger(__name__) diff --git a/vitrage_tempest_tests/tests/resources/heat/heat_nested_template.yaml b/vitrage_tempest_plugin/tests/resources/heat/heat_nested_template.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/heat/heat_nested_template.yaml rename to vitrage_tempest_plugin/tests/resources/heat/heat_nested_template.yaml diff --git a/vitrage_tempest_tests/tests/resources/heat/heat_template.yaml b/vitrage_tempest_plugin/tests/resources/heat/heat_template.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/heat/heat_template.yaml rename to vitrage_tempest_plugin/tests/resources/heat/heat_template.yaml diff --git a/vitrage_tempest_tests/tests/resources/heat/server.yaml b/vitrage_tempest_plugin/tests/resources/heat/server.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/heat/server.yaml rename to vitrage_tempest_plugin/tests/resources/heat/server.yaml diff --git a/vitrage_tempest_tests/tests/resources/static_physical/static_physical_configuration.yaml b/vitrage_tempest_plugin/tests/resources/static_physical/static_physical_configuration.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/static_physical/static_physical_configuration.yaml rename to vitrage_tempest_plugin/tests/resources/static_physical/static_physical_configuration.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/basic_def_template.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/basic_def_template.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/basic_def_template.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/basic_def_template.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/basic_equivalence_templates.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/basic_equivalence_templates.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/basic_equivalence_templates.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/basic_equivalence_templates.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/corrupted_template.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/corrupted_template.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/corrupted_template.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/corrupted_template.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/e2e_test_basic_actions.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/e2e_test_basic_actions.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/e2e_test_basic_actions.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/e2e_test_basic_actions.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/e2e_test_overlapping_actions.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/e2e_test_overlapping_actions.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/e2e_test_overlapping_actions.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/e2e_test_overlapping_actions.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/e2e_test_template/e2e_test_template_actions.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/e2e_test_template/e2e_test_template_actions.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/e2e_test_template/e2e_test_template_actions.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/e2e_test_template/e2e_test_template_actions.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/e2e_test_template/e2e_test_template_actions_2.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/e2e_test_template/e2e_test_template_actions_2.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/e2e_test_template/e2e_test_template_actions_2.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/e2e_test_template/e2e_test_template_actions_2.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/e2e_webhooks.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/e2e_webhooks.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/e2e_webhooks.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/e2e_webhooks.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/equivalence_template.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/equivalence_template.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/equivalence_template.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/equivalence_template.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/host_aodh_alarm_for_rca.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/host_aodh_alarm_for_rca.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/host_aodh_alarm_for_rca.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/host_aodh_alarm_for_rca.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/host_high_memory_usage_scenarios.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/host_high_memory_usage_scenarios.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/host_high_memory_usage_scenarios.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/host_high_memory_usage_scenarios.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/nagios_alarm_for_alarms.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/nagios_alarm_for_alarms.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/nagios_alarm_for_alarms.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/nagios_alarm_for_alarms.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/v1_execute_mistral.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/v1_execute_mistral.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/v1_execute_mistral.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/v1_execute_mistral.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/v2_definition_template.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/v2_definition_template.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/v2_definition_template.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/v2_definition_template.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/v2_equivalence_template.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/v2_equivalence_template.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/v2_equivalence_template.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/v2_equivalence_template.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/v2_execute_mistral.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/v2_execute_mistral.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/v2_execute_mistral.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/v2_execute_mistral.yaml diff --git a/vitrage_tempest_tests/tests/resources/templates/api/v2_no_type_template.yaml b/vitrage_tempest_plugin/tests/resources/templates/api/v2_no_type_template.yaml similarity index 100% rename from vitrage_tempest_tests/tests/resources/templates/api/v2_no_type_template.yaml rename to vitrage_tempest_plugin/tests/resources/templates/api/v2_no_type_template.yaml diff --git a/vitrage_tempest_tests/tests/utils.py b/vitrage_tempest_plugin/tests/utils.py similarity index 100% rename from vitrage_tempest_tests/tests/utils.py rename to vitrage_tempest_plugin/tests/utils.py