refactor top-level pkg to vmware_nsx_tempest_plugin

This patch refactors the source and supporting files to use the top
level package name of vmware_nsx_tempest_plugin. This better matches
the project name as well as the name we plan to publish to PYPI with
as per the discussion in [1].

A sample release has been published to the test pypi repo [2] to
ensure this works.

[1] https://review.openstack.org/#/c/584498/
[2] https://test.pypi.org/project/vmware-nsx-tempest-plugin/

Change-Id: I4cd89f49562c780754ebfb7e93c38b4e6556e314

.stestr.conf

@@ -1,4 +1,4 @@
 [DEFAULT]
-test_path=./vmware_nsx_tempest/tests
+test_path=./vmware_nsx_tempest_plugin/tests
 top_dir=./
 

.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

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 -l vmware_nsx_tempest_plugin
-    $ ostestr vmware_nsx_tempest.tests.nsxv3.scenario.test_mdproxy.TestMDProxy.test_mdproxy_ping
+    $ 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_plugin.*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.tests.nsxv.api.test_l2_gateway_connection.L2GatewayConnectionTest.test_csuld_single_device_interface_vlan
 
 TechNote on vmware-nsx-tempest-plugin:
 =========================================

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
+directory = vmware_nsx_tempest_plugin/locale
-domain = vmware_nsx_tempest
+domain = vmware_nsx_tempest_plugin
 
 [update_catalog]
-domain = vmware_nsx_tempest
+domain = vmware_nsx_tempest_plugin
-output_dir = vmware_nsx_tempest/locale
+output_dir = vmware_nsx_tempest_plugin/locale
-input_file = vmware_nsx_tempest/locale/vmware_nsx_tempest.pot
+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

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

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)
 

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_plugin.common import constants
-from vmware_nsx_tempest.tests.scenario import manager
+from vmware_nsx_tempest_plugin.tests.scenario import manager
 
 CONF = config.CONF
 LOG = logging.getLogger(__name__)

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_plugin._i18n import _
-from vmware_nsx_tempest.common import constants
+from vmware_nsx_tempest_plugin.common import constants
-from vmware_nsx_tempest.lib import traffic_manager
+from vmware_nsx_tempest_plugin.lib import traffic_manager
-from vmware_nsx_tempest.services import designate_base
+from vmware_nsx_tempest_plugin.services import designate_base
-from vmware_nsx_tempest.services.lbaas import health_monitors_client
+from vmware_nsx_tempest_plugin.services.lbaas import health_monitors_client
-from vmware_nsx_tempest.services.lbaas import listeners_client
+from vmware_nsx_tempest_plugin.services.lbaas import listeners_client
-from vmware_nsx_tempest.services.lbaas import load_balancers_client
+from vmware_nsx_tempest_plugin.services.lbaas import load_balancers_client
-from vmware_nsx_tempest.services.lbaas import members_client
+from vmware_nsx_tempest_plugin.services.lbaas import members_client
-from vmware_nsx_tempest.services.lbaas import pools_client
+from vmware_nsx_tempest_plugin.services.lbaas import pools_client
-from vmware_nsx_tempest.services import nsx_client
+from vmware_nsx_tempest_plugin.services import nsx_client
-from vmware_nsx_tempest.services import openstack_network_clients
+from vmware_nsx_tempest_plugin.services import openstack_network_clients
 
 
 LOG = constants.log.getLogger(__name__)

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_plugin.common import constants
-from vmware_nsx_tempest.lib import appliance_manager
+from vmware_nsx_tempest_plugin.lib import appliance_manager
 
 CONF = config.CONF
 

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
 

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__)
 

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__)
 

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
 
 

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__)
 

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)

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:

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):

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):

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)

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_plugin._i18n import _
-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
 
 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)

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)

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)

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_plugin._i18n import _
-from vmware_nsx_tempest.services import network_client_base as base
+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)

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__)
 

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()
 

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

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_plugin.common import constants
-from vmware_nsx_tempest.common import waiters
+from vmware_nsx_tempest_plugin.common import waiters
-from vmware_nsx_tempest.services import designate_base
+from vmware_nsx_tempest_plugin.services import designate_base
 
 LOG = log.getLogger(__name__)
 CONF = config.CONF

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):

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"

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):

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):

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):

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):

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_plugin._i18n import _
-from vmware_nsx_tempest.services import tags_client
+from vmware_nsx_tempest_plugin.services import tags_client
 
 CONF = config.CONF
 LOG = logging.getLogger(__name__)

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_plugin.common import constants
-from vmware_nsx_tempest.lib import feature_manager
+from vmware_nsx_tempest_plugin.lib import feature_manager
-from vmware_nsx_tempest.services import nsxv3_client
+from vmware_nsx_tempest_plugin.services import nsxv3_client
 
 CONF = config.CONF
 LOG = constants.log.getLogger(__name__)

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
 

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

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_plugin.lib import feature_manager
-from vmware_nsx_tempest.services import nsx_client
+from vmware_nsx_tempest_plugin.services import nsx_client
 
 
 CONF = config.CONF

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_plugin.common import constants
-from vmware_nsx_tempest.lib import feature_manager
+from vmware_nsx_tempest_plugin.lib import feature_manager
-from vmware_nsx_tempest.services import nsxv3_client
+from vmware_nsx_tempest_plugin.services import nsxv3_client
 
 
 from oslo_log import log as logging

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):

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):

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__)

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_plugin.services.lbaas import health_monitors_client
-from vmware_nsx_tempest.services.lbaas import l7policies_client
+from vmware_nsx_tempest_plugin.services.lbaas import l7policies_client
-from vmware_nsx_tempest.services.lbaas import l7rules_client
+from vmware_nsx_tempest_plugin.services.lbaas import l7rules_client
-from vmware_nsx_tempest.services.lbaas import listeners_client
+from vmware_nsx_tempest_plugin.services.lbaas import listeners_client
-from vmware_nsx_tempest.services.lbaas import load_balancers_client
+from vmware_nsx_tempest_plugin.services.lbaas import load_balancers_client
-from vmware_nsx_tempest.services.lbaas import members_client
+from vmware_nsx_tempest_plugin.services.lbaas import members_client
-from vmware_nsx_tempest.services.lbaas import pools_client
+from vmware_nsx_tempest_plugin.services.lbaas import pools_client
 
 CONF = config.CONF
 LOG = logging.getLogger(__name__)

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
 

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):

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

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

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 

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__)
 

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_plugin.services import base_l2gw
-from vmware_nsx_tempest.services import l2_gateway_client as L2GW
+from vmware_nsx_tempest_plugin.services import l2_gateway_client as L2GW
 
 CONF = config.CONF
 L2GW_RID = 'l2_gateway'

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_plugin.services import base_l2gw
-from vmware_nsx_tempest.services import l2_gateway_client as L2GW
+from vmware_nsx_tempest_plugin.services import l2_gateway_client as L2GW
-from vmware_nsx_tempest.services import \
+from vmware_nsx_tempest_plugin.services import \
     l2_gateway_connection_client as L2GWC
 
 CONF = config.CONF

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_plugin.services import nsxv_client
-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
 

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
 

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_plugin.services import nsxv_client
-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
 LOG = logging.getLogger(__name__)

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__)

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
 

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