diff --git a/.stestr.conf b/.stestr.conf index 2884b66..841d0f5 100644 --- a/.stestr.conf +++ b/.stestr.conf @@ -1,4 +1,4 @@ [DEFAULT] -test_path=./vmware_nsx_tempest/tests +test_path=./vmware_nsx_tempest_plugin/tests top_dir=./ diff --git a/.testr.conf b/.testr.conf index 0bb29da..4484107 100644 --- a/.testr.conf +++ b/.testr.conf @@ -5,7 +5,7 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ OS_DEBUG=${OS_DEBUG:-1} \ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-500} \ OS_TEST_LOCK_PATH=${OS_TEST_LOCK_PATH:-${TMPDIR:-'/tmp'}} \ - ${PYTHON:-python} -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./vmware_nsx_tempest} $LISTOPT $IDOPTION + ${PYTHON:-python} -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./vmware_nsx_tempest_plugin} $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/README.rst b/README.rst index 9b32647..6f89431 100644 --- a/README.rst +++ b/README.rst @@ -61,11 +61,11 @@ Installation: Location: /opt/stack/vmware-nsx-tempest-plugin -#. Validate installed vmware_nsx_tempest successfully do:: +#. Validate installed vmware_nsx_tempest_plugin successfully do:: $ cd /opt/stack/vmware-nsx-tempest-plugin - $ ostestr -l vmware_nsx_tempest - $ ostestr vmware_nsx_tempest.tests.nsxv3.scenario.test_mdproxy.TestMDProxy.test_mdproxy_ping + $ ostestr -l vmware_nsx_tempest_plugin + $ ostestr vmware_nsx_tempest_plugin.tests.nsxv3.scenario.test_mdproxy.TestMDProxy.test_mdproxy_ping $ python -m testtools.run vmware_nsx_tempest.tests.nsxv3.scenario.test_mdproxy.TestMDProxy.test_mdproxy_ping Your installation failed, if no tests are shown. @@ -77,8 +77,8 @@ vmware-nsx-tempest tests are tempest tests, you need to run from tempest directory. For example, to run only l2-gateway tests:: $ cd /opt/stack/tempest - $ ostestr vmware_nsx_tempest.*test_l2_gateway - $ ostestr vmware_nsx_tempest.tests.nsxv.api.test_l2_gateway_connection.L2GatewayConnectionTest.test_csuld_single_device_interface_vlan + $ ostestr vmware_nsx_tempest_plugin.*test_l2_gateway + $ ostestr vmware_nsx_tempest_plugin.tests.nsxv.api.test_l2_gateway_connection.L2GatewayConnectionTest.test_csuld_single_device_interface_vlan TechNote on vmware-nsx-tempest-plugin: ========================================= diff --git a/setup.cfg b/setup.cfg index bf0ce88..faef5ca 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,7 +21,7 @@ classifier = [files] packages = - vmware_nsx_tempest + vmware_nsx_tempest_plugin [build_sphinx] all-files = 1 @@ -33,19 +33,19 @@ build-dir = doc/build upload-dir = doc/build/html [compile_catalog] -directory = vmware_nsx_tempest/locale -domain = vmware_nsx_tempest +directory = vmware_nsx_tempest_plugin/locale +domain = vmware_nsx_tempest_plugin [update_catalog] -domain = vmware_nsx_tempest -output_dir = vmware_nsx_tempest/locale -input_file = vmware_nsx_tempest/locale/vmware_nsx_tempest.pot +domain = vmware_nsx_tempest_plugin +output_dir = vmware_nsx_tempest_plugin/locale +input_file = vmware_nsx_tempest_plugin/locale/vmware_nsx_tempest.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = vmware_nsx_tempest/locale/vmware_nsx_tempest.pot +output_file = vmware_nsx_tempest_plugin/locale/vmware_nsx_tempest_plugin.pot [entry_points] tempest.test_plugins = - vmware-nsx-tempest-plugin = vmware_nsx_tempest.plugin:VmwareNsxTempestPlugin + vmware-nsx-tempest-plugin = vmware_nsx_tempest_plugin.plugin:VmwareNsxTempestPlugin diff --git a/tox.ini b/tox.ini index 3d4ce20..c924c3f 100644 --- a/tox.ini +++ b/tox.ini @@ -90,4 +90,4 @@ import-order-style = pep8 # B109 password_config_option_not_marked_secret # B602 subprocess_popen_with_shell_equals_true - removed when fixed # B605 start_process_with_a_shell - remove when fixed -commands = bandit -r vmware_nsx_tempest -n 5 -s B108,B109,B602,B605 -ll +commands = bandit -r vmware_nsx_tempest_plugin -n 5 -s B108,B109,B602,B605 -ll diff --git a/vmware_nsx_tempest/__init__.py b/vmware_nsx_tempest_plugin/__init__.py similarity index 100% rename from vmware_nsx_tempest/__init__.py rename to vmware_nsx_tempest_plugin/__init__.py diff --git a/vmware_nsx_tempest/_i18n.py b/vmware_nsx_tempest_plugin/_i18n.py similarity index 96% rename from vmware_nsx_tempest/_i18n.py rename to vmware_nsx_tempest_plugin/_i18n.py index 8d32e0d..c175b91 100644 --- a/vmware_nsx_tempest/_i18n.py +++ b/vmware_nsx_tempest_plugin/_i18n.py @@ -14,7 +14,7 @@ import oslo_i18n -DOMAIN = "vmware_nsx_tempest" +DOMAIN = "vmware_nsx_tempest_plugin" _translators = oslo_i18n.TranslatorFactory(domain=DOMAIN) diff --git a/vmware_nsx_tempest/common/__init__.py b/vmware_nsx_tempest_plugin/common/__init__.py similarity index 100% rename from vmware_nsx_tempest/common/__init__.py rename to vmware_nsx_tempest_plugin/common/__init__.py diff --git a/vmware_nsx_tempest/common/constants.py b/vmware_nsx_tempest_plugin/common/constants.py similarity index 100% rename from vmware_nsx_tempest/common/constants.py rename to vmware_nsx_tempest_plugin/common/constants.py diff --git a/vmware_nsx_tempest/common/models.py b/vmware_nsx_tempest_plugin/common/models.py similarity index 100% rename from vmware_nsx_tempest/common/models.py rename to vmware_nsx_tempest_plugin/common/models.py diff --git a/vmware_nsx_tempest/common/waiters.py b/vmware_nsx_tempest_plugin/common/waiters.py similarity index 100% rename from vmware_nsx_tempest/common/waiters.py rename to vmware_nsx_tempest_plugin/common/waiters.py diff --git a/vmware_nsx_tempest/config.py b/vmware_nsx_tempest_plugin/config.py similarity index 100% rename from vmware_nsx_tempest/config.py rename to vmware_nsx_tempest_plugin/config.py diff --git a/vmware_nsx_tempest/doc/README-AdminPolicy.rst b/vmware_nsx_tempest_plugin/doc/README-AdminPolicy.rst similarity index 100% rename from vmware_nsx_tempest/doc/README-AdminPolicy.rst rename to vmware_nsx_tempest_plugin/doc/README-AdminPolicy.rst diff --git a/vmware_nsx_tempest/doc/README-LBaaS.rst b/vmware_nsx_tempest_plugin/doc/README-LBaaS.rst similarity index 100% rename from vmware_nsx_tempest/doc/README-LBaaS.rst rename to vmware_nsx_tempest_plugin/doc/README-LBaaS.rst diff --git a/vmware_nsx_tempest/doc/admin-policy-AA.blueprint b/vmware_nsx_tempest_plugin/doc/admin-policy-AA.blueprint similarity index 100% rename from vmware_nsx_tempest/doc/admin-policy-AA.blueprint rename to vmware_nsx_tempest_plugin/doc/admin-policy-AA.blueprint diff --git a/vmware_nsx_tempest/doc/admin-policy-BB.blueprint b/vmware_nsx_tempest_plugin/doc/admin-policy-BB.blueprint similarity index 100% rename from vmware_nsx_tempest/doc/admin-policy-BB.blueprint rename to vmware_nsx_tempest_plugin/doc/admin-policy-BB.blueprint diff --git a/vmware_nsx_tempest/lib/__init__.py b/vmware_nsx_tempest_plugin/lib/__init__.py similarity index 100% rename from vmware_nsx_tempest/lib/__init__.py rename to vmware_nsx_tempest_plugin/lib/__init__.py diff --git a/vmware_nsx_tempest/lib/appliance_manager.py b/vmware_nsx_tempest_plugin/lib/appliance_manager.py similarity index 99% rename from vmware_nsx_tempest/lib/appliance_manager.py rename to vmware_nsx_tempest_plugin/lib/appliance_manager.py index b09dae5..c306af8 100644 --- a/vmware_nsx_tempest/lib/appliance_manager.py +++ b/vmware_nsx_tempest_plugin/lib/appliance_manager.py @@ -24,8 +24,8 @@ from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import exceptions as lib_exc -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.tests.scenario import manager +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.tests.scenario import manager CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/lib/feature_manager.py b/vmware_nsx_tempest_plugin/lib/feature_manager.py similarity index 97% rename from vmware_nsx_tempest/lib/feature_manager.py rename to vmware_nsx_tempest_plugin/lib/feature_manager.py index 8b16568..15166e1 100644 --- a/vmware_nsx_tempest/lib/feature_manager.py +++ b/vmware_nsx_tempest_plugin/lib/feature_manager.py @@ -22,17 +22,17 @@ from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import exceptions as lib_exc -from vmware_nsx_tempest._i18n import _ -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.lib import traffic_manager -from vmware_nsx_tempest.services import designate_base -from vmware_nsx_tempest.services.lbaas import health_monitors_client -from vmware_nsx_tempest.services.lbaas import listeners_client -from vmware_nsx_tempest.services.lbaas import load_balancers_client -from vmware_nsx_tempest.services.lbaas import members_client -from vmware_nsx_tempest.services.lbaas import pools_client -from vmware_nsx_tempest.services import nsx_client -from vmware_nsx_tempest.services import openstack_network_clients +from vmware_nsx_tempest_plugin._i18n import _ +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.lib import traffic_manager +from vmware_nsx_tempest_plugin.services import designate_base +from vmware_nsx_tempest_plugin.services.lbaas import health_monitors_client +from vmware_nsx_tempest_plugin.services.lbaas import listeners_client +from vmware_nsx_tempest_plugin.services.lbaas import load_balancers_client +from vmware_nsx_tempest_plugin.services.lbaas import members_client +from vmware_nsx_tempest_plugin.services.lbaas import pools_client +from vmware_nsx_tempest_plugin.services import nsx_client +from vmware_nsx_tempest_plugin.services import openstack_network_clients LOG = constants.log.getLogger(__name__) diff --git a/vmware_nsx_tempest/lib/traffic_manager.py b/vmware_nsx_tempest_plugin/lib/traffic_manager.py similarity index 99% rename from vmware_nsx_tempest/lib/traffic_manager.py rename to vmware_nsx_tempest_plugin/lib/traffic_manager.py index 24ff882..171e5b3 100644 --- a/vmware_nsx_tempest/lib/traffic_manager.py +++ b/vmware_nsx_tempest_plugin/lib/traffic_manager.py @@ -28,8 +28,8 @@ from tempest import config from tempest import exceptions from tempest.lib.common.utils import test_utils -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.lib import appliance_manager +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.lib import appliance_manager CONF = config.CONF diff --git a/vmware_nsx_tempest/plugin.py b/vmware_nsx_tempest_plugin/plugin.py similarity index 90% rename from vmware_nsx_tempest/plugin.py rename to vmware_nsx_tempest_plugin/plugin.py index 1d5efdf..a3bd3cb 100644 --- a/vmware_nsx_tempest/plugin.py +++ b/vmware_nsx_tempest_plugin/plugin.py @@ -19,7 +19,7 @@ import os from tempest import config from tempest.test_discover import plugins -from vmware_nsx_tempest import config as config_nsx +from vmware_nsx_tempest_plugin import config as config_nsx _opts = [ @@ -34,7 +34,7 @@ _opts = [ class VmwareNsxTempestPlugin(plugins.TempestPlugin): - """Our addon configuration is defined at vmware_nsx_tempest/config.py + """Our addon configuration is defined at vmware_nsx_tempest_plugin/config.py 1. register_opts() to register group/opts to Tempest 2. get_opt_lists() to pass config to Tempest @@ -46,7 +46,7 @@ class VmwareNsxTempestPlugin(plugins.TempestPlugin): def load_tests(self): mydir = os.path.dirname(os.path.abspath(__file__)) base_path = os.path.split(mydir)[0] - test_dir = "vmware_nsx_tempest/tests" + test_dir = "vmware_nsx_tempest_plugin/tests" test_fullpath = os.path.join(base_path, test_dir) return test_fullpath, base_path diff --git a/vmware_nsx_tempest/services/README.rst b/vmware_nsx_tempest_plugin/services/README.rst similarity index 100% rename from vmware_nsx_tempest/services/README.rst rename to vmware_nsx_tempest_plugin/services/README.rst diff --git a/vmware_nsx_tempest/services/__init__.py b/vmware_nsx_tempest_plugin/services/__init__.py similarity index 100% rename from vmware_nsx_tempest/services/__init__.py rename to vmware_nsx_tempest_plugin/services/__init__.py diff --git a/vmware_nsx_tempest/services/base_l2gw.py b/vmware_nsx_tempest_plugin/services/base_l2gw.py similarity index 98% rename from vmware_nsx_tempest/services/base_l2gw.py rename to vmware_nsx_tempest_plugin/services/base_l2gw.py index 4f857e1..98772df 100644 --- a/vmware_nsx_tempest/services/base_l2gw.py +++ b/vmware_nsx_tempest_plugin/services/base_l2gw.py @@ -18,7 +18,7 @@ from tempest import config -from vmware_nsx_tempest.common import constants +from vmware_nsx_tempest_plugin.common import constants LOG = constants.log.getLogger(__name__) diff --git a/vmware_nsx_tempest/services/designate_base.py b/vmware_nsx_tempest_plugin/services/designate_base.py similarity index 99% rename from vmware_nsx_tempest/services/designate_base.py rename to vmware_nsx_tempest_plugin/services/designate_base.py index ff4558d..d8ce139 100644 --- a/vmware_nsx_tempest/services/designate_base.py +++ b/vmware_nsx_tempest_plugin/services/designate_base.py @@ -22,7 +22,7 @@ from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client from tempest.lib import exceptions as lib_exc -from vmware_nsx_tempest.common import models +from vmware_nsx_tempest_plugin.common import models LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/services/fwaas_client.py b/vmware_nsx_tempest_plugin/services/fwaas_client.py similarity index 98% rename from vmware_nsx_tempest/services/fwaas_client.py rename to vmware_nsx_tempest_plugin/services/fwaas_client.py index 3b63dad..b12dbae 100644 --- a/vmware_nsx_tempest/services/fwaas_client.py +++ b/vmware_nsx_tempest_plugin/services/fwaas_client.py @@ -16,7 +16,7 @@ from tempest import config from tempest.lib import exceptions as lib_exc -from vmware_nsx_tempest.services import network_client_base as base +from vmware_nsx_tempest_plugin.services import network_client_base as base CONF = config.CONF diff --git a/vmware_nsx_tempest/services/l2_gateway_client.py b/vmware_nsx_tempest_plugin/services/l2_gateway_client.py similarity index 98% rename from vmware_nsx_tempest/services/l2_gateway_client.py rename to vmware_nsx_tempest_plugin/services/l2_gateway_client.py index fcdd6c3..a680a70 100644 --- a/vmware_nsx_tempest/services/l2_gateway_client.py +++ b/vmware_nsx_tempest_plugin/services/l2_gateway_client.py @@ -16,7 +16,7 @@ from oslo_log import log from tempest.lib.services.network import base -from vmware_nsx_tempest.common import constants +from vmware_nsx_tempest_plugin.common import constants LOG = log.getLogger(__name__) diff --git a/vmware_nsx_tempest/services/l2_gateway_connection_client.py b/vmware_nsx_tempest_plugin/services/l2_gateway_connection_client.py similarity index 93% rename from vmware_nsx_tempest/services/l2_gateway_connection_client.py rename to vmware_nsx_tempest_plugin/services/l2_gateway_connection_client.py index c1d23e5..3c3e74d 100644 --- a/vmware_nsx_tempest/services/l2_gateway_connection_client.py +++ b/vmware_nsx_tempest_plugin/services/l2_gateway_connection_client.py @@ -12,7 +12,8 @@ from tempest.lib.services.network import base -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client class L2GatewayConnectionClient(base.BaseNetworkClient): @@ -50,7 +51,8 @@ def get_client(client_mgr): For itempest user: from itempest import load_our_solar_system as osn - from vmware_nsx_tempest.services import l2_gateway_connection_client + from vmware_nsx_tempest_plugin.services import + l2_gateway_connection_client l2gwc_client = l2_gateway_connection_client.get_client(osn.adm.manager) For tempest user: l2gwc_client = l2_gateway_connection_client.get_client(cls.os_adm) diff --git a/vmware_nsx_tempest/services/lbaas/__init__.py b/vmware_nsx_tempest_plugin/services/lbaas/__init__.py similarity index 100% rename from vmware_nsx_tempest/services/lbaas/__init__.py rename to vmware_nsx_tempest_plugin/services/lbaas/__init__.py diff --git a/vmware_nsx_tempest/services/lbaas/health_monitors_client.py b/vmware_nsx_tempest_plugin/services/lbaas/health_monitors_client.py similarity index 93% rename from vmware_nsx_tempest/services/lbaas/health_monitors_client.py rename to vmware_nsx_tempest_plugin/services/lbaas/health_monitors_client.py index aa231bb..fec1b48 100644 --- a/vmware_nsx_tempest/services/lbaas/health_monitors_client.py +++ b/vmware_nsx_tempest_plugin/services/lbaas/health_monitors_client.py @@ -14,7 +14,8 @@ from tempest.lib.services.network import base -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client class HealthMonitorsClient(base.BaseNetworkClient): @@ -52,7 +53,8 @@ def get_client(client_mgr): For itempest user: from itempest import load_our_solar_system as osn - from vmware_nsx_tempest.services.lbaas import health_monitors_client + from vmware_nsx_tempest_plugin.services.lbaas import + health_monitors_client healthmonitors_client = health_monitors_client.get_client( osn.adm.manager) For tempest user: diff --git a/vmware_nsx_tempest/services/lbaas/l7policies_client.py b/vmware_nsx_tempest_plugin/services/lbaas/l7policies_client.py similarity index 96% rename from vmware_nsx_tempest/services/lbaas/l7policies_client.py rename to vmware_nsx_tempest_plugin/services/lbaas/l7policies_client.py index 03fccb3..ab2510e 100644 --- a/vmware_nsx_tempest/services/lbaas/l7policies_client.py +++ b/vmware_nsx_tempest_plugin/services/lbaas/l7policies_client.py @@ -11,7 +11,8 @@ # under the License. from tempest.lib.services.network import base -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client class L7PoliciesClient(base.BaseNetworkClient): diff --git a/vmware_nsx_tempest/services/lbaas/l7rules_client.py b/vmware_nsx_tempest_plugin/services/lbaas/l7rules_client.py similarity index 96% rename from vmware_nsx_tempest/services/lbaas/l7rules_client.py rename to vmware_nsx_tempest_plugin/services/lbaas/l7rules_client.py index 4a76abb..8f4f3e9 100644 --- a/vmware_nsx_tempest/services/lbaas/l7rules_client.py +++ b/vmware_nsx_tempest_plugin/services/lbaas/l7rules_client.py @@ -12,7 +12,8 @@ from tempest.lib.services.network import base -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client class L7RulesClient(base.BaseNetworkClient): diff --git a/vmware_nsx_tempest/services/lbaas/listeners_client.py b/vmware_nsx_tempest_plugin/services/lbaas/listeners_client.py similarity index 94% rename from vmware_nsx_tempest/services/lbaas/listeners_client.py rename to vmware_nsx_tempest_plugin/services/lbaas/listeners_client.py index 46cdd0f..9ea0d23 100644 --- a/vmware_nsx_tempest/services/lbaas/listeners_client.py +++ b/vmware_nsx_tempest_plugin/services/lbaas/listeners_client.py @@ -14,7 +14,8 @@ from tempest.lib.services.network import base -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client class ListenersClient(base.BaseNetworkClient): @@ -52,7 +53,7 @@ def get_client(client_mgr): For itempest user: from itempest import load_our_solar_system as osn - from vmware_nsx_tempest.services.lbaas import pools_client + from vmware_nsx_tempest_plugin.services.lbaas import pools_client lbaas_client = pools_client.get_client(osn.adm.manager) For tempest user: lbaas_client = pools_client.get_client(osn.adm) diff --git a/vmware_nsx_tempest/services/lbaas/load_balancers_client.py b/vmware_nsx_tempest_plugin/services/lbaas/load_balancers_client.py similarity index 96% rename from vmware_nsx_tempest/services/lbaas/load_balancers_client.py rename to vmware_nsx_tempest_plugin/services/lbaas/load_balancers_client.py index 4f882ce..a75478a 100644 --- a/vmware_nsx_tempest/services/lbaas/load_balancers_client.py +++ b/vmware_nsx_tempest_plugin/services/lbaas/load_balancers_client.py @@ -17,8 +17,9 @@ import time from tempest.lib import exceptions from tempest.lib.services.network import base -from vmware_nsx_tempest._i18n import _ -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin._i18n import _ +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client LB_NOTFOUND = "loadbalancer {lb_id} not found" @@ -122,7 +123,8 @@ def get_client(client_mgr): For itempest user: from itempest import load_our_solar_system as osn - from vmware_nsx_tempest.services.lbaas import load_balancers_client + from vmware_nsx_tempest_plugin.services.lbaas import + load_balancers_client lbaas_client = load_balancers_client.get_client(osn.adm.manager) For tempest user: lbaas_client = load_balancers_client.get_client(osn.adm) diff --git a/vmware_nsx_tempest/services/lbaas/members_client.py b/vmware_nsx_tempest_plugin/services/lbaas/members_client.py similarity index 94% rename from vmware_nsx_tempest/services/lbaas/members_client.py rename to vmware_nsx_tempest_plugin/services/lbaas/members_client.py index 4c61d05..af78895 100644 --- a/vmware_nsx_tempest/services/lbaas/members_client.py +++ b/vmware_nsx_tempest_plugin/services/lbaas/members_client.py @@ -13,7 +13,8 @@ # under the License. from tempest.lib.services.network import base -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client class MembersClient(base.BaseNetworkClient): @@ -51,7 +52,7 @@ def get_client(client_mgr): For itempest user: from itempest import load_our_solar_system as osn - from vmware_nsx_tempest.services.lbaas import members_client + from vmware_nsx_tempest_plugin.services.lbaas import members_client members_client = members_client.get_client(osn.adm.manager) For tempest user: members_client = members_client.get_client(osn.adm) diff --git a/vmware_nsx_tempest/services/lbaas/pools_client.py b/vmware_nsx_tempest_plugin/services/lbaas/pools_client.py similarity index 93% rename from vmware_nsx_tempest/services/lbaas/pools_client.py rename to vmware_nsx_tempest_plugin/services/lbaas/pools_client.py index 6a83eab..cbf9ac8 100644 --- a/vmware_nsx_tempest/services/lbaas/pools_client.py +++ b/vmware_nsx_tempest_plugin/services/lbaas/pools_client.py @@ -13,7 +13,8 @@ # under the License. from tempest.lib.services.network import base -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client class PoolsClient(base.BaseNetworkClient): @@ -51,7 +52,7 @@ def get_client(client_mgr): For itempest user: from itempest import load_our_solar_system as osn - from vmware_nsx_tempest.services.lbaas import pools_client + from vmware_nsx_tempest_plugin.services.lbaas import pools_client pools_client = pools_client.get_client(osn.adm.manager) For tempest user: pools_client = pools_client.get_client(osn.adm) diff --git a/vmware_nsx_tempest/services/load_balancer_v1_client.py b/vmware_nsx_tempest_plugin/services/load_balancer_v1_client.py similarity index 98% rename from vmware_nsx_tempest/services/load_balancer_v1_client.py rename to vmware_nsx_tempest_plugin/services/load_balancer_v1_client.py index 89e8724..5412ac8 100644 --- a/vmware_nsx_tempest/services/load_balancer_v1_client.py +++ b/vmware_nsx_tempest_plugin/services/load_balancer_v1_client.py @@ -16,8 +16,8 @@ from tempest.lib.common.utils import misc as misc_utils from tempest.lib import exceptions as lib_exc from tempest import exceptions -from vmware_nsx_tempest._i18n import _ -from vmware_nsx_tempest.services import network_client_base as base +from vmware_nsx_tempest_plugin._i18n import _ +from vmware_nsx_tempest_plugin.services import network_client_base as base POOL_RID = 'pools' VIP_RID = 'vips' @@ -301,7 +301,7 @@ def get_client(client_mgr): For itempest user: from itempest import load_our_solar_system as osn - from vmware_nsx_tempest.services import load_balancer_v1_client + from vmware_nsx_tempest_plugin.services import load_balancer_v1_client lbv1 = load_balancer_v1_client.get_client(osn.adm.manager) For tempest user: lbv1 = load_balancer_v1_client.get_client(cls.os_adm) diff --git a/vmware_nsx_tempest/services/network_client_base.py b/vmware_nsx_tempest_plugin/services/network_client_base.py similarity index 100% rename from vmware_nsx_tempest/services/network_client_base.py rename to vmware_nsx_tempest_plugin/services/network_client_base.py diff --git a/vmware_nsx_tempest/services/nsx_client.py b/vmware_nsx_tempest_plugin/services/nsx_client.py similarity index 98% rename from vmware_nsx_tempest/services/nsx_client.py rename to vmware_nsx_tempest_plugin/services/nsx_client.py index 1189fd3..819e6d9 100644 --- a/vmware_nsx_tempest/services/nsx_client.py +++ b/vmware_nsx_tempest_plugin/services/nsx_client.py @@ -14,7 +14,7 @@ # under the License. from oslo_log import log as logging -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.services import nsxv3_client LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/services/nsxv3_client.py b/vmware_nsx_tempest_plugin/services/nsxv3_client.py similarity index 99% rename from vmware_nsx_tempest/services/nsxv3_client.py rename to vmware_nsx_tempest_plugin/services/nsxv3_client.py index 2ba0608..fd85d8d 100644 --- a/vmware_nsx_tempest/services/nsxv3_client.py +++ b/vmware_nsx_tempest_plugin/services/nsxv3_client.py @@ -23,7 +23,7 @@ import six.moves.urllib.parse as urlparse from oslo_log import log as logging from oslo_serialization import jsonutils -from vmware_nsx_tempest.common import constants +from vmware_nsx_tempest_plugin.common import constants requests.packages.urllib3.disable_warnings() diff --git a/vmware_nsx_tempest/services/nsxv_client.py b/vmware_nsx_tempest_plugin/services/nsxv_client.py similarity index 99% rename from vmware_nsx_tempest/services/nsxv_client.py rename to vmware_nsx_tempest_plugin/services/nsxv_client.py index da3ec4f..ca8bc78 100644 --- a/vmware_nsx_tempest/services/nsxv_client.py +++ b/vmware_nsx_tempest_plugin/services/nsxv_client.py @@ -18,7 +18,7 @@ from oslo_serialization import jsonutils import requests from tempest import config -import vmware_nsx_tempest.services.utils as utils +import vmware_nsx_tempest_plugin.services.utils as utils requests.packages.urllib3.disable_warnings() CONF = config.CONF diff --git a/vmware_nsx_tempest/services/openstack_network_clients.py b/vmware_nsx_tempest_plugin/services/openstack_network_clients.py similarity index 99% rename from vmware_nsx_tempest/services/openstack_network_clients.py rename to vmware_nsx_tempest_plugin/services/openstack_network_clients.py index a10664b..9478702 100644 --- a/vmware_nsx_tempest/services/openstack_network_clients.py +++ b/vmware_nsx_tempest_plugin/services/openstack_network_clients.py @@ -17,9 +17,9 @@ from oslo_log import log from tempest import config from tempest.lib.services.network import base -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.common import waiters -from vmware_nsx_tempest.services import designate_base +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.common import waiters +from vmware_nsx_tempest_plugin.services import designate_base LOG = log.getLogger(__name__) CONF = config.CONF diff --git a/vmware_nsx_tempest/services/qos/__init__.py b/vmware_nsx_tempest_plugin/services/qos/__init__.py similarity index 100% rename from vmware_nsx_tempest/services/qos/__init__.py rename to vmware_nsx_tempest_plugin/services/qos/__init__.py diff --git a/vmware_nsx_tempest/services/qos/bandwidth_limit_rules_client.py b/vmware_nsx_tempest_plugin/services/qos/bandwidth_limit_rules_client.py similarity index 96% rename from vmware_nsx_tempest/services/qos/bandwidth_limit_rules_client.py rename to vmware_nsx_tempest_plugin/services/qos/bandwidth_limit_rules_client.py index 6080033..3f160df 100644 --- a/vmware_nsx_tempest/services/qos/bandwidth_limit_rules_client.py +++ b/vmware_nsx_tempest_plugin/services/qos/bandwidth_limit_rules_client.py @@ -11,7 +11,8 @@ # under the License. from tempest.lib.services.network import base -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client class BandwidthLimitRulesClient(base.BaseNetworkClient): diff --git a/vmware_nsx_tempest/services/qos/base_qos.py b/vmware_nsx_tempest_plugin/services/qos/base_qos.py similarity index 96% rename from vmware_nsx_tempest/services/qos/base_qos.py rename to vmware_nsx_tempest_plugin/services/qos/base_qos.py index 192cea3..01328b2 100644 --- a/vmware_nsx_tempest/services/qos/base_qos.py +++ b/vmware_nsx_tempest_plugin/services/qos/base_qos.py @@ -10,13 +10,13 @@ # License for the specific language governing permissions and limitations # under the License. -from vmware_nsx_tempest.services.qos import ( +from vmware_nsx_tempest_plugin.services.qos import ( bandwidth_limit_rules_client as bandwidth_limit_rules_client) -from vmware_nsx_tempest.services.qos import ( +from vmware_nsx_tempest_plugin.services.qos import ( dscp_marking_rules_client as dscp_marking_rules_client) -from vmware_nsx_tempest.services.qos import ( +from vmware_nsx_tempest_plugin.services.qos import ( policies_client as policies_client) -from vmware_nsx_tempest.services.qos import ( +from vmware_nsx_tempest_plugin.services.qos import ( rule_types_client as rule_types_client) RULE_TYPE_BANDWIDTH_LIMIT = "bandwidth_limit" diff --git a/vmware_nsx_tempest/services/qos/dscp_marking_rules_client.py b/vmware_nsx_tempest_plugin/services/qos/dscp_marking_rules_client.py similarity index 96% rename from vmware_nsx_tempest/services/qos/dscp_marking_rules_client.py rename to vmware_nsx_tempest_plugin/services/qos/dscp_marking_rules_client.py index cb40814..a8468c3 100644 --- a/vmware_nsx_tempest/services/qos/dscp_marking_rules_client.py +++ b/vmware_nsx_tempest_plugin/services/qos/dscp_marking_rules_client.py @@ -11,7 +11,8 @@ # under the License. from tempest.lib.services.network import base -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client class DscpMarkingRulesClient(base.BaseNetworkClient): diff --git a/vmware_nsx_tempest/services/qos/policies_client.py b/vmware_nsx_tempest_plugin/services/qos/policies_client.py similarity index 96% rename from vmware_nsx_tempest/services/qos/policies_client.py rename to vmware_nsx_tempest_plugin/services/qos/policies_client.py index 63af0b5..70a693f 100644 --- a/vmware_nsx_tempest/services/qos/policies_client.py +++ b/vmware_nsx_tempest_plugin/services/qos/policies_client.py @@ -11,7 +11,8 @@ # under the License. from tempest.lib.services.network import base -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client class PoliciesClient(base.BaseNetworkClient): diff --git a/vmware_nsx_tempest/services/qos/rule_types_client.py b/vmware_nsx_tempest_plugin/services/qos/rule_types_client.py similarity index 95% rename from vmware_nsx_tempest/services/qos/rule_types_client.py rename to vmware_nsx_tempest_plugin/services/qos/rule_types_client.py index 6000a25..ce4cafa 100644 --- a/vmware_nsx_tempest/services/qos/rule_types_client.py +++ b/vmware_nsx_tempest_plugin/services/qos/rule_types_client.py @@ -11,7 +11,8 @@ # under the License. from tempest.lib.services.network import base -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client class RuleTypesClient(base.BaseNetworkClient): diff --git a/vmware_nsx_tempest/services/tags_client.py b/vmware_nsx_tempest_plugin/services/tags_client.py similarity index 98% rename from vmware_nsx_tempest/services/tags_client.py rename to vmware_nsx_tempest_plugin/services/tags_client.py index d671199..8d58fc0 100644 --- a/vmware_nsx_tempest/services/tags_client.py +++ b/vmware_nsx_tempest_plugin/services/tags_client.py @@ -17,7 +17,8 @@ from oslo_serialization import jsonutils from tempest.lib.services.network import base -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client class BaseTagsClient(base.BaseNetworkClient): diff --git a/vmware_nsx_tempest/services/utils.py b/vmware_nsx_tempest_plugin/services/utils.py similarity index 100% rename from vmware_nsx_tempest/services/utils.py rename to vmware_nsx_tempest_plugin/services/utils.py diff --git a/vmware_nsx_tempest/tests/__init__.py b/vmware_nsx_tempest_plugin/tests/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/__init__.py rename to vmware_nsx_tempest_plugin/tests/__init__.py diff --git a/vmware_nsx_tempest/tests/api/__init__.py b/vmware_nsx_tempest_plugin/tests/api/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/api/__init__.py rename to vmware_nsx_tempest_plugin/tests/api/__init__.py diff --git a/vmware_nsx_tempest/tests/api/test_network_tags.py b/vmware_nsx_tempest_plugin/tests/api/test_network_tags.py similarity index 99% rename from vmware_nsx_tempest/tests/api/test_network_tags.py rename to vmware_nsx_tempest_plugin/tests/api/test_network_tags.py index d9da938..87f6068 100644 --- a/vmware_nsx_tempest/tests/api/test_network_tags.py +++ b/vmware_nsx_tempest_plugin/tests/api/test_network_tags.py @@ -21,8 +21,8 @@ from tempest.lib import decorators from tempest.lib import exceptions from tempest import test -from vmware_nsx_tempest._i18n import _ -from vmware_nsx_tempest.services import tags_client +from vmware_nsx_tempest_plugin._i18n import _ +from vmware_nsx_tempest_plugin.services import tags_client CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/api/test_provider_networks.py b/vmware_nsx_tempest_plugin/tests/api/test_provider_networks.py similarity index 98% rename from vmware_nsx_tempest/tests/api/test_provider_networks.py rename to vmware_nsx_tempest_plugin/tests/api/test_provider_networks.py index 567c478..51d80c3 100644 --- a/vmware_nsx_tempest/tests/api/test_provider_networks.py +++ b/vmware_nsx_tempest_plugin/tests/api/test_provider_networks.py @@ -18,9 +18,9 @@ from tempest.lib import decorators from tempest.lib import exceptions from tempest import test -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.lib import feature_manager -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.lib import feature_manager +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF LOG = constants.log.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/api/test_qos.py b/vmware_nsx_tempest_plugin/tests/api/test_qos.py similarity index 99% rename from vmware_nsx_tempest/tests/api/test_qos.py rename to vmware_nsx_tempest_plugin/tests/api/test_qos.py index 054ecc3..4ad5c0c 100644 --- a/vmware_nsx_tempest/tests/api/test_qos.py +++ b/vmware_nsx_tempest_plugin/tests/api/test_qos.py @@ -23,7 +23,7 @@ from tempest.lib import decorators from tempest.lib import exceptions from tempest import test -from vmware_nsx_tempest.services.qos import base_qos +from vmware_nsx_tempest_plugin.services.qos import base_qos CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/api/test_v2_designate.py b/vmware_nsx_tempest_plugin/tests/api/test_v2_designate.py similarity index 98% rename from vmware_nsx_tempest/tests/api/test_v2_designate.py rename to vmware_nsx_tempest_plugin/tests/api/test_v2_designate.py index 1d78a56..8cc8e12 100644 --- a/vmware_nsx_tempest/tests/api/test_v2_designate.py +++ b/vmware_nsx_tempest_plugin/tests/api/test_v2_designate.py @@ -18,7 +18,7 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from vmware_nsx_tempest.lib import feature_manager +from vmware_nsx_tempest_plugin.lib import feature_manager CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/api/test_v2_fwaas.py b/vmware_nsx_tempest_plugin/tests/api/test_v2_fwaas.py similarity index 99% rename from vmware_nsx_tempest/tests/api/test_v2_fwaas.py rename to vmware_nsx_tempest_plugin/tests/api/test_v2_fwaas.py index c92d59b..905706f 100644 --- a/vmware_nsx_tempest/tests/api/test_v2_fwaas.py +++ b/vmware_nsx_tempest_plugin/tests/api/test_v2_fwaas.py @@ -20,8 +20,8 @@ from tempest.lib import decorators from tempest.lib import exceptions from tempest import test -from vmware_nsx_tempest.lib import feature_manager -from vmware_nsx_tempest.services import nsx_client +from vmware_nsx_tempest_plugin.lib import feature_manager +from vmware_nsx_tempest_plugin.services import nsx_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/api/test_vpn.py b/vmware_nsx_tempest_plugin/tests/api/test_vpn.py similarity index 99% rename from vmware_nsx_tempest/tests/api/test_vpn.py rename to vmware_nsx_tempest_plugin/tests/api/test_vpn.py index 166b5d8..140d564 100644 --- a/vmware_nsx_tempest/tests/api/test_vpn.py +++ b/vmware_nsx_tempest_plugin/tests/api/test_vpn.py @@ -22,9 +22,9 @@ from tempest.lib import exceptions from tempest.lib import exceptions as lib_exc from tempest import test -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.lib import feature_manager -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.lib import feature_manager +from vmware_nsx_tempest_plugin.services import nsxv3_client from oslo_log import log as logging diff --git a/vmware_nsx_tempest/tests/base.py b/vmware_nsx_tempest_plugin/tests/base.py similarity index 100% rename from vmware_nsx_tempest/tests/base.py rename to vmware_nsx_tempest_plugin/tests/base.py diff --git a/vmware_nsx_tempest/tests/dvs/README.rst b/vmware_nsx_tempest_plugin/tests/dvs/README.rst similarity index 100% rename from vmware_nsx_tempest/tests/dvs/README.rst rename to vmware_nsx_tempest_plugin/tests/dvs/README.rst diff --git a/vmware_nsx_tempest/tests/dvs/__init__.py b/vmware_nsx_tempest_plugin/tests/dvs/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/dvs/__init__.py rename to vmware_nsx_tempest_plugin/tests/dvs/__init__.py diff --git a/vmware_nsx_tempest/tests/dvs/api/__init__.py b/vmware_nsx_tempest_plugin/tests/dvs/api/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/dvs/api/__init__.py rename to vmware_nsx_tempest_plugin/tests/dvs/api/__init__.py diff --git a/vmware_nsx_tempest/tests/dvs/api/base_dvs.py b/vmware_nsx_tempest_plugin/tests/dvs/api/base_dvs.py similarity index 100% rename from vmware_nsx_tempest/tests/dvs/api/base_dvs.py rename to vmware_nsx_tempest_plugin/tests/dvs/api/base_dvs.py diff --git a/vmware_nsx_tempest/tests/dvs/api/test_networks_admin_actions.py b/vmware_nsx_tempest_plugin/tests/dvs/api/test_networks_admin_actions.py similarity index 98% rename from vmware_nsx_tempest/tests/dvs/api/test_networks_admin_actions.py rename to vmware_nsx_tempest_plugin/tests/dvs/api/test_networks_admin_actions.py index 77fb738..e6007ba 100644 --- a/vmware_nsx_tempest/tests/dvs/api/test_networks_admin_actions.py +++ b/vmware_nsx_tempest_plugin/tests/dvs/api/test_networks_admin_actions.py @@ -16,7 +16,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from vmware_nsx_tempest.tests.dvs.api import base_dvs as base +from vmware_nsx_tempest_plugin.tests.dvs.api import base_dvs as base class AdminNetworksTestJSON(base.BaseDvsAdminNetworkTest): diff --git a/vmware_nsx_tempest/tests/dvs/api/test_ports_admin_actions.py b/vmware_nsx_tempest_plugin/tests/dvs/api/test_ports_admin_actions.py similarity index 98% rename from vmware_nsx_tempest/tests/dvs/api/test_ports_admin_actions.py rename to vmware_nsx_tempest_plugin/tests/dvs/api/test_ports_admin_actions.py index 97a9076..d1cd9b2 100644 --- a/vmware_nsx_tempest/tests/dvs/api/test_ports_admin_actions.py +++ b/vmware_nsx_tempest_plugin/tests/dvs/api/test_ports_admin_actions.py @@ -16,7 +16,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from vmware_nsx_tempest.tests.dvs.api import base_dvs as base +from vmware_nsx_tempest_plugin.tests.dvs.api import base_dvs as base class AdminPortsTestJSON(base.BaseDvsAdminNetworkTest): diff --git a/vmware_nsx_tempest/tests/dvs/scenario/__init__.py b/vmware_nsx_tempest_plugin/tests/dvs/scenario/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/dvs/scenario/__init__.py rename to vmware_nsx_tempest_plugin/tests/dvs/scenario/__init__.py diff --git a/vmware_nsx_tempest/tests/dvs/scenario/test_network_basic_ops.py b/vmware_nsx_tempest_plugin/tests/dvs/scenario/test_network_basic_ops.py similarity index 99% rename from vmware_nsx_tempest/tests/dvs/scenario/test_network_basic_ops.py rename to vmware_nsx_tempest_plugin/tests/dvs/scenario/test_network_basic_ops.py index 3f48204..8cbc6e3 100644 --- a/vmware_nsx_tempest/tests/dvs/scenario/test_network_basic_ops.py +++ b/vmware_nsx_tempest_plugin/tests/dvs/scenario/test_network_basic_ops.py @@ -21,7 +21,7 @@ from tempest import exceptions from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from vmware_nsx_tempest.tests.scenario import manager +from vmware_nsx_tempest_plugin.tests.scenario import manager CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv/README.rst b/vmware_nsx_tempest_plugin/tests/nsxv/README.rst similarity index 100% rename from vmware_nsx_tempest/tests/nsxv/README.rst rename to vmware_nsx_tempest_plugin/tests/nsxv/README.rst diff --git a/vmware_nsx_tempest/tests/nsxv/__init__.py b/vmware_nsx_tempest_plugin/tests/nsxv/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv/__init__.py rename to vmware_nsx_tempest_plugin/tests/nsxv/__init__.py diff --git a/vmware_nsx_tempest/tests/nsxv/api/README.rst b/vmware_nsx_tempest_plugin/tests/nsxv/api/README.rst similarity index 100% rename from vmware_nsx_tempest/tests/nsxv/api/README.rst rename to vmware_nsx_tempest_plugin/tests/nsxv/api/README.rst diff --git a/vmware_nsx_tempest/tests/nsxv/api/__init__.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv/api/__init__.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/__init__.py diff --git a/vmware_nsx_tempest/tests/nsxv/api/base_provider.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/base_provider.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv/api/base_provider.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/base_provider.py diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/__init__.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/__init__.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/__init__.py diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/base.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/base.py similarity index 97% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/base.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/base.py index e5b2fe1..6b23040 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/base.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/base.py @@ -26,13 +26,13 @@ from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import exceptions -from vmware_nsx_tempest.services.lbaas import health_monitors_client -from vmware_nsx_tempest.services.lbaas import l7policies_client -from vmware_nsx_tempest.services.lbaas import l7rules_client -from vmware_nsx_tempest.services.lbaas import listeners_client -from vmware_nsx_tempest.services.lbaas import load_balancers_client -from vmware_nsx_tempest.services.lbaas import members_client -from vmware_nsx_tempest.services.lbaas import pools_client +from vmware_nsx_tempest_plugin.services.lbaas import health_monitors_client +from vmware_nsx_tempest_plugin.services.lbaas import l7policies_client +from vmware_nsx_tempest_plugin.services.lbaas import l7rules_client +from vmware_nsx_tempest_plugin.services.lbaas import listeners_client +from vmware_nsx_tempest_plugin.services.lbaas import load_balancers_client +from vmware_nsx_tempest_plugin.services.lbaas import members_client +from vmware_nsx_tempest_plugin.services.lbaas import pools_client CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_health_monitors_admin.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_health_monitors_admin.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/test_health_monitors_admin.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_health_monitors_admin.py index c341baf..c53674b 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_health_monitors_admin.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_health_monitors_admin.py @@ -17,7 +17,7 @@ from tempest import config from tempest.lib import decorators from tempest.lib import exceptions as ex -from vmware_nsx_tempest.tests.nsxv.api.lbaas import base +from vmware_nsx_tempest_plugin.tests.nsxv.api.lbaas import base CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_health_monitors_non_admin.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_health_monitors_non_admin.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/test_health_monitors_non_admin.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_health_monitors_non_admin.py index 755ec6d..19d8f93 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_health_monitors_non_admin.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_health_monitors_non_admin.py @@ -13,7 +13,7 @@ from tempest.lib import decorators from tempest.lib import exceptions as ex -from vmware_nsx_tempest.tests.nsxv.api.lbaas import base +from vmware_nsx_tempest_plugin.tests.nsxv.api.lbaas import base class TestHealthMonitors(base.BaseTestCase): diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_l7policies_non_admin.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_l7policies_non_admin.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/test_l7policies_non_admin.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_l7policies_non_admin.py index 7f1918d..78c3ad3 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_l7policies_non_admin.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_l7policies_non_admin.py @@ -13,7 +13,7 @@ from tempest import config from tempest.lib import decorators -from vmware_nsx_tempest.tests.nsxv.api.lbaas import base +from vmware_nsx_tempest_plugin.tests.nsxv.api.lbaas import base CONF = config.CONF PROTOCOL_PORT = 80 diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_l7rules_non_admin.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_l7rules_non_admin.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/test_l7rules_non_admin.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_l7rules_non_admin.py index e506342..813bdf5 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_l7rules_non_admin.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_l7rules_non_admin.py @@ -13,7 +13,7 @@ from tempest import config from tempest.lib import decorators -from vmware_nsx_tempest.tests.nsxv.api.lbaas import base +from vmware_nsx_tempest_plugin.tests.nsxv.api.lbaas import base CONF = config.CONF PROTOCOL_PORT = 80 diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_listeners_admin.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_listeners_admin.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/test_listeners_admin.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_listeners_admin.py index 7e1fbd2..e0764dc 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_listeners_admin.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_listeners_admin.py @@ -16,7 +16,7 @@ from tempest import config from tempest.lib import decorators from tempest.lib import exceptions as ex -from vmware_nsx_tempest.tests.nsxv.api.lbaas import base +from vmware_nsx_tempest_plugin.tests.nsxv.api.lbaas import base CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_listeners_non_admin.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_listeners_non_admin.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/test_listeners_non_admin.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_listeners_non_admin.py index 7daac28..96fc9e9 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_listeners_non_admin.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_listeners_non_admin.py @@ -16,7 +16,7 @@ from tempest import config from tempest.lib import decorators from tempest.lib import exceptions -from vmware_nsx_tempest.tests.nsxv.api.lbaas import base +from vmware_nsx_tempest_plugin.tests.nsxv.api.lbaas import base CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_load_balancers_admin.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_load_balancers_admin.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/test_load_balancers_admin.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_load_balancers_admin.py index 375ce92..ece7f80 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_load_balancers_admin.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_load_balancers_admin.py @@ -17,7 +17,7 @@ from tempest import config from tempest.lib import decorators from tempest.lib import exceptions as ex -from vmware_nsx_tempest.tests.nsxv.api.lbaas import base +from vmware_nsx_tempest_plugin.tests.nsxv.api.lbaas import base CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_load_balancers_non_admin.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_load_balancers_non_admin.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/test_load_balancers_non_admin.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_load_balancers_non_admin.py index 93cdb3f..5f2c99e 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_load_balancers_non_admin.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_load_balancers_non_admin.py @@ -19,7 +19,7 @@ from tempest import config from tempest.lib import decorators from tempest.lib import exceptions -from vmware_nsx_tempest.tests.nsxv.api.lbaas import base +from vmware_nsx_tempest_plugin.tests.nsxv.api.lbaas import base CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_members_admin.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_members_admin.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/test_members_admin.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_members_admin.py index cce7ad6..51ed656 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_members_admin.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_members_admin.py @@ -16,7 +16,7 @@ from tempest import config from tempest.lib import decorators from tempest.lib import exceptions as ex -from vmware_nsx_tempest.tests.nsxv.api.lbaas import base +from vmware_nsx_tempest_plugin.tests.nsxv.api.lbaas import base CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_members_non_admin.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_members_non_admin.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/test_members_non_admin.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_members_non_admin.py index 1595c91..1743641 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_members_non_admin.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_members_non_admin.py @@ -16,7 +16,7 @@ from tempest import config from tempest.lib import decorators from tempest.lib import exceptions as ex -from vmware_nsx_tempest.tests.nsxv.api.lbaas import base +from vmware_nsx_tempest_plugin.tests.nsxv.api.lbaas import base CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_pools_admin.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_pools_admin.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/test_pools_admin.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_pools_admin.py index a0e6248..3f84543 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_pools_admin.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_pools_admin.py @@ -13,7 +13,7 @@ from tempest.lib import decorators from tempest.lib import exceptions as ex -from vmware_nsx_tempest.tests.nsxv.api.lbaas import base +from vmware_nsx_tempest_plugin.tests.nsxv.api.lbaas import base PROTOCOL_PORT = 80 diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_pools_non_admin.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_pools_non_admin.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/lbaas/test_pools_non_admin.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_pools_non_admin.py index 9e81031..0a780e0 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_pools_non_admin.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/lbaas/test_pools_non_admin.py @@ -13,7 +13,7 @@ from tempest.lib import decorators from tempest.lib import exceptions as ex -from vmware_nsx_tempest.tests.nsxv.api.lbaas import base +from vmware_nsx_tempest_plugin.tests.nsxv.api.lbaas import base PROTOCOL_PORT = 80 diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_admin_policy.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_admin_policy.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/api/test_admin_policy.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_admin_policy.py index 24891cb..40f260f 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_admin_policy.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_admin_policy.py @@ -22,7 +22,7 @@ from tempest.lib import decorators from tempest.lib import exceptions from tempest import test -from vmware_nsx_tempest.tests.nsxv.api import base_provider as base +from vmware_nsx_tempest_plugin.tests.nsxv.api import base_provider as base CONF = config.CONF @@ -254,7 +254,7 @@ class AdminPolicyTest(base.BaseAdminNetworkTest): def test_tenant_cannot_create_security_group(self): """Only valid if allow_tenant_rules_with_policy=True - If test fail, check nsx.ini and vmware_nsx_tempest/config.py + If test fail, check nsx.ini and vmware_nsx_tempest_plugin/config.py to make sure they are the same value. Exception is BadRequest, not Forbideen as the message is diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_dns_search_domain.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_dns_search_domain.py index 0501049..79e1657 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_dns_search_domain.py @@ -18,7 +18,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators -from vmware_nsx_tempest.tests.nsxv.api import base_provider as base +from vmware_nsx_tempest_plugin.tests.nsxv.api import base_provider as base CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain_negative.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_dns_search_domain_negative.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain_negative.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_dns_search_domain_negative.py diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_flat_network.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_flat_network.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/api/test_flat_network.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_flat_network.py index d71a79c..c724870 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_flat_network.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_flat_network.py @@ -17,7 +17,7 @@ from oslo_log import log as logging from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from vmware_nsx_tempest.tests.nsxv.api import test_subnets as SNET +from vmware_nsx_tempest_plugin.tests.nsxv.api import test_subnets as SNET LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_l2_gateway.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_l2_gateway.py index a74e3db..33225bc 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_l2_gateway.py @@ -20,8 +20,8 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.services import base_l2gw -from vmware_nsx_tempest.services import l2_gateway_client as L2GW +from vmware_nsx_tempest_plugin.services import base_l2gw +from vmware_nsx_tempest_plugin.services import l2_gateway_client as L2GW CONF = config.CONF L2GW_RID = 'l2_gateway' diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_l2_gateway_connection.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_l2_gateway_connection.py index 1f99f12..9d9e09a 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_l2_gateway_connection.py @@ -23,9 +23,9 @@ from tempest import test from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from vmware_nsx_tempest.services import base_l2gw -from vmware_nsx_tempest.services import l2_gateway_client as L2GW -from vmware_nsx_tempest.services import \ +from vmware_nsx_tempest_plugin.services import base_l2gw +from vmware_nsx_tempest_plugin.services import l2_gateway_client as L2GW +from vmware_nsx_tempest_plugin.services import \ l2_gateway_connection_client as L2GWC CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_multiple_transport_zones.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_multiple_transport_zones.py index 2ef6ac7..d35683e 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_multiple_transport_zones.py @@ -22,8 +22,8 @@ from tempest.lib.common.utils import test_utils from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.services import nsxv_client -from vmware_nsx_tempest.tests.nsxv.api import base_provider as base +from vmware_nsx_tempest_plugin.services import nsxv_client +from vmware_nsx_tempest_plugin.tests.nsxv.api import base_provider as base CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones_negative.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_multiple_transport_zones_negative.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones_negative.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_multiple_transport_zones_negative.py diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_port_types.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_port_types.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/test_port_types.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_port_types.py index 0e5999a..88d12d5 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_port_types.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_port_types.py @@ -21,7 +21,7 @@ from tempest.lib import exceptions as ex from oslo_log import log as logging -from vmware_nsx_tempest.tests.nsxv.api import base_provider as base +from vmware_nsx_tempest_plugin.tests.nsxv.api import base_provider as base CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_provider_sec_group.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_provider_sec_group.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/test_provider_sec_group.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_provider_sec_group.py index 4c96026..7b3a836 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_provider_sec_group.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_provider_sec_group.py @@ -22,8 +22,8 @@ from tempest.lib import decorators from tempest.lib import exceptions from tempest import test -from vmware_nsx_tempest.services import nsxv_client -from vmware_nsx_tempest.tests.nsxv.api import base_provider as base +from vmware_nsx_tempest_plugin.services import nsxv_client +from vmware_nsx_tempest_plugin.tests.nsxv.api import base_provider as base CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_router_sizes.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_router_sizes.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/test_router_sizes.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_router_sizes.py index 6761667..691a333 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_router_sizes.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_router_sizes.py @@ -24,7 +24,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib.services import network as net_clients from tempest import test -from vmware_nsx_tempest.services import nsxv_client +from vmware_nsx_tempest_plugin.services import nsxv_client CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_router_types.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_router_types.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/test_router_types.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_router_types.py index 4ee60e3..17579b2 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_router_types.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_router_types.py @@ -21,7 +21,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.services import nsxv_client +from vmware_nsx_tempest_plugin.services import nsxv_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_subnetpools.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_subnetpools.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv/api/test_subnetpools.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_subnetpools.py diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_subnets.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_subnets.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/test_subnets.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_subnets.py index be27c21..0aaa65a 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_subnets.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_subnets.py @@ -23,7 +23,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions -from vmware_nsx_tempest.tests.nsxv.api import base_provider as base +from vmware_nsx_tempest_plugin.tests.nsxv.api import base_provider as base CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_tenant_delete.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_tenant_delete.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/test_tenant_delete.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_tenant_delete.py index ec0a3c9..d9aea2f 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_tenant_delete.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_tenant_delete.py @@ -25,7 +25,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators -from vmware_nsx_tempest.tests.nsxv.api import base_provider as base_p +from vmware_nsx_tempest_plugin.tests.nsxv.api import base_provider as base_p CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_v1_fwaas.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_v1_fwaas.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/test_v1_fwaas.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_v1_fwaas.py index c9dc561..5024364 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_v1_fwaas.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_v1_fwaas.py @@ -25,9 +25,9 @@ from tempest.lib import decorators from tempest.lib import exceptions as lib_exc from tempest import test -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.services import fwaas_client as FWAASC -from vmware_nsx_tempest.services import nsxv_client +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.services import fwaas_client as FWAASC +from vmware_nsx_tempest_plugin.services import nsxv_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_v1_lbaas.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_v1_lbaas.py index 0e981b2..94ef1f0 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_v1_lbaas.py @@ -24,8 +24,9 @@ from tempest.api.network import base from tempest import config from tempest import test -from vmware_nsx_tempest.services import load_balancer_v1_client as LBV1C -from vmware_nsx_tempest.services import network_client_base as base_client +from vmware_nsx_tempest_plugin.services import load_balancer_v1_client as LBV1C +from vmware_nsx_tempest_plugin.services import network_client_base \ + as base_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_vlan_network.py b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_vlan_network.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/api/test_vlan_network.py rename to vmware_nsx_tempest_plugin/tests/nsxv/api/test_vlan_network.py index 62db635..757a3c2 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_vlan_network.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/api/test_vlan_network.py @@ -21,7 +21,7 @@ from oslo_log import log as logging from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from vmware_nsx_tempest.tests.nsxv.api import test_subnets as SNET +from vmware_nsx_tempest_plugin.tests.nsxv.api import test_subnets as SNET CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/__init__.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv/scenario/__init__.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/__init__.py diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/manager_topo_deployment.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/manager_topo_deployment.py index 74fdb24..d05c5de 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/manager_topo_deployment.py @@ -29,9 +29,9 @@ from tempest.lib.common.utils import test_utils from tempest.lib import exceptions from tempest import test -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( network_addon_methods as HELO) -from vmware_nsx_tempest.tests.scenario import manager +from vmware_nsx_tempest_plugin.tests.scenario import manager CONF = config.CONF LOG = manager.log.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/network_addon_methods.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/network_addon_methods.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv/scenario/network_addon_methods.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/network_addon_methods.py diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_admin_policy_basic_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_admin_policy_basic_ops.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_admin_policy_basic_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_admin_policy_basic_ops.py index 9a43437..d8f934b 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_admin_policy_basic_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_admin_policy_basic_ops.py @@ -23,9 +23,9 @@ from tempest.lib.common.utils import test_utils from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( manager_topo_deployment as dmgr) -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( network_addon_methods as HELO) CONF = config.CONF @@ -76,7 +76,7 @@ class TestAdminPolicyBasicOps(dmgr.TopoDeployScenarioManager): session nsxv of tempest.conf or devstack local.conf. Test Configuration setup: - please refer to vmware_nsx_tempest/doc/README-AdminPolicy.rst + please refer to vmware_nsx_tempest_plugin/doc/README-AdminPolicy.rst """ @classmethod diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_deployments.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_deployments.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_deployments.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_deployments.py index fb44f88..3563a5a 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_deployments.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_deployments.py @@ -21,7 +21,7 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from vmware_nsx_tempest.tests.nsxv.scenario \ +from vmware_nsx_tempest_plugin.tests.nsxv.scenario \ import manager_topo_deployment as dmgr CONF = config.CONF LOG = dmgr.manager.log.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_dhcp_121.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_dhcp_121.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_dhcp_121.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_dhcp_121.py index b859eae..2754d19 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_dhcp_121.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_dhcp_121.py @@ -27,10 +27,10 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions -from vmware_nsx_tempest.services import nsxv_client -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.services import nsxv_client +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( manager_topo_deployment as dmgr) -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( network_addon_methods as HELO) CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_dns_search_domain_basic_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_dns_search_domain_basic_ops.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_dns_search_domain_basic_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_dns_search_domain_basic_ops.py index fc0eee3..a97e478 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_dns_search_domain_basic_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_dns_search_domain_basic_ops.py @@ -19,9 +19,9 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( manager_topo_deployment as dmgr) -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( network_addon_methods as HELO) CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_dvr_basic_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_dvr_basic_ops.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_dvr_basic_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_dvr_basic_ops.py index fffd19f..bda839c 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_dvr_basic_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_dvr_basic_ops.py @@ -23,9 +23,9 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( network_addon_methods as HELO) -from vmware_nsx_tempest.tests.scenario import manager +from vmware_nsx_tempest_plugin.tests.scenario import manager CONF = config.CONF FIP_OPS_TIMEOUT = 10 diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_l7_switching_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_lbaas_l7_switching_ops.py similarity index 97% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_l7_switching_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_lbaas_l7_switching_ops.py index 69fec3c..815d99f 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_l7_switching_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_lbaas_l7_switching_ops.py @@ -14,10 +14,10 @@ import time from tempest.common import utils from tempest.lib import decorators -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.services.lbaas import l7policies_client -from vmware_nsx_tempest.services.lbaas import l7rules_client -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.services.lbaas import l7policies_client +from vmware_nsx_tempest_plugin.services.lbaas import l7rules_client +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( test_lbaas_round_robin_ops as lbaas_ops) diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_round_robin_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_lbaas_round_robin_ops.py similarity index 97% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_round_robin_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_lbaas_round_robin_ops.py index 30fbba0..31329fb 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_round_robin_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_lbaas_round_robin_ops.py @@ -20,12 +20,12 @@ from tempest.lib.common.utils import test_utils from tempest.lib import decorators import urllib3 -from vmware_nsx_tempest.services.lbaas import health_monitors_client -from vmware_nsx_tempest.services.lbaas import listeners_client -from vmware_nsx_tempest.services.lbaas import load_balancers_client -from vmware_nsx_tempest.services.lbaas import members_client -from vmware_nsx_tempest.services.lbaas import pools_client -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.services.lbaas import health_monitors_client +from vmware_nsx_tempest_plugin.services.lbaas import listeners_client +from vmware_nsx_tempest_plugin.services.lbaas import load_balancers_client +from vmware_nsx_tempest_plugin.services.lbaas import members_client +from vmware_nsx_tempest_plugin.services.lbaas import pools_client +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( manager_topo_deployment as dmgr) diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_static_routes_dhcp.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_lbaas_static_routes_dhcp.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_static_routes_dhcp.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_lbaas_static_routes_dhcp.py index 786793b..20a180c 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_static_routes_dhcp.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_lbaas_static_routes_dhcp.py @@ -14,9 +14,9 @@ # under the License. import re -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.lib import feature_manager -from vmware_nsx_tempest.services import nsxv_client +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.lib import feature_manager +from vmware_nsx_tempest_plugin.services import nsxv_client from tempest.common import waiters from tempest import config diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py index 046a54c..99efe91 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py @@ -23,10 +23,10 @@ from tempest.lib.common.utils import test_utils from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.services import nsxv_client -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.services import nsxv_client +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( manager_topo_deployment as dmgr) -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( network_addon_methods as HELO) CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_network_basic_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_network_basic_ops.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_network_basic_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_network_basic_ops.py diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_spoofguard_policy.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_spoofguard_policy.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_spoofguard_policy.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_spoofguard_policy.py index 792320f..d2bf658 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_spoofguard_policy.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_spoofguard_policy.py @@ -23,11 +23,11 @@ from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.services import nsxv_client -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.services import nsxv_client +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( manager_topo_deployment as dmgr) -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( network_addon_methods as HELO) CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_v1_fwaas_basic_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_v1_fwaas_basic_ops.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_v1_fwaas_basic_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_v1_fwaas_basic_ops.py index 4a2b152..09a58e3 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_v1_fwaas_basic_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_v1_fwaas_basic_ops.py @@ -23,12 +23,12 @@ from tempest.lib import decorators from tempest.lib import exceptions as lib_exc from tempest import test -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.services import fwaas_client as FWAASC -from vmware_nsx_tempest.services import nsxv_client -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.services import fwaas_client as FWAASC +from vmware_nsx_tempest_plugin.services import nsxv_client +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( manager_topo_deployment as dmgr) -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( network_addon_methods as NAM) CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py index 451f61b..0e36988 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py @@ -29,10 +29,10 @@ from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators -from vmware_nsx_tempest.services import load_balancer_v1_client as LBV1C -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.services import load_balancer_v1_client as LBV1C +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( network_addon_methods as HELO) -from vmware_nsx_tempest.tests.scenario import manager +from vmware_nsx_tempest_plugin.tests.scenario import manager CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_xnet_multiple_subnets_basic_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_xnet_multiple_subnets_basic_ops.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv/scenario/test_xnet_multiple_subnets_basic_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_xnet_multiple_subnets_basic_ops.py index 132c5cd..9d1bdce 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_xnet_multiple_subnets_basic_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv/scenario/test_xnet_multiple_subnets_basic_ops.py @@ -20,7 +20,7 @@ from tempest import config from tempest.lib.common.utils import test_utils from tempest.lib import decorators -from vmware_nsx_tempest.tests.nsxv.scenario import ( +from vmware_nsx_tempest_plugin.tests.nsxv.scenario import ( manager_topo_deployment as dmgr) CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/README.rst b/vmware_nsx_tempest_plugin/tests/nsxv3/README.rst similarity index 100% rename from vmware_nsx_tempest/tests/nsxv3/README.rst rename to vmware_nsx_tempest_plugin/tests/nsxv3/README.rst diff --git a/vmware_nsx_tempest/tests/nsxv3/__init__.py b/vmware_nsx_tempest_plugin/tests/nsxv3/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv3/__init__.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/__init__.py diff --git a/vmware_nsx_tempest/tests/nsxv3/api/__init__.py b/vmware_nsx_tempest_plugin/tests/nsxv3/api/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv3/api/__init__.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/api/__init__.py diff --git a/vmware_nsx_tempest/tests/nsxv3/api/test_l2_gateway.py b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_l2_gateway.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/api/test_l2_gateway.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/api/test_l2_gateway.py index 74e2ea0..e5c2645 100644 --- a/vmware_nsx_tempest/tests/nsxv3/api/test_l2_gateway.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_l2_gateway.py @@ -22,8 +22,8 @@ from tempest.lib import decorators from tempest.lib import exceptions as lib_exc from tempest import test -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.lib import feature_manager +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.lib import feature_manager LOG = constants.log.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv3/api/test_native_dhcp.py b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_native_dhcp.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/api/test_native_dhcp.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/api/test_native_dhcp.py index 41e6ba3..3bc77ae 100644 --- a/vmware_nsx_tempest/tests/nsxv3/api/test_native_dhcp.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_native_dhcp.py @@ -19,7 +19,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/api/test_native_dhcp_negative.py b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_native_dhcp_negative.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv3/api/test_native_dhcp_negative.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/api/test_native_dhcp_negative.py index ac91200..e05b3f9 100644 --- a/vmware_nsx_tempest/tests/nsxv3/api/test_native_dhcp_negative.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_native_dhcp_negative.py @@ -19,7 +19,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_floating_ip.py b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_floating_ip.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/api/test_nsx_floating_ip.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_floating_ip.py index 1fb169f..3fb9d2e 100644 --- a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_floating_ip.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_floating_ip.py @@ -21,7 +21,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_mac_learning.py b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_mac_learning.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/api/test_nsx_mac_learning.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_mac_learning.py index 95233dc..687c9c9 100644 --- a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_mac_learning.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_mac_learning.py @@ -18,8 +18,8 @@ from tempest.lib.common.utils import test_utils from tempest.lib import decorators from tempest.lib import exceptions as ex -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_networks.py b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_networks.py similarity index 97% rename from vmware_nsx_tempest/tests/nsxv3/api/test_nsx_networks.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_networks.py index 468b083..75d88f2 100644 --- a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_networks.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_networks.py @@ -15,7 +15,7 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_port_security.py b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_port_security.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/api/test_nsx_port_security.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_port_security.py index 0428607..528a487 100644 --- a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_port_security.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_port_security.py @@ -22,8 +22,8 @@ from tempest.lib import decorators from tempest.lib import exceptions from tempest import test -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_routers.py b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_routers.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv3/api/test_nsx_routers.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_routers.py index 4f9b7c4..3c1cd39 100644 --- a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_routers.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_routers.py @@ -18,7 +18,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_security_groups.py b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_security_groups.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/api/test_nsx_security_groups.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_security_groups.py index 118dcd5..a8b5993 100644 --- a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_security_groups.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_nsx_security_groups.py @@ -24,8 +24,8 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.services import nsxv3_client LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv3/api/test_provider_sec_group.py b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_provider_sec_group.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/api/test_provider_sec_group.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/api/test_provider_sec_group.py index d856c88..a2979cd 100644 --- a/vmware_nsx_tempest/tests/nsxv3/api/test_provider_sec_group.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/api/test_provider_sec_group.py @@ -22,8 +22,8 @@ from tempest.lib import decorators from tempest.lib import exceptions from tempest import test -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF PROVIDER_SECURITY_GRP = 'provider-sec-group' diff --git a/vmware_nsx_tempest/tests/nsxv3/scale/__init__.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scale/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv3/scale/__init__.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scale/__init__.py diff --git a/vmware_nsx_tempest/tests/nsxv3/scale/test_dhcp_uni_scale.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scale/test_dhcp_uni_scale.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/scale/test_dhcp_uni_scale.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scale/test_dhcp_uni_scale.py index 09559a0..04508b3 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scale/test_dhcp_uni_scale.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scale/test_dhcp_uni_scale.py @@ -20,7 +20,7 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/__init__.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/nsxv3/scenario/__init__.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/__init__.py diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/test_allowed_address_pair.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_allowed_address_pair.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/scenario/test_allowed_address_pair.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_allowed_address_pair.py index 016b2a9..014fb7a 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scenario/test_allowed_address_pair.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_allowed_address_pair.py @@ -22,9 +22,9 @@ from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.services import nsxv3_client -from vmware_nsx_tempest.tests.scenario import manager +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.services import nsxv3_client +from vmware_nsx_tempest_plugin.tests.scenario import manager CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/test_audit_on_behalf.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_audit_on_behalf.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv3/scenario/test_audit_on_behalf.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_audit_on_behalf.py index fb6bc95..64177c8 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scenario/test_audit_on_behalf.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_audit_on_behalf.py @@ -19,9 +19,9 @@ from oslo_log import log as logging from tempest import config from tempest.lib import decorators -from vmware_nsx_tempest.common import constants as const -from vmware_nsx_tempest.lib import feature_manager -from vmware_nsx_tempest.services import nsx_client +from vmware_nsx_tempest_plugin.common import constants as const +from vmware_nsx_tempest_plugin.lib import feature_manager +from vmware_nsx_tempest_plugin.services import nsx_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/test_client_cert_mgmt_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_client_cert_mgmt_ops.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv3/scenario/test_client_cert_mgmt_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_client_cert_mgmt_ops.py index 252a3de..3ac8057 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scenario/test_client_cert_mgmt_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_client_cert_mgmt_ops.py @@ -24,9 +24,9 @@ from tempest.lib import decorators from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils -from vmware_nsx_tempest.services import nsxv3_client -from vmware_nsx_tempest.services.qos import base_qos -from vmware_nsx_tempest.tests.scenario import manager +from vmware_nsx_tempest_plugin.services import nsxv3_client +from vmware_nsx_tempest_plugin.services.qos import base_qos +from vmware_nsx_tempest_plugin.tests.scenario import manager authorizationField = '' CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/test_ens.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_ens.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/scenario/test_ens.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_ens.py index b95dc28..e3502e8 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scenario/test_ens.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_ens.py @@ -18,9 +18,9 @@ import time from tempest import config from tempest.lib import decorators -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.lib import feature_manager -from vmware_nsx_tempest.services import nsx_client +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.lib import feature_manager +from vmware_nsx_tempest_plugin.services import nsx_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/test_l2_gateway.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_l2_gateway.py similarity index 98% rename from vmware_nsx_tempest/tests/nsxv3/scenario/test_l2_gateway.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_l2_gateway.py index 9aa45fb..d9ad6b5 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scenario/test_l2_gateway.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_l2_gateway.py @@ -21,8 +21,8 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.lib import feature_manager +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.lib import feature_manager CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/test_lbaas_scenario.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_lbaas_scenario.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/scenario/test_lbaas_scenario.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_lbaas_scenario.py index b185dfb..24cfa79 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scenario/test_lbaas_scenario.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_lbaas_scenario.py @@ -15,8 +15,8 @@ import time -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.lib import feature_manager +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.lib import feature_manager from tempest.common import waiters from tempest import config diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/test_mdproxy.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_mdproxy.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/scenario/test_mdproxy.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_mdproxy.py index a868c97..2abdaea 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scenario/test_mdproxy.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_mdproxy.py @@ -17,9 +17,9 @@ from tempest.common import utils from tempest import config from tempest.lib import decorators -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.lib import feature_manager -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.lib import feature_manager +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/test_multi_hv_network_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_multi_hv_network_ops.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/scenario/test_multi_hv_network_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_multi_hv_network_ops.py index 21ca1c0..33d2128 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scenario/test_multi_hv_network_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_multi_hv_network_ops.py @@ -21,7 +21,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.tests.scenario import manager +from vmware_nsx_tempest_plugin.tests.scenario import manager CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/test_multiple_networks_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_multiple_networks_ops.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/scenario/test_multiple_networks_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_multiple_networks_ops.py index 4e95fd8..a7e19e9 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scenario/test_multiple_networks_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_multiple_networks_ops.py @@ -23,7 +23,7 @@ from tempest.lib.common.utils import test_utils from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.tests.scenario import manager +from vmware_nsx_tempest_plugin.tests.scenario import manager CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/test_net_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_net_ops.py similarity index 96% rename from vmware_nsx_tempest/tests/nsxv3/scenario/test_net_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_net_ops.py index afe046f..c586bbc 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scenario/test_net_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_net_ops.py @@ -17,8 +17,8 @@ from tempest.common import utils from tempest import config from tempest.lib import decorators -from vmware_nsx_tempest.lib import feature_manager -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.lib import feature_manager +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/test_nsx_port_security.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_nsx_port_security.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/scenario/test_nsx_port_security.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_nsx_port_security.py index d3c5563..54c2992 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scenario/test_nsx_port_security.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_nsx_port_security.py @@ -22,9 +22,9 @@ from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.services import nsxv3_client -from vmware_nsx_tempest.tests.scenario import manager +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.services import nsxv3_client +from vmware_nsx_tempest_plugin.tests.scenario import manager CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/test_provider_security_group.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_provider_security_group.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/scenario/test_provider_security_group.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_provider_security_group.py index 8ca0b0e..dbc43e0 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scenario/test_provider_security_group.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_provider_security_group.py @@ -24,9 +24,9 @@ from tempest.lib.common.utils import test_utils from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.services import nsxv3_client -from vmware_nsx_tempest.tests.scenario import manager +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.services import nsxv3_client +from vmware_nsx_tempest_plugin.tests.scenario import manager CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv3/scenario/test_router_nonat_ops.py b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_router_nonat_ops.py similarity index 99% rename from vmware_nsx_tempest/tests/nsxv3/scenario/test_router_nonat_ops.py rename to vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_router_nonat_ops.py index 43d7871..5102f9d 100644 --- a/vmware_nsx_tempest/tests/nsxv3/scenario/test_router_nonat_ops.py +++ b/vmware_nsx_tempest_plugin/tests/nsxv3/scenario/test_router_nonat_ops.py @@ -24,8 +24,8 @@ from tempest.lib.common.utils import test_utils from tempest.lib import decorators from tempest.lib import exceptions -from vmware_nsx_tempest.services import nsxv3_client -from vmware_nsx_tempest.tests.scenario import manager +from vmware_nsx_tempest_plugin.services import nsxv3_client +from vmware_nsx_tempest_plugin.tests.scenario import manager CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/scenario/__init__.py b/vmware_nsx_tempest_plugin/tests/scenario/__init__.py similarity index 100% rename from vmware_nsx_tempest/tests/scenario/__init__.py rename to vmware_nsx_tempest_plugin/tests/scenario/__init__.py diff --git a/vmware_nsx_tempest/tests/scenario/manager.py b/vmware_nsx_tempest_plugin/tests/scenario/manager.py similarity index 100% rename from vmware_nsx_tempest/tests/scenario/manager.py rename to vmware_nsx_tempest_plugin/tests/scenario/manager.py diff --git a/vmware_nsx_tempest/tests/scenario/test_designate.py b/vmware_nsx_tempest_plugin/tests/scenario/test_designate.py similarity index 99% rename from vmware_nsx_tempest/tests/scenario/test_designate.py rename to vmware_nsx_tempest_plugin/tests/scenario/test_designate.py index bd10ace..d7604f0 100644 --- a/vmware_nsx_tempest/tests/scenario/test_designate.py +++ b/vmware_nsx_tempest_plugin/tests/scenario/test_designate.py @@ -22,8 +22,8 @@ from tempest import config from tempest.lib import decorators from tempest.lib import exceptions as lib_exc -from vmware_nsx_tempest.common import constants as const -from vmware_nsx_tempest.lib import feature_manager +from vmware_nsx_tempest_plugin.common import constants as const +from vmware_nsx_tempest_plugin.lib import feature_manager CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/scenario/test_micro_segmentation_ops.py b/vmware_nsx_tempest_plugin/tests/scenario/test_micro_segmentation_ops.py similarity index 98% rename from vmware_nsx_tempest/tests/scenario/test_micro_segmentation_ops.py rename to vmware_nsx_tempest_plugin/tests/scenario/test_micro_segmentation_ops.py index 2e48c67..a75b2ba 100644 --- a/vmware_nsx_tempest/tests/scenario/test_micro_segmentation_ops.py +++ b/vmware_nsx_tempest_plugin/tests/scenario/test_micro_segmentation_ops.py @@ -18,8 +18,8 @@ from tempest import config from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.lib import feature_manager -from vmware_nsx_tempest.services import nsx_client +from vmware_nsx_tempest_plugin.lib import feature_manager +from vmware_nsx_tempest_plugin.services import nsx_client CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/scenario/test_provider_networks.py b/vmware_nsx_tempest_plugin/tests/scenario/test_provider_networks.py similarity index 99% rename from vmware_nsx_tempest/tests/scenario/test_provider_networks.py rename to vmware_nsx_tempest_plugin/tests/scenario/test_provider_networks.py index 85fb8cc..3815f77 100644 --- a/vmware_nsx_tempest/tests/scenario/test_provider_networks.py +++ b/vmware_nsx_tempest_plugin/tests/scenario/test_provider_networks.py @@ -18,9 +18,9 @@ from tempest.lib import decorators from tempest.lib import exceptions from tempest import test -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.lib import feature_manager -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.lib import feature_manager +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF LOG = constants.log.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/scenario/test_provider_traffic_scenario.py b/vmware_nsx_tempest_plugin/tests/scenario/test_provider_traffic_scenario.py similarity index 98% rename from vmware_nsx_tempest/tests/scenario/test_provider_traffic_scenario.py rename to vmware_nsx_tempest_plugin/tests/scenario/test_provider_traffic_scenario.py index c8a8482..586ed52 100644 --- a/vmware_nsx_tempest/tests/scenario/test_provider_traffic_scenario.py +++ b/vmware_nsx_tempest_plugin/tests/scenario/test_provider_traffic_scenario.py @@ -16,9 +16,9 @@ from tempest import config from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.common import constants -from vmware_nsx_tempest.lib import feature_manager -from vmware_nsx_tempest.services import nsxv3_client +from vmware_nsx_tempest_plugin.common import constants +from vmware_nsx_tempest_plugin.lib import feature_manager +from vmware_nsx_tempest_plugin.services import nsxv3_client CONF = config.CONF LOG = constants.log.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/scenario/test_qos.py b/vmware_nsx_tempest_plugin/tests/scenario/test_qos.py similarity index 99% rename from vmware_nsx_tempest/tests/scenario/test_qos.py rename to vmware_nsx_tempest_plugin/tests/scenario/test_qos.py index 2fae1b2..14e89f3 100644 --- a/vmware_nsx_tempest/tests/scenario/test_qos.py +++ b/vmware_nsx_tempest_plugin/tests/scenario/test_qos.py @@ -23,8 +23,8 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest import test -from vmware_nsx_tempest.lib import feature_manager -from vmware_nsx_tempest.services import nsx_client +from vmware_nsx_tempest_plugin.lib import feature_manager +from vmware_nsx_tempest_plugin.services import nsx_client import time diff --git a/vmware_nsx_tempest/tests/templates/nsxt_neutron_smoke.yaml b/vmware_nsx_tempest_plugin/tests/templates/nsxt_neutron_smoke.yaml similarity index 100% rename from vmware_nsx_tempest/tests/templates/nsxt_neutron_smoke.yaml rename to vmware_nsx_tempest_plugin/tests/templates/nsxt_neutron_smoke.yaml diff --git a/vmware_nsx_tempest/tests/templates/nsxv_neutron_smoke.yaml b/vmware_nsx_tempest_plugin/tests/templates/nsxv_neutron_smoke.yaml similarity index 100% rename from vmware_nsx_tempest/tests/templates/nsxv_neutron_smoke.yaml rename to vmware_nsx_tempest_plugin/tests/templates/nsxv_neutron_smoke.yaml diff --git a/vmware_nsx_tempest/tests/test_vmware_nsx_tempest.py b/vmware_nsx_tempest_plugin/tests/test_vmware_nsx_tempest.py similarity index 89% rename from vmware_nsx_tempest/tests/test_vmware_nsx_tempest.py rename to vmware_nsx_tempest_plugin/tests/test_vmware_nsx_tempest.py index 6e09f6f..9faa49f 100644 --- a/vmware_nsx_tempest/tests/test_vmware_nsx_tempest.py +++ b/vmware_nsx_tempest_plugin/tests/test_vmware_nsx_tempest.py @@ -16,11 +16,11 @@ test_vmware_nsx_tempest ---------------------------------- -Tests for `vmware_nsx_tempest` module. +Tests for `vmware_nsx_tempest_plugin` module. """ from tempest.lib import decorators -from vmware_nsx_tempest.tests import base +from vmware_nsx_tempest_plugin.tests import base class TestVmware_nsx_tempest(base.TestCase):