diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..2d23284
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack/vmware-nsx-tempest-plugin.git
diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 0000000..0bb29da
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,12 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+ OS_LOG_CAPTURE=${OS_LOG_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
+
+test_id_option=--load-list $IDFILE
+test_list_option=--list
+group_regex=([^\.]*\.)*
diff --git a/README.rst b/README.rst
index b2d60bb..9b32647 100644
--- a/README.rst
+++ b/README.rst
@@ -1,19 +1,93 @@
+Welcome!
+========
+
===============================
vmware-nsx-tempest-plugin
===============================
Tempest plugin vmware-nsx-tempest-plugin
-Please fill here a long description which must be at least 3 lines wrapped on
-80 cols, so that distribution package maintainers can use it in their packages.
-Note that this is a hard requirement.
+
+This repo hosts vmware-nsx's functional api and scenario tests.
+
+vmware-nsx is Vmware plugin for neutron. This repo is tempest plugin to
+test vmware-nsx at function level. All vmware-nsx-tempest-plugin tests
+are in "master" branch. Some of the tests are designed based on N-S traffic.
+Intstall thsi repo on external VM to run entire test suite.
* Free software: Apache license
-* Documentation: http://docs.openstack.org/developer/vmware-nsx-tempest-plugin
+* Launchpad: https://launchpad.net/vmware-nsx-tempest-plugin
* Source: http://git.openstack.org/cgit/openstack/vmware-nsx-tempest-plugin
* Bugs: http://bugs.launchpad.net/vmware-nsx-tempest-plugin
-Features
---------
+Features:
+=========
-* TODO
+* API tests
+* Scenario tests
+
+Overview:
+=========
+
+Installation:
+=============
+
+#. On your own development folder, for example /opt/stack/,
+ install your own tempest development env at /opt/stack/tempest/::
+
+ $ cd /opt/stack
+ $ git clone https://github.com/openstack/tempest
+
+#. Install virtualenv with the following command::
+
+ $ cd /opt/stack/tempest
+ $ ./run_tempest.sh -u not_exist_tests
+
+#. Install vmware-nsx-tempest-plugin master branch at /opt/stack::
+
+ $ cd /opt/stack
+ $ git clone https://github.com/openstack/vmware-nsx-tempest-plugin.git
+
+#. Install vmware-nsx-tempest-plugin in your tempest development environment::
+
+ $ cd /opt/stack
+ $ sudo pip install -e vmware-nsx-tempest-plugin
+
+ Run command::
+
+ $ pip show vmware-nsx-tempest-plugin
+
+ You should observe the following statements::
+
+ Location: /opt/stack/vmware-nsx-tempest-plugin
+
+#. Validate installed vmware_nsx_tempest 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
+ $ python -m testtools.run vmware_nsx_tempest.tests.nsxv3.scenario.test_mdproxy.TestMDProxy.test_mdproxy_ping
+
+Your installation failed, if no tests are shown.
+
+Execution:
+==========
+
+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
+
+TechNote on vmware-nsx-tempest-plugin:
+=========================================
+
+vmware-nsx-tempest-plugin is a plugin to tempest, not neutron, nor vmware-nsx.
+It is defined by tempest.test_plugins.
+
+Modules within vmware-nsx-tempest can not see resources defined
+by vmware-nsx. Commands like following will not work, unless
+vmware-nsx is installed in your tempest environment::
+
+ import vmware_nsx.shell.admin.plugins.common.utils as admin_utils
diff --git a/requirements.txt b/requirements.txt
index 1d18dd3..b6bb061 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,3 +3,4 @@
# process, which may cause wedges in the gate later.
pbr>=2.0 # Apache-2.0
+neutron-lib>=1.9.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index 2612e00..bf0ce88 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,7 +21,7 @@ classifier =
[files]
packages =
- vmware-nsx-tempest-plugin
+ vmware_nsx_tempest
[build_sphinx]
all-files = 1
@@ -33,19 +33,19 @@ build-dir = doc/build
upload-dir = doc/build/html
[compile_catalog]
-directory = vmware-nsx-tempest-plugin/locale
-domain = vmware-nsx-tempest-plugin
+directory = vmware_nsx_tempest/locale
+domain = vmware_nsx_tempest
[update_catalog]
-domain = vmware-nsx-tempest-plugin
-output_dir = vmware-nsx-tempest-plugin/locale
-input_file = vmware-nsx-tempest-plugin/locale/vmware-nsx-tempest-plugin.pot
+domain = vmware_nsx_tempest
+output_dir = vmware_nsx_tempest/locale
+input_file = vmware_nsx_tempest/locale/vmware_nsx_tempest.pot
[extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg
-output_file = vmware-nsx-tempest-plugin/locale/vmware-nsx-tempest-plugin.pot
+output_file = vmware_nsx_tempest/locale/vmware_nsx_tempest.pot
[entry_points]
tempest.test_plugins =
- vmware-nsx-tempest-plugin = vmware-nsx-tempest-plugin.plugin:VMwareNsxTempestPlugin
+ vmware-nsx-tempest-plugin = vmware_nsx_tempest.plugin:VmwareNsxTempestPlugin
diff --git a/test-requirements.txt b/test-requirements.txt
index f559c0e..0af1db2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,3 +13,4 @@ testtools>=1.4.0 # MIT
openstackdocstheme>=1.11.0 # Apache-2.0
# releasenotes
reno>=1.8.0 # Apache-2.0
+tempest>=16.1.0 # Apache-2.0
diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh
new file mode 100644
index 0000000..a185c51
--- /dev/null
+++ b/tools/pretty_tox.sh
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+TESTRARGS=$1
+
+exec 3>&1
+status=$(exec 4>&1 >&3; ( python setup.py testr --slowest --testr-args="--subunit $TESTRARGS"; echo $? >&4 ) | subunit-trace -f) && exit $status
+
diff --git a/tox.ini b/tox.ini
index c888992..7d7d716 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 2.0
-envlist = py34,py27,pypy,pep8
+envlist = py35,py27,pep8,docs
skipsdist = True
[testenv]
@@ -10,11 +10,30 @@ setenv =
VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning
deps = -r{toxinidir}/test-requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
+ -r{toxinidir}/requirements.txt
+whitelist_externals = sh
+ rm
+ find
+commands =
+ find . -type f -name "*.pyc" -delete
+ sh tools/pretty_tox.sh '{posargs}'
+passenv = http_proxy
+ HTTP_PROXY
+ https_proxy
+ HTTPS_PROXY
+ no_proxy
+ NO_PROXY
+ OS_DEBUG
+ OS_LOG_CAPTURE
+ OS_STDERR_CAPTURE
+ OS_STDOUT_CAPTURE
[testenv:pep8]
commands = flake8 {posargs}
+[testenv:py27]
+setenv = OS_FAIL_ON_MISSING_DEPS=1
+
[testenv:venv]
commands = {posargs}
@@ -35,6 +54,7 @@ commands = oslo_debug_helper {posargs}
# E123, E125 skipped as they are invalid PEP-8.
show-source = True
-ignore = E123,E125
+ignore = E125,E126,E128,E129,E265,H305,H307,H404,H405,H904,N530,N531
builtins = _
-exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
+exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject
+import-order-style = pep8
diff --git a/vmware-nsx-tempest-plugin/README.rst b/vmware-nsx-tempest-plugin/README.rst
deleted file mode 100644
index d709283..0000000
--- a/vmware-nsx-tempest-plugin/README.rst
+++ /dev/null
@@ -1,92 +0,0 @@
-Welcome!
-========
-vmware_nsx_tempest is a plugin module to openstack tempest project.
-
-If you are not familiar with tempest, please refer to::
-
- https://docs.openstack.org/developer/tempest
-
-It is implemented with tempest external plugin.
-The official design sepcification is at::
-
- https://review.openstack.org/#/c/184992/
-
-Overview
-========
-
-vmware_nsx_tempest hosts vmware_nsx's functional api and scenario tests.
-
-All vmware_nsx_tempest tests are in "master" branch. For this reason,
-it is recommended to have your own developer version of vmware-nsx repo
-installed outside the devstack folder, /opt/stack/.
-
-For example at /opt/devtest folder. In doing so, you can install
-editable vmware-nsx repo under tempest VENV environemnt.
-
-Installation:
--------------
-
-#. On your own development folder, for example /opt/devtest/,
- install your own tempest development env at /opt/devtest/os-tempest/::
-
- $ cd /opt/devtest
- $ git clone https://github.com/openstack/tempest os-tempest
-
-#. Install virtualenv with the following command::
-
- $ cd /opt/devtest/os-tempest
- $ ./run_tempest.sh -u not_exist_tests
-
-#. Install vmware-nsx master branch at /opt/devtest/vmware-nsx::
-
- $ cd /opt/devtest
- $ git clone https://github.com/openstack/vmware-nsx
-
-#. Install vmware_nsx_tempest in your tempest development environment::
-
- $ cd /opt/devtest/os-tempest
- $ source .venv/bin/activate
- $ pip install -e /opt/devtest/vmware-nsx/
-
- Run command::
-
- $ pip show vmware-nsx
-
- You should observe the following statements::
-
- Location: /opt/devtest/vmware-nsx
-
- and under section of Entry-points::
-
- [tempest.test_plugins]
- vmware-nsx-tempest-plugin = vmware_nsx_tempest.plugin:VMwareNsxTempestPlugin
-
-#. Validate installed vmware_nsx_tempest successfully do::
-
- $ cd /opt/devtest/os-tempest
- $ tools/with_venv.sh testr list-tests vmware_nsx_tempest.*l2_gateway
-
-Your installation failed, if no tests are shown.
-
-Execution:
-----------
-
-vmware_nsx_tempest tests are tempest tests, you need to
-run from tempest directory. For example, to run only l2-gateway tests::
-
- $ cd /opt/devtest/os-tempest
- $ ./run_tempest.sh -t vmware_nsx_tempest.*test_l2_gateway
- $ ./run_tempest.sh -d vmware_nsx_tempest.tests.nsxv.api.test_l2_gateway_connection.L2GatewayConnectionTest.test_csuld_single_device_interface_vlan
-
-TechNote on vmware_nsx_tempest:
--------------------------------
-
-vmware_nsx_tempest is a plugin to tempest, not neutron, nor vmware_nsx.
-
-It is defined by tempest.test_plugins.
-
-Modules within vmware_nsx_tempest can not see resources defined
-by vmware_nsx. Commands like following are not acceptable, unless
-vmware_nsx is installed in your tempest environment::
-
- import vmware_nsx.shell.admin.plugins.common.utils as admin_utils
diff --git a/vmware-nsx-tempest-plugin/__init__.py b/vmware_nsx_tempest/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/__init__.py
rename to vmware_nsx_tempest/__init__.py
diff --git a/vmware-nsx-tempest-plugin/_i18n.py b/vmware_nsx_tempest/_i18n.py
similarity index 97%
rename from vmware-nsx-tempest-plugin/_i18n.py
rename to vmware_nsx_tempest/_i18n.py
index d4f8a00..8d32e0d 100644
--- a/vmware-nsx-tempest-plugin/_i18n.py
+++ b/vmware_nsx_tempest/_i18n.py
@@ -14,7 +14,7 @@
import oslo_i18n
-DOMAIN = "vmware-nsx-tempest"
+DOMAIN = "vmware_nsx_tempest"
_translators = oslo_i18n.TranslatorFactory(domain=DOMAIN)
diff --git a/vmware-nsx-tempest-plugin/common/__init__.py b/vmware_nsx_tempest/common/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/common/__init__.py
rename to vmware_nsx_tempest/common/__init__.py
diff --git a/vmware-nsx-tempest-plugin/common/constants.py b/vmware_nsx_tempest/common/constants.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/common/constants.py
rename to vmware_nsx_tempest/common/constants.py
diff --git a/vmware-nsx-tempest-plugin/config.py b/vmware_nsx_tempest/config.py
similarity index 94%
rename from vmware-nsx-tempest-plugin/config.py
rename to vmware_nsx_tempest/config.py
index b173af3..f3ad8a3 100644
--- a/vmware-nsx-tempest-plugin/config.py
+++ b/vmware_nsx_tempest/config.py
@@ -110,10 +110,10 @@ NSXvGroup = [
help="Specific for router_size tests. This value defines"
" how long http.request should retry."),
cfg.BoolOpt('no_router_type',
- default=False,
- help="router_type is NSXv extension."
- "Set it to True allow tests to remove this attribute"
- " when creating router."),
+ default=False,
+ help="router_type is NSXv extension."
+ "Set it to True allow tests to remove this attribute"
+ " when creating router."),
cfg.ListOpt('bugs_to_resolve',
default=[],
help="Bugs to be resolved. Define this at tempest.conf and"
@@ -129,10 +129,10 @@ NSXvGroup = [
help="NSX security-policy ID used to create the 2nd"
" security-group-policy, and != default_policy_id."),
cfg.BoolOpt('allow_tenant_rules_with_policy',
- default=False,
- help="Default=False; a tenant cannot create security-group."
- " If True, tenant can create non-policy security-group."
- " Sync this value with nsx.ini file."),
+ default=False,
+ help="Default=False; a tenant cannot create security-group."
+ " If True, tenant can create non-policy security-group."
+ " Sync this value with nsx.ini file."),
]
diff --git a/vmware-nsx-tempest-plugin/doc/README-AdminPolicy.rst b/vmware_nsx_tempest/doc/README-AdminPolicy.rst
similarity index 100%
rename from vmware-nsx-tempest-plugin/doc/README-AdminPolicy.rst
rename to vmware_nsx_tempest/doc/README-AdminPolicy.rst
diff --git a/vmware-nsx-tempest-plugin/doc/README-LBaaS.rst b/vmware_nsx_tempest/doc/README-LBaaS.rst
similarity index 100%
rename from vmware-nsx-tempest-plugin/doc/README-LBaaS.rst
rename to vmware_nsx_tempest/doc/README-LBaaS.rst
diff --git a/vmware-nsx-tempest-plugin/doc/admin-policy-AA.blueprint b/vmware_nsx_tempest/doc/admin-policy-AA.blueprint
similarity index 100%
rename from vmware-nsx-tempest-plugin/doc/admin-policy-AA.blueprint
rename to vmware_nsx_tempest/doc/admin-policy-AA.blueprint
diff --git a/vmware-nsx-tempest-plugin/doc/admin-policy-BB.blueprint b/vmware_nsx_tempest/doc/admin-policy-BB.blueprint
similarity index 100%
rename from vmware-nsx-tempest-plugin/doc/admin-policy-BB.blueprint
rename to vmware_nsx_tempest/doc/admin-policy-BB.blueprint
diff --git a/vmware-nsx-tempest-plugin/lib/__init__.py b/vmware_nsx_tempest/lib/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/lib/__init__.py
rename to vmware_nsx_tempest/lib/__init__.py
diff --git a/vmware-nsx-tempest-plugin/lib/appliance_manager.py b/vmware_nsx_tempest/lib/appliance_manager.py
similarity index 96%
rename from vmware-nsx-tempest-plugin/lib/appliance_manager.py
rename to vmware_nsx_tempest/lib/appliance_manager.py
index 91cf121..5054199 100644
--- a/vmware-nsx-tempest-plugin/lib/appliance_manager.py
+++ b/vmware_nsx_tempest/lib/appliance_manager.py
@@ -83,7 +83,7 @@ class ApplianceManager(manager.NetworkScenarioTest):
return self.topology_keypairs[server['key_name']]['private_key']
def create_topology_router(self, router_name, routers_client=None,
- **kwargs):
+ **kwargs):
if not routers_client:
routers_client = self.routers_client
router_name_ = constants.APPLIANCE_NAME_STARTS_WITH + router_name
@@ -94,8 +94,9 @@ class ApplianceManager(manager.NetworkScenarioTest):
self.topology_routers[router_name] = router
return router
- def create_topology_network(self, network_name, networks_client=None,
- tenant_id=None, port_security_enabled=True, **kwargs):
+ def create_topology_network(
+ self, network_name, networks_client=None,
+ tenant_id=None, port_security_enabled=True, **kwargs):
if not networks_client:
networks_client = self.networks_client
if not tenant_id:
@@ -128,12 +129,14 @@ class ApplianceManager(manager.NetworkScenarioTest):
def cidr_in_use(cidr, tenant_id):
"""Check cidr existence
+
:returns: True if subnet with cidr already exist in tenant
False else
+
"""
cidr_in_use = \
- self.os_admin.subnets_client.list_subnets(tenant_id=tenant_id,
- cidr=cidr)['subnets']
+ self.os_admin.subnets_client.list_subnets(
+ tenant_id=tenant_id, cidr=cidr)['subnets']
return len(cidr_in_use) != 0
if ip_version == 6:
diff --git a/vmware-nsx-tempest-plugin/lib/feature_manager.py b/vmware_nsx_tempest/lib/feature_manager.py
similarity index 93%
rename from vmware-nsx-tempest-plugin/lib/feature_manager.py
rename to vmware_nsx_tempest/lib/feature_manager.py
index db63e15..11429c8 100644
--- a/vmware-nsx-tempest-plugin/lib/feature_manager.py
+++ b/vmware_nsx_tempest/lib/feature_manager.py
@@ -31,8 +31,8 @@ CONF = config.CONF
class FeatureManager(traffic_manager.TrafficManager):
@classmethod
def setup_clients(cls):
- """
- Create various client connections. Such as NSXv3 and L2 Gateway.
+ """Create various client connections. Such as NSXv3 and L2 Gateway.
+
"""
super(FeatureManager, cls).setup_clients()
try:
@@ -66,13 +66,13 @@ class FeatureManager(traffic_manager.TrafficManager):
# L2Gateway base class. To get basics of L2GW.
#
def create_l2gw(self, l2gw_name, l2gw_param):
- """
- Creates L2GW and returns the response.
+ """Creates L2GW and returns the response.
:param l2gw_name: name of the L2GW
:param l2gw_param: L2GW parameters
:return: response of L2GW create API
+
"""
LOG.info("l2gw name: %(name)s, l2gw_param: %(devices)s ",
{"name": l2gw_name, "devices": l2gw_param})
@@ -96,12 +96,12 @@ class FeatureManager(traffic_manager.TrafficManager):
return rsp, devices
def delete_l2gw(self, l2gw_id):
- """
- Delete L2gw.
+ """Delete L2gw.
:param l2gw_id: L2GW id to delete l2gw.
:return: response of the l2gw delete API.
+
"""
LOG.info("L2GW id: %(id)s to be deleted.", {"id": l2gw_id})
rsp = self.l2gw_client.delete_l2_gateway(l2gw_id)
@@ -109,24 +109,24 @@ class FeatureManager(traffic_manager.TrafficManager):
return rsp
def update_l2gw(self, l2gw_id, l2gw_new_name, devices):
- """
- Update existing L2GW.
+ """Update existing L2GW.
:param l2gw_id: L2GW id to update its parameters.
:param l2gw_new_name: name of the L2GW.
:param devices: L2GW parameters.
:return: Response of the L2GW update API.
+
"""
rsp = self.l2gw_client.update_l2_gateway(l2gw_id,
name=l2gw_new_name, **devices)
return rsp
def nsx_bridge_cluster_info(self):
- """
- Collect the device and interface name of the nsx brdige cluster.
+ """Collect the device and interface name of the nsx brdige cluster.
:return: nsx bridge id and display name.
+
"""
response = self.nsx_client.get_bridge_cluster_info()
if len(response) == 0:
@@ -134,12 +134,12 @@ class FeatureManager(traffic_manager.TrafficManager):
return [(x.get("id"), x.get("display_name")) for x in response]
def create_l2gw_connection(self, l2gwc_param):
- """
- Creates L2GWC and return the response.
+ """Creates L2GWC and return the response.
:param l2gwc_param: L2GWC parameters.
:return: response of L2GWC create API.
+
"""
LOG.info("l2gwc param: %(param)s ", {"param": l2gwc_param})
l2gwc_request_body = {"l2_gateway_id": l2gwc_param["l2_gateway_id"],
@@ -158,12 +158,12 @@ class FeatureManager(traffic_manager.TrafficManager):
return rsp
def delete_l2gw_connection(self, l2gwc_id):
- """
- Delete L2GWC and returns the response.
+ """Delete L2GWC and returns the response.
:param l2gwc_id: L2GWC id to delete L2GWC.
:return: response of the l2gwc delete API.
+
"""
LOG.info("L2GW connection id: %(id)s to be deleted",
{"id": l2gwc_id})
diff --git a/vmware-nsx-tempest-plugin/lib/traffic_manager.py b/vmware_nsx_tempest/lib/traffic_manager.py
similarity index 71%
rename from vmware-nsx-tempest-plugin/lib/traffic_manager.py
rename to vmware_nsx_tempest/lib/traffic_manager.py
index 3a396c4..064f84a 100644
--- a/vmware-nsx-tempest-plugin/lib/traffic_manager.py
+++ b/vmware_nsx_tempest/lib/traffic_manager.py
@@ -17,37 +17,39 @@ from vmware_nsx_tempest.lib import appliance_manager
class TrafficManager(appliance_manager.ApplianceManager):
- def check_server_internal_ips_using_floating_ip(self, floating_ip, server,
- address_list, should_connect=True):
+ def check_server_internal_ips_using_floating_ip(
+ self, floating_ip, server, address_list, should_connect=True):
ip_address = floating_ip['floating_ip_address']
private_key = self.get_server_key(server)
- ssh_source = self.get_remote_client(ip_address,
- private_key=private_key)
+ ssh_source = self.get_remote_client(
+ ip_address, private_key=private_key)
for remote_ip in address_list:
self.check_remote_connectivity(ssh_source, remote_ip,
should_succeed=should_connect)
- def check_network_internal_connectivity(self, network, floating_ip, server,
- should_connect=True):
+ def check_network_internal_connectivity(
+ self, network, floating_ip, server, should_connect=True):
"""via ssh check VM internal connectivity:
+
- ping internal gateway and DHCP port, implying in-tenant connectivity
pinging both, because L3 and DHCP agents might be on different nodes
+
"""
# get internal ports' ips:
# get all network ports in the new network
internal_ips = self.get_internal_ips(server, network, device="network")
- self.check_server_internal_ips_using_floating_ip(floating_ip, server,
- internal_ips, should_connect)
+ self.check_server_internal_ips_using_floating_ip(
+ floating_ip, server, internal_ips, should_connect)
- def check_vm_internal_connectivity(self, network, floating_ip, server,
- should_connect=True):
+ def check_vm_internal_connectivity(
+ self, network, floating_ip, server, should_connect=True):
# test internal connectivity to the other VM on the same network
compute_ips = self.get_internal_ips(server, network, device="compute")
- self.check_server_internal_ips_using_floating_ip(floating_ip, server,
- compute_ips, should_connect)
+ self.check_server_internal_ips_using_floating_ip(
+ floating_ip, server, compute_ips, should_connect)
- def using_floating_ip_check_server_and_project_network_connectivity(self,
- server_details, network=None):
+ def using_floating_ip_check_server_and_project_network_connectivity(
+ self, server_details, network=None):
if not network:
network = server_details.networks[0]
floating_ip = server_details.floating_ip
@@ -55,8 +57,9 @@ class TrafficManager(appliance_manager.ApplianceManager):
self.check_network_internal_connectivity(network, floating_ip, server)
self.check_vm_internal_connectivity(network, floating_ip, server)
- def check_cross_network_connectivity(self, network1,
- floating_ip_on_network2, server_on_network2, should_connect=False):
+ def check_cross_network_connectivity(
+ self, network1, floating_ip_on_network2, server_on_network2,
+ should_connect=False):
# test internal connectivity to the other VM on the same network
remote_ips = self.get_internal_ips(server_on_network2, network1,
device="compute")
diff --git a/vmware-nsx-tempest-plugin/plugin.py b/vmware_nsx_tempest/plugin.py
similarity index 95%
rename from vmware-nsx-tempest-plugin/plugin.py
rename to vmware_nsx_tempest/plugin.py
index db36053..fd8b295 100644
--- a/vmware-nsx-tempest-plugin/plugin.py
+++ b/vmware_nsx_tempest/plugin.py
@@ -1,4 +1,4 @@
-# Copyright 2015 VMware, Inc.
+# Copyright 2017 VMware, Inc.
#
# All Rights Reserved
#
@@ -31,7 +31,7 @@ _opts = [
]
-class VMwareNsxTempestPlugin(plugins.TempestPlugin):
+class VmwareNsxTempestPlugin(plugins.TempestPlugin):
"""Our addon configuration is defined at vmware_nsx_tempest/config.py
diff --git a/vmware-nsx-tempest-plugin/services/README.rst b/vmware_nsx_tempest/services/README.rst
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/README.rst
rename to vmware_nsx_tempest/services/README.rst
diff --git a/vmware-nsx-tempest-plugin/services/__init__.py b/vmware_nsx_tempest/services/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/__init__.py
rename to vmware_nsx_tempest/services/__init__.py
diff --git a/vmware-nsx-tempest-plugin/services/base_l2gw.py b/vmware_nsx_tempest/services/base_l2gw.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/base_l2gw.py
rename to vmware_nsx_tempest/services/base_l2gw.py
diff --git a/vmware-nsx-tempest-plugin/services/fwaas_client.py b/vmware_nsx_tempest/services/fwaas_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/fwaas_client.py
rename to vmware_nsx_tempest/services/fwaas_client.py
diff --git a/vmware-nsx-tempest-plugin/services/l2_gateway_client.py b/vmware_nsx_tempest/services/l2_gateway_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/l2_gateway_client.py
rename to vmware_nsx_tempest/services/l2_gateway_client.py
diff --git a/vmware-nsx-tempest-plugin/services/l2_gateway_connection_client.py b/vmware_nsx_tempest/services/l2_gateway_connection_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/l2_gateway_connection_client.py
rename to vmware_nsx_tempest/services/l2_gateway_connection_client.py
diff --git a/vmware-nsx-tempest-plugin/services/lbaas/__init__.py b/vmware_nsx_tempest/services/lbaas/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/lbaas/__init__.py
rename to vmware_nsx_tempest/services/lbaas/__init__.py
diff --git a/vmware-nsx-tempest-plugin/services/lbaas/health_monitors_client.py b/vmware_nsx_tempest/services/lbaas/health_monitors_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/lbaas/health_monitors_client.py
rename to vmware_nsx_tempest/services/lbaas/health_monitors_client.py
diff --git a/vmware-nsx-tempest-plugin/services/lbaas/l7policies_client.py b/vmware_nsx_tempest/services/lbaas/l7policies_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/lbaas/l7policies_client.py
rename to vmware_nsx_tempest/services/lbaas/l7policies_client.py
diff --git a/vmware-nsx-tempest-plugin/services/lbaas/l7rules_client.py b/vmware_nsx_tempest/services/lbaas/l7rules_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/lbaas/l7rules_client.py
rename to vmware_nsx_tempest/services/lbaas/l7rules_client.py
diff --git a/vmware-nsx-tempest-plugin/services/lbaas/listeners_client.py b/vmware_nsx_tempest/services/lbaas/listeners_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/lbaas/listeners_client.py
rename to vmware_nsx_tempest/services/lbaas/listeners_client.py
diff --git a/vmware-nsx-tempest-plugin/services/lbaas/load_balancers_client.py b/vmware_nsx_tempest/services/lbaas/load_balancers_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/lbaas/load_balancers_client.py
rename to vmware_nsx_tempest/services/lbaas/load_balancers_client.py
diff --git a/vmware-nsx-tempest-plugin/services/lbaas/members_client.py b/vmware_nsx_tempest/services/lbaas/members_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/lbaas/members_client.py
rename to vmware_nsx_tempest/services/lbaas/members_client.py
diff --git a/vmware-nsx-tempest-plugin/services/lbaas/pools_client.py b/vmware_nsx_tempest/services/lbaas/pools_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/lbaas/pools_client.py
rename to vmware_nsx_tempest/services/lbaas/pools_client.py
diff --git a/vmware-nsx-tempest-plugin/services/load_balancer_v1_client.py b/vmware_nsx_tempest/services/load_balancer_v1_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/load_balancer_v1_client.py
rename to vmware_nsx_tempest/services/load_balancer_v1_client.py
diff --git a/vmware-nsx-tempest-plugin/services/network_client_base.py b/vmware_nsx_tempest/services/network_client_base.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/network_client_base.py
rename to vmware_nsx_tempest/services/network_client_base.py
diff --git a/vmware-nsx-tempest-plugin/services/nsx_client.py b/vmware_nsx_tempest/services/nsx_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/nsx_client.py
rename to vmware_nsx_tempest/services/nsx_client.py
diff --git a/vmware-nsx-tempest-plugin/services/nsxv3_client.py b/vmware_nsx_tempest/services/nsxv3_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/nsxv3_client.py
rename to vmware_nsx_tempest/services/nsxv3_client.py
diff --git a/vmware-nsx-tempest-plugin/services/nsxv_client.py b/vmware_nsx_tempest/services/nsxv_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/nsxv_client.py
rename to vmware_nsx_tempest/services/nsxv_client.py
diff --git a/vmware-nsx-tempest-plugin/services/openstack_network_clients.py b/vmware_nsx_tempest/services/openstack_network_clients.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/openstack_network_clients.py
rename to vmware_nsx_tempest/services/openstack_network_clients.py
diff --git a/vmware-nsx-tempest-plugin/services/qos/__init__.py b/vmware_nsx_tempest/services/qos/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/qos/__init__.py
rename to vmware_nsx_tempest/services/qos/__init__.py
diff --git a/vmware-nsx-tempest-plugin/services/qos/bandwidth_limit_rules_client.py b/vmware_nsx_tempest/services/qos/bandwidth_limit_rules_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/qos/bandwidth_limit_rules_client.py
rename to vmware_nsx_tempest/services/qos/bandwidth_limit_rules_client.py
diff --git a/vmware-nsx-tempest-plugin/services/qos/base_qos.py b/vmware_nsx_tempest/services/qos/base_qos.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/qos/base_qos.py
rename to vmware_nsx_tempest/services/qos/base_qos.py
diff --git a/vmware-nsx-tempest-plugin/services/qos/dscp_marking_rules_client.py b/vmware_nsx_tempest/services/qos/dscp_marking_rules_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/qos/dscp_marking_rules_client.py
rename to vmware_nsx_tempest/services/qos/dscp_marking_rules_client.py
diff --git a/vmware-nsx-tempest-plugin/services/qos/policies_client.py b/vmware_nsx_tempest/services/qos/policies_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/qos/policies_client.py
rename to vmware_nsx_tempest/services/qos/policies_client.py
diff --git a/vmware-nsx-tempest-plugin/services/qos/rule_types_client.py b/vmware_nsx_tempest/services/qos/rule_types_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/qos/rule_types_client.py
rename to vmware_nsx_tempest/services/qos/rule_types_client.py
diff --git a/vmware-nsx-tempest-plugin/services/tags_client.py b/vmware_nsx_tempest/services/tags_client.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/tags_client.py
rename to vmware_nsx_tempest/services/tags_client.py
diff --git a/vmware-nsx-tempest-plugin/services/utils.py b/vmware_nsx_tempest/services/utils.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/services/utils.py
rename to vmware_nsx_tempest/services/utils.py
diff --git a/vmware-nsx-tempest-plugin/tests/__init__.py b/vmware_nsx_tempest/tests/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/__init__.py
rename to vmware_nsx_tempest/tests/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/api/__init__.py b/vmware_nsx_tempest/tests/api/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/api/__init__.py
rename to vmware_nsx_tempest/tests/api/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/api/test_network_tags.py b/vmware_nsx_tempest/tests/api/test_network_tags.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/api/test_network_tags.py
rename to vmware_nsx_tempest/tests/api/test_network_tags.py
diff --git a/vmware-nsx-tempest-plugin/tests/api/test_qos.py b/vmware_nsx_tempest/tests/api/test_qos.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/api/test_qos.py
rename to vmware_nsx_tempest/tests/api/test_qos.py
diff --git a/vmware-nsx-tempest-plugin/tests/base.py b/vmware_nsx_tempest/tests/base.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/base.py
rename to vmware_nsx_tempest/tests/base.py
diff --git a/vmware-nsx-tempest-plugin/tests/dvs/README.rst b/vmware_nsx_tempest/tests/dvs/README.rst
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/dvs/README.rst
rename to vmware_nsx_tempest/tests/dvs/README.rst
diff --git a/vmware-nsx-tempest-plugin/tests/dvs/__init__.py b/vmware_nsx_tempest/tests/dvs/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/dvs/__init__.py
rename to vmware_nsx_tempest/tests/dvs/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/dvs/api/__init__.py b/vmware_nsx_tempest/tests/dvs/api/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/dvs/api/__init__.py
rename to vmware_nsx_tempest/tests/dvs/api/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/dvs/api/base_dvs.py b/vmware_nsx_tempest/tests/dvs/api/base_dvs.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/dvs/api/base_dvs.py
rename to vmware_nsx_tempest/tests/dvs/api/base_dvs.py
diff --git a/vmware-nsx-tempest-plugin/tests/dvs/api/test_networks_admin_actions.py b/vmware_nsx_tempest/tests/dvs/api/test_networks_admin_actions.py
similarity index 98%
rename from vmware-nsx-tempest-plugin/tests/dvs/api/test_networks_admin_actions.py
rename to vmware_nsx_tempest/tests/dvs/api/test_networks_admin_actions.py
index c15e598..31fed62 100644
--- a/vmware-nsx-tempest-plugin/tests/dvs/api/test_networks_admin_actions.py
+++ b/vmware_nsx_tempest/tests/dvs/api/test_networks_admin_actions.py
@@ -13,11 +13,11 @@
# License for the specific language governing permissions and limitations
# under the License.
-import base_dvs as base
-
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
+
class AdminNetworksTestJSON(base.BaseDvsAdminNetworkTest):
_interface = 'json'
diff --git a/vmware-nsx-tempest-plugin/tests/dvs/api/test_ports_admin_actions.py b/vmware_nsx_tempest/tests/dvs/api/test_ports_admin_actions.py
similarity index 98%
rename from vmware-nsx-tempest-plugin/tests/dvs/api/test_ports_admin_actions.py
rename to vmware_nsx_tempest/tests/dvs/api/test_ports_admin_actions.py
index ff0a7b9..97a9076 100644
--- a/vmware-nsx-tempest-plugin/tests/dvs/api/test_ports_admin_actions.py
+++ b/vmware_nsx_tempest/tests/dvs/api/test_ports_admin_actions.py
@@ -13,10 +13,11 @@
# License for the specific language governing permissions and limitations
# under the License.
-import base_dvs as base
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
+
class AdminPortsTestJSON(base.BaseDvsAdminNetworkTest):
_interface = 'json'
diff --git a/vmware-nsx-tempest-plugin/tests/dvs/scenario/__init__.py b/vmware_nsx_tempest/tests/dvs/scenario/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/dvs/scenario/__init__.py
rename to vmware_nsx_tempest/tests/dvs/scenario/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/dvs/scenario/test_network_basic_ops.py b/vmware_nsx_tempest/tests/dvs/scenario/test_network_basic_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/dvs/scenario/test_network_basic_ops.py
rename to vmware_nsx_tempest/tests/dvs/scenario/test_network_basic_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/README.rst b/vmware_nsx_tempest/tests/nsxv/README.rst
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/README.rst
rename to vmware_nsx_tempest/tests/nsxv/README.rst
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/__init__.py b/vmware_nsx_tempest/tests/nsxv/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/__init__.py
rename to vmware_nsx_tempest/tests/nsxv/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/README.rst b/vmware_nsx_tempest/tests/nsxv/api/README.rst
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/README.rst
rename to vmware_nsx_tempest/tests/nsxv/api/README.rst
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/__init__.py b/vmware_nsx_tempest/tests/nsxv/api/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/__init__.py
rename to vmware_nsx_tempest/tests/nsxv/api/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/base_provider.py b/vmware_nsx_tempest/tests/nsxv/api/base_provider.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/base_provider.py
rename to vmware_nsx_tempest/tests/nsxv/api/base_provider.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/__init__.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/__init__.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/base.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/base.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/base.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/base.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_health_monitors_admin.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_health_monitors_admin.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_health_monitors_admin.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/test_health_monitors_admin.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_health_monitors_non_admin.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_health_monitors_non_admin.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_health_monitors_non_admin.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/test_health_monitors_non_admin.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_l7policies_non_admin.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_l7policies_non_admin.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_l7policies_non_admin.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/test_l7policies_non_admin.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_l7rules_non_admin.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_l7rules_non_admin.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_l7rules_non_admin.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/test_l7rules_non_admin.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_listeners_admin.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_listeners_admin.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_listeners_admin.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/test_listeners_admin.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_listeners_non_admin.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_listeners_non_admin.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_listeners_non_admin.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/test_listeners_non_admin.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_load_balancers_admin.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_load_balancers_admin.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_load_balancers_admin.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/test_load_balancers_admin.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_load_balancers_non_admin.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_load_balancers_non_admin.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_load_balancers_non_admin.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/test_load_balancers_non_admin.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_members_admin.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_members_admin.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_members_admin.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/test_members_admin.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_members_non_admin.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_members_non_admin.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_members_non_admin.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/test_members_non_admin.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_pools_admin.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_pools_admin.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_pools_admin.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/test_pools_admin.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_pools_non_admin.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/test_pools_non_admin.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/lbaas/test_pools_non_admin.py
rename to vmware_nsx_tempest/tests/nsxv/api/lbaas/test_pools_non_admin.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_admin_policy.py b/vmware_nsx_tempest/tests/nsxv/api/test_admin_policy.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_admin_policy.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_admin_policy.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_dns_search_domain.py b/vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_dns_search_domain.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_dns_search_domain_negative.py b/vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain_negative.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_dns_search_domain_negative.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain_negative.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_flat_network.py b/vmware_nsx_tempest/tests/nsxv/api/test_flat_network.py
similarity index 98%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_flat_network.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_flat_network.py
index 1b73f65..d71a79c 100644
--- a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_flat_network.py
+++ b/vmware_nsx_tempest/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
-import test_subnets as SNET
+from vmware_nsx_tempest.tests.nsxv.api import test_subnets as SNET
LOG = logging.getLogger(__name__)
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_l2_gateway.py b/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_l2_gateway.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_l2_gateway_connection.py b/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_l2_gateway_connection.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_multiple_transport_zones.py b/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones.py
similarity index 99%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_multiple_transport_zones.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones.py
index 47250a2..2ef6ac7 100644
--- a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_multiple_transport_zones.py
+++ b/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones.py
@@ -15,7 +15,6 @@
import re
-import base_provider as base
import six
from tempest import config
from tempest.lib.common.utils import data_utils
@@ -24,6 +23,7 @@ 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
CONF = config.CONF
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_multiple_transport_zones_negative.py b/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones_negative.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_multiple_transport_zones_negative.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones_negative.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_port_types.py b/vmware_nsx_tempest/tests/nsxv/api/test_port_types.py
similarity index 99%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_port_types.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_port_types.py
index 4e0a555..43c13b6 100644
--- a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_port_types.py
+++ b/vmware_nsx_tempest/tests/nsxv/api/test_port_types.py
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-import base_provider as base
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib.common.utils import test_utils
@@ -22,6 +21,8 @@ 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
+
CONF = config.CONF
LOG = logging.getLogger(__name__)
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_provider_sec_group.py b/vmware_nsx_tempest/tests/nsxv/api/test_provider_sec_group.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_provider_sec_group.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_provider_sec_group.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_router_sizes.py b/vmware_nsx_tempest/tests/nsxv/api/test_router_sizes.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_router_sizes.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_router_sizes.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_router_types.py b/vmware_nsx_tempest/tests/nsxv/api/test_router_types.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_router_types.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_router_types.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_subnetpools.py b/vmware_nsx_tempest/tests/nsxv/api/test_subnetpools.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_subnetpools.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_subnetpools.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_subnets.py b/vmware_nsx_tempest/tests/nsxv/api/test_subnets.py
similarity index 99%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_subnets.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_subnets.py
index f4c864b..be27c21 100644
--- a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_subnets.py
+++ b/vmware_nsx_tempest/tests/nsxv/api/test_subnets.py
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-import base_provider as base
from tempest.common import custom_matchers
from tempest import config
@@ -24,6 +23,8 @@ 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
+
CONF = config.CONF
LOG = logging.getLogger(__name__)
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_tenant_delete.py b/vmware_nsx_tempest/tests/nsxv/api/test_tenant_delete.py
similarity index 99%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_tenant_delete.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_tenant_delete.py
index 2a99fbe..087b215 100644
--- a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_tenant_delete.py
+++ b/vmware_nsx_tempest/tests/nsxv/api/test_tenant_delete.py
@@ -16,7 +16,6 @@
import os
import subprocess
-import base_provider as base
from oslo_log import log as logging
import six
from tempest import config
@@ -24,6 +23,8 @@ 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
+
CONF = config.CONF
LOG = logging.getLogger(__name__)
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_v1_fwaas.py b/vmware_nsx_tempest/tests/nsxv/api/test_v1_fwaas.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_v1_fwaas.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_v1_fwaas.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_v1_lbaas.py b/vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_v1_lbaas.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_vlan_network.py b/vmware_nsx_tempest/tests/nsxv/api/test_vlan_network.py
similarity index 99%
rename from vmware-nsx-tempest-plugin/tests/nsxv/api/test_vlan_network.py
rename to vmware_nsx_tempest/tests/nsxv/api/test_vlan_network.py
index 4a7c395..62db635 100644
--- a/vmware-nsx-tempest-plugin/tests/nsxv/api/test_vlan_network.py
+++ b/vmware_nsx_tempest/tests/nsxv/api/test_vlan_network.py
@@ -20,7 +20,8 @@ from tempest import config
from oslo_log import log as logging
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
-import test_subnets as SNET
+
+from vmware_nsx_tempest.tests.nsxv.api import test_subnets as SNET
CONF = config.CONF
LOG = logging.getLogger(__name__)
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/__init__.py b/vmware_nsx_tempest/tests/nsxv/scenario/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/__init__.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/manager_topo_deployment.py b/vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/manager_topo_deployment.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/network_addon_methods.py b/vmware_nsx_tempest/tests/nsxv/scenario/network_addon_methods.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/network_addon_methods.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/network_addon_methods.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_admin_policy_basic_ops.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_admin_policy_basic_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_admin_policy_basic_ops.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/test_admin_policy_basic_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_deployments.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_deployments.py
similarity index 99%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_deployments.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/test_deployments.py
index 563e19e..ab384b2 100644
--- a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_deployments.py
+++ b/vmware_nsx_tempest/tests/nsxv/scenario/test_deployments.py
@@ -18,10 +18,11 @@ import time
from tempest import config
from tempest import test
-import manager_topo_deployment as dmgr
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
+from vmware_nsx_tempest.tests.nsxv.scenario \
+ import manager_topo_deployment as dmgr
CONF = config.CONF
LOG = dmgr.manager.log.getLogger(__name__)
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_dhcp_121.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_dhcp_121.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_dhcp_121.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/test_dhcp_121.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_dns_search_domain_basic_ops.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_dns_search_domain_basic_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_dns_search_domain_basic_ops.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/test_dns_search_domain_basic_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_dvr_basic_ops.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_dvr_basic_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_dvr_basic_ops.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/test_dvr_basic_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_lbaas_l7_switching_ops.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_l7_switching_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_lbaas_l7_switching_ops.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_l7_switching_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_lbaas_round_robin_ops.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_round_robin_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_lbaas_round_robin_ops.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/test_lbaas_round_robin_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_network_basic_ops.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_network_basic_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_network_basic_ops.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/test_network_basic_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_spoofguard_policy.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_spoofguard_policy.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_spoofguard_policy.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/test_spoofguard_policy.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_v1_fwaas_basic_ops.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_v1_fwaas_basic_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_v1_fwaas_basic_ops.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/test_v1_fwaas_basic_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py
similarity index 96%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py
index 9edd0cd..479b40c 100644
--- a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py
+++ b/vmware_nsx_tempest/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py
@@ -17,7 +17,9 @@ import shlex
import subprocess
import tempfile
import time
-import urllib2
+#import urllib.error
+#import urllib.parse
+#import urllib.request
import six
from tempest import config
@@ -84,7 +86,7 @@ class TestLBaaSBasicOps(manager.NetworkScenarioTest):
self._set_net_and_subnet()
def tearDown(self):
- for s_id in self.server_ips.keys():
+ for s_id in list(self.server_ips.keys()):
try:
self.servers_client.delete_server(s_id)
except Exception:
@@ -118,7 +120,7 @@ class TestLBaaSBasicOps(manager.NetworkScenarioTest):
subnets_client = self.subnets_client
router_kwargs = dict(client=routers_client, namestart=namestart)
- for k in kwargs.keys():
+ for k in list(kwargs.keys()):
if k in ('distributed', 'router_type', 'router_size'):
router_kwargs[k] = kwargs.pop(k)
router = self._create_router(**router_kwargs)
@@ -266,14 +268,18 @@ class TestLBaaSBasicOps(manager.NetworkScenarioTest):
def _check_connection(self, check_ip, port=80):
def try_connect(ip, port):
try:
- resp = urllib2.urlopen("http://{0}:{1}/".format(ip, port))
+ resp = None
+ # TODO(Puneet)
+ #resp = urllib.request.urlopen(
+ # "http://{0}:{1}/".format(ip, port))
if resp.getcode() == 200:
return True
return False
except IOError:
return False
- except urllib2.HTTPError:
- return False
+ # TODO(Puneet)
+ #except urllib.error.HTTPError:
+ # return False
timeout = CONF.validation.ping_timeout
start = time.time()
while not try_connect(check_ip, port):
@@ -401,11 +407,15 @@ class TestLBaaSBasicOps(manager.NetworkScenarioTest):
counters = dict.fromkeys(servers, 0)
for i in range(self.num):
try:
- server = urllib2.urlopen("http://{0}/".format(vip_ip)).read()
+ server = None
+ # TODO(Puneet)
+ #server = urllib.request.urlopen(
+ # "http://{0}/".format(vip_ip)).read()
counters[server] += 1
# HTTP exception means fail of server, so don't increase counter
# of success and continue connection tries
- except urllib2.HTTPError:
+ # TODO(Puneet)
+ except Exception:
continue
# Assert that each member of the pool gets balanced at least once
for member, counter in six.iteritems(counters):
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_xnet_multiple_subnets_basic_ops.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_xnet_multiple_subnets_basic_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv/scenario/test_xnet_multiple_subnets_basic_ops.py
rename to vmware_nsx_tempest/tests/nsxv/scenario/test_xnet_multiple_subnets_basic_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/README.rst b/vmware_nsx_tempest/tests/nsxv3/README.rst
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/README.rst
rename to vmware_nsx_tempest/tests/nsxv3/README.rst
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/__init__.py b/vmware_nsx_tempest/tests/nsxv3/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/__init__.py
rename to vmware_nsx_tempest/tests/nsxv3/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/api/__init__.py b/vmware_nsx_tempest/tests/nsxv3/api/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/api/__init__.py
rename to vmware_nsx_tempest/tests/nsxv3/api/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/api/test_l2_gateway.py b/vmware_nsx_tempest/tests/nsxv3/api/test_l2_gateway.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/api/test_l2_gateway.py
rename to vmware_nsx_tempest/tests/nsxv3/api/test_l2_gateway.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/api/test_native_dhcp.py b/vmware_nsx_tempest/tests/nsxv3/api/test_native_dhcp.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/api/test_native_dhcp.py
rename to vmware_nsx_tempest/tests/nsxv3/api/test_native_dhcp.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/api/test_native_dhcp_negative.py b/vmware_nsx_tempest/tests/nsxv3/api/test_native_dhcp_negative.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/api/test_native_dhcp_negative.py
rename to vmware_nsx_tempest/tests/nsxv3/api/test_native_dhcp_negative.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/api/test_nsx_floating_ip.py b/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_floating_ip.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/api/test_nsx_floating_ip.py
rename to vmware_nsx_tempest/tests/nsxv3/api/test_nsx_floating_ip.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/api/test_nsx_mac_learning.py b/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_mac_learning.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/api/test_nsx_mac_learning.py
rename to vmware_nsx_tempest/tests/nsxv3/api/test_nsx_mac_learning.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/api/test_nsx_networks.py b/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_networks.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/api/test_nsx_networks.py
rename to vmware_nsx_tempest/tests/nsxv3/api/test_nsx_networks.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/api/test_nsx_port_security.py b/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_port_security.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/api/test_nsx_port_security.py
rename to vmware_nsx_tempest/tests/nsxv3/api/test_nsx_port_security.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/api/test_nsx_routers.py b/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_routers.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/api/test_nsx_routers.py
rename to vmware_nsx_tempest/tests/nsxv3/api/test_nsx_routers.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/api/test_nsx_security_groups.py b/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_security_groups.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/api/test_nsx_security_groups.py
rename to vmware_nsx_tempest/tests/nsxv3/api/test_nsx_security_groups.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/api/test_provider_sec_group.py b/vmware_nsx_tempest/tests/nsxv3/api/test_provider_sec_group.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/api/test_provider_sec_group.py
rename to vmware_nsx_tempest/tests/nsxv3/api/test_provider_sec_group.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/scale/__init__.py b/vmware_nsx_tempest/tests/nsxv3/scale/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/scale/__init__.py
rename to vmware_nsx_tempest/tests/nsxv3/scale/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/scale/test_dhcp_uni_scale.py b/vmware_nsx_tempest/tests/nsxv3/scale/test_dhcp_uni_scale.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/scale/test_dhcp_uni_scale.py
rename to vmware_nsx_tempest/tests/nsxv3/scale/test_dhcp_uni_scale.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/scenario/__init__.py b/vmware_nsx_tempest/tests/nsxv3/scenario/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/scenario/__init__.py
rename to vmware_nsx_tempest/tests/nsxv3/scenario/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_allowed_address_pair.py b/vmware_nsx_tempest/tests/nsxv3/scenario/test_allowed_address_pair.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_allowed_address_pair.py
rename to vmware_nsx_tempest/tests/nsxv3/scenario/test_allowed_address_pair.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_client_cert_mgmt_ops.py b/vmware_nsx_tempest/tests/nsxv3/scenario/test_client_cert_mgmt_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_client_cert_mgmt_ops.py
rename to vmware_nsx_tempest/tests/nsxv3/scenario/test_client_cert_mgmt_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_l2_gateway.py b/vmware_nsx_tempest/tests/nsxv3/scenario/test_l2_gateway.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_l2_gateway.py
rename to vmware_nsx_tempest/tests/nsxv3/scenario/test_l2_gateway.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_mdproxy.py b/vmware_nsx_tempest/tests/nsxv3/scenario/test_mdproxy.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_mdproxy.py
rename to vmware_nsx_tempest/tests/nsxv3/scenario/test_mdproxy.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_multi_hv_network_ops.py b/vmware_nsx_tempest/tests/nsxv3/scenario/test_multi_hv_network_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_multi_hv_network_ops.py
rename to vmware_nsx_tempest/tests/nsxv3/scenario/test_multi_hv_network_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_multiple_networks_ops.py b/vmware_nsx_tempest/tests/nsxv3/scenario/test_multiple_networks_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_multiple_networks_ops.py
rename to vmware_nsx_tempest/tests/nsxv3/scenario/test_multiple_networks_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_nsx_port_security.py b/vmware_nsx_tempest/tests/nsxv3/scenario/test_nsx_port_security.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_nsx_port_security.py
rename to vmware_nsx_tempest/tests/nsxv3/scenario/test_nsx_port_security.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_provider_security_group.py b/vmware_nsx_tempest/tests/nsxv3/scenario/test_provider_security_group.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_provider_security_group.py
rename to vmware_nsx_tempest/tests/nsxv3/scenario/test_provider_security_group.py
diff --git a/vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_router_nonat_ops.py b/vmware_nsx_tempest/tests/nsxv3/scenario/test_router_nonat_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/nsxv3/scenario/test_router_nonat_ops.py
rename to vmware_nsx_tempest/tests/nsxv3/scenario/test_router_nonat_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/scenario/__init__.py b/vmware_nsx_tempest/tests/scenario/__init__.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/scenario/__init__.py
rename to vmware_nsx_tempest/tests/scenario/__init__.py
diff --git a/vmware-nsx-tempest-plugin/tests/scenario/manager.py b/vmware_nsx_tempest/tests/scenario/manager.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/scenario/manager.py
rename to vmware_nsx_tempest/tests/scenario/manager.py
diff --git a/vmware-nsx-tempest-plugin/tests/scenario/test_micro_segmentation_ops.py b/vmware_nsx_tempest/tests/scenario/test_micro_segmentation_ops.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/scenario/test_micro_segmentation_ops.py
rename to vmware_nsx_tempest/tests/scenario/test_micro_segmentation_ops.py
diff --git a/vmware-nsx-tempest-plugin/tests/templates/nsxt_neutron_smoke.yaml b/vmware_nsx_tempest/tests/templates/nsxt_neutron_smoke.yaml
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/templates/nsxt_neutron_smoke.yaml
rename to vmware_nsx_tempest/tests/templates/nsxt_neutron_smoke.yaml
diff --git a/vmware-nsx-tempest-plugin/tests/templates/nsxv_neutron_smoke.yaml b/vmware_nsx_tempest/tests/templates/nsxv_neutron_smoke.yaml
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/templates/nsxv_neutron_smoke.yaml
rename to vmware_nsx_tempest/tests/templates/nsxv_neutron_smoke.yaml
diff --git a/vmware-nsx-tempest-plugin/tests/test_vmware_nsx_tempest.py b/vmware_nsx_tempest/tests/test_vmware_nsx_tempest.py
similarity index 100%
rename from vmware-nsx-tempest-plugin/tests/test_vmware_nsx_tempest.py
rename to vmware_nsx_tempest/tests/test_vmware_nsx_tempest.py