diff --git a/.testr.conf b/.testr.conf index d6c25c2a08..58156958f9 100644 --- a/.testr.conf +++ b/.testr.conf @@ -1,4 +1,4 @@ [DEFAULT] -test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./vmware_nsx/neutron/tests/unit} $LISTOPT $IDOPTION +test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./vmware_nsx/tests/unit} $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/TESTING.rst b/TESTING.rst index 1d2d9fe9f4..9b3ca84f3c 100644 --- a/TESTING.rst +++ b/TESTING.rst @@ -125,13 +125,13 @@ For executing a specific test case, specify the name of the test case class separating it from the module path with a colon. For example, the following would run only the TestSubnetsV2 tests from -vmware_nsx/neutron/tests/unit/vmware/test_nsx_v_plugin.py:: +vmware_nsx/tests/unit/vmware/test_nsx_v_plugin.py:: - $ ./run_tests.sh vmware_nsx.neutron.tests.unit.vmware.test_nsx_v_plugin.TestSubnetsV2 + $ ./run_tests.sh vmware_nsx.tests.unit.vmware.test_nsx_v_plugin.TestSubnetsV2 or:: - $ tox -e py27 vmware_nsx.neutron.tests.unit.vmware.test_nsx_v_plugin.TestSubnetsV2 + $ tox -e py27 vmware_nsx.tests.unit.vmware.test_nsx_v_plugin.TestSubnetsV2 Adding more tests ~~~~~~~~~~~~~~~~~ diff --git a/run_tests.sh b/run_tests.sh index 3496ed798b..b14b82be7b 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -114,7 +114,7 @@ function run_tests { if [ "$testopts" = "" ] && [ "$testargs" = "" ]; then # Default to running all tests if specific test is not # provided. - testargs="discover ./vmware_nsx/neutron/tests" + testargs="discover ./vmware_nsx/tests" fi ${wrapper} python -m testtools.run $testopts $testargs diff --git a/tools/i18n_cfg.py b/tools/i18n_cfg.py index f722a9ec92..fbb6a6e0f3 100644 --- a/tools/i18n_cfg.py +++ b/tools/i18n_cfg.py @@ -92,4 +92,4 @@ msg_format_checkers = [ ] -file_black_list = ["./vmware_nsx/neutron/tests/unit"] +file_black_list = ["./vmware_nsx/tests/unit"] diff --git a/tox.ini b/tox.ini index 6ad0136d1f..932fb84e34 100644 --- a/tox.ini +++ b/tox.ini @@ -29,7 +29,7 @@ setenv = VIRTUAL_ENV={envdir} setenv = OS_TEST_TIMEOUT=90 deps = {[testenv]deps} - -r{toxinidir}/vmware_nsx/neutron/tests/functional/requirements.txt + -r{toxinidir}/vmware_nsx/tests/functional/requirements.txt [testenv:dsvm-functional] setenv = OS_SUDO_TESTING=1 diff --git a/vmware_nsx/neutron/tests/__init__.py b/vmware_nsx/tests/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/__init__.py rename to vmware_nsx/tests/__init__.py diff --git a/vmware_nsx/neutron/tests/functional/__init__.py b/vmware_nsx/tests/functional/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/functional/__init__.py rename to vmware_nsx/tests/functional/__init__.py diff --git a/vmware_nsx/neutron/tests/functional/db/__init__.py b/vmware_nsx/tests/functional/db/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/functional/db/__init__.py rename to vmware_nsx/tests/functional/db/__init__.py diff --git a/vmware_nsx/neutron/tests/functional/db/test_migrations.py b/vmware_nsx/tests/functional/db/test_migrations.py similarity index 100% rename from vmware_nsx/neutron/tests/functional/db/test_migrations.py rename to vmware_nsx/tests/functional/db/test_migrations.py diff --git a/vmware_nsx/neutron/tests/functional/requirements.txt b/vmware_nsx/tests/functional/requirements.txt similarity index 100% rename from vmware_nsx/neutron/tests/functional/requirements.txt rename to vmware_nsx/tests/functional/requirements.txt diff --git a/vmware_nsx/neutron/tests/unit/__init__.py b/vmware_nsx/tests/unit/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/__init__.py rename to vmware_nsx/tests/unit/__init__.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/__init__.py b/vmware_nsx/tests/unit/vmware/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/__init__.py rename to vmware_nsx/tests/unit/vmware/__init__.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/apiclient/__init__.py b/vmware_nsx/tests/unit/vmware/apiclient/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/apiclient/__init__.py rename to vmware_nsx/tests/unit/vmware/apiclient/__init__.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/apiclient/fake.py b/vmware_nsx/tests/unit/vmware/apiclient/fake.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/apiclient/fake.py rename to vmware_nsx/tests/unit/vmware/apiclient/fake.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/apiclient/test_api_common.py b/vmware_nsx/tests/unit/vmware/apiclient/test_api_common.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/apiclient/test_api_common.py rename to vmware_nsx/tests/unit/vmware/apiclient/test_api_common.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py b/vmware_nsx/tests/unit/vmware/apiclient/test_api_eventlet_request.py similarity index 98% rename from vmware_nsx/neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py rename to vmware_nsx/tests/unit/vmware/apiclient/test_api_eventlet_request.py index 087a4b99c6..f7a7123c2f 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py +++ b/vmware_nsx/tests/unit/vmware/apiclient/test_api_eventlet_request.py @@ -27,7 +27,7 @@ from vmware_nsx.neutron.plugins.vmware.api_client import ( eventlet_client as client) from vmware_nsx.neutron.plugins.vmware.api_client import ( eventlet_request as request) -from vmware_nsx.neutron.tests.unit import vmware +from vmware_nsx.tests.unit import vmware LOG = logging.getLogger(__name__) @@ -108,8 +108,8 @@ class ApiRequestEventletTest(base.BaseTestCase): def test_run_and_timeout(self): def my_handle_request(): - LOG.info('my_handle_request() self: %s' % self.req) - LOG.info('my_handle_request() dir(self): %s' % dir(self.req)) + LOG.info(_LI('my_handle_request() self: %s'), self.req) + LOG.info(_LI('my_handle_request() dir(self): %s'), dir(self.req)) eventlet.greenthread.sleep(REQUEST_TIMEOUT * 2) with mock.patch.object( @@ -331,5 +331,5 @@ class ApiRequestEventletTest(base.BaseTestCase): { "role": "api_provider", "listen_addr": "pssl:1.1.1.1:1" }]}]}""" r.successful = mock.Mock(return_value=True) - LOG.info('%s' % r.api_providers()) + LOG.info(_LI('%s'), r.api_providers()) self.assertIsNotNone(r.api_providers()) diff --git a/vmware_nsx/neutron/tests/unit/vmware/db/__init__.py b/vmware_nsx/tests/unit/vmware/db/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/db/__init__.py rename to vmware_nsx/tests/unit/vmware/db/__init__.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/db/test_lsn_db.py b/vmware_nsx/tests/unit/vmware/db/test_lsn_db.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/db/test_lsn_db.py rename to vmware_nsx/tests/unit/vmware/db/test_lsn_db.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/db/test_nsx_db.py b/vmware_nsx/tests/unit/vmware/db/test_nsx_db.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/db/test_nsx_db.py rename to vmware_nsx/tests/unit/vmware/db/test_nsx_db.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_gwservice.json b/vmware_nsx/tests/unit/vmware/etc/fake_get_gwservice.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_gwservice.json rename to vmware_nsx/tests/unit/vmware/etc/fake_get_gwservice.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lqueue.json b/vmware_nsx/tests/unit/vmware/etc/fake_get_lqueue.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lqueue.json rename to vmware_nsx/tests/unit/vmware/etc/fake_get_lqueue.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lrouter.json b/vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lrouter.json rename to vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lrouter_lport.json b/vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter_lport.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lrouter_lport.json rename to vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter_lport.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lrouter_lport_att.json b/vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter_lport_att.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lrouter_lport_att.json rename to vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter_lport_att.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lrouter_nat.json b/vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter_nat.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lrouter_nat.json rename to vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter_nat.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lswitch.json b/vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lswitch.json rename to vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lswitch_lport.json b/vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch_lport.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lswitch_lport.json rename to vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch_lport.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lswitch_lport_att.json b/vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch_lport_att.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lswitch_lport_att.json rename to vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch_lport_att.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lswitch_lport_status.json b/vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch_lport_status.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lswitch_lport_status.json rename to vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch_lport_status.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_security_profile.json b/vmware_nsx/tests/unit/vmware/etc/fake_get_security_profile.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_security_profile.json rename to vmware_nsx/tests/unit/vmware/etc/fake_get_security_profile.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_gwservice.json b/vmware_nsx/tests/unit/vmware/etc/fake_post_gwservice.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_gwservice.json rename to vmware_nsx/tests/unit/vmware/etc/fake_post_gwservice.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lqueue.json b/vmware_nsx/tests/unit/vmware/etc/fake_post_lqueue.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lqueue.json rename to vmware_nsx/tests/unit/vmware/etc/fake_post_lqueue.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lrouter.json b/vmware_nsx/tests/unit/vmware/etc/fake_post_lrouter.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lrouter.json rename to vmware_nsx/tests/unit/vmware/etc/fake_post_lrouter.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lrouter_lport.json b/vmware_nsx/tests/unit/vmware/etc/fake_post_lrouter_lport.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lrouter_lport.json rename to vmware_nsx/tests/unit/vmware/etc/fake_post_lrouter_lport.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lrouter_nat.json b/vmware_nsx/tests/unit/vmware/etc/fake_post_lrouter_nat.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lrouter_nat.json rename to vmware_nsx/tests/unit/vmware/etc/fake_post_lrouter_nat.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lswitch.json b/vmware_nsx/tests/unit/vmware/etc/fake_post_lswitch.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lswitch.json rename to vmware_nsx/tests/unit/vmware/etc/fake_post_lswitch.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lswitch_lport.json b/vmware_nsx/tests/unit/vmware/etc/fake_post_lswitch_lport.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lswitch_lport.json rename to vmware_nsx/tests/unit/vmware/etc/fake_post_lswitch_lport.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_security_profile.json b/vmware_nsx/tests/unit/vmware/etc/fake_post_security_profile.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_security_profile.json rename to vmware_nsx/tests/unit/vmware/etc/fake_post_security_profile.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_put_lrouter_lport_att.json b/vmware_nsx/tests/unit/vmware/etc/fake_put_lrouter_lport_att.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_put_lrouter_lport_att.json rename to vmware_nsx/tests/unit/vmware/etc/fake_put_lrouter_lport_att.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/fake_put_lswitch_lport_att.json b/vmware_nsx/tests/unit/vmware/etc/fake_put_lswitch_lport_att.json similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/fake_put_lswitch_lport_att.json rename to vmware_nsx/tests/unit/vmware/etc/fake_put_lswitch_lport_att.json diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/neutron.conf.test b/vmware_nsx/tests/unit/vmware/etc/neutron.conf.test similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/neutron.conf.test rename to vmware_nsx/tests/unit/vmware/etc/neutron.conf.test diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.agentless.test b/vmware_nsx/tests/unit/vmware/etc/nsx.ini.agentless.test similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.agentless.test rename to vmware_nsx/tests/unit/vmware/etc/nsx.ini.agentless.test diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.basic.test b/vmware_nsx/tests/unit/vmware/etc/nsx.ini.basic.test similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.basic.test rename to vmware_nsx/tests/unit/vmware/etc/nsx.ini.basic.test diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.combined.test b/vmware_nsx/tests/unit/vmware/etc/nsx.ini.combined.test similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.combined.test rename to vmware_nsx/tests/unit/vmware/etc/nsx.ini.combined.test diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.full.test b/vmware_nsx/tests/unit/vmware/etc/nsx.ini.full.test similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.full.test rename to vmware_nsx/tests/unit/vmware/etc/nsx.ini.full.test diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.test b/vmware_nsx/tests/unit/vmware/etc/nsx.ini.test similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.test rename to vmware_nsx/tests/unit/vmware/etc/nsx.ini.test diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/nvp.ini.full.test b/vmware_nsx/tests/unit/vmware/etc/nvp.ini.full.test similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/nvp.ini.full.test rename to vmware_nsx/tests/unit/vmware/etc/nvp.ini.full.test diff --git a/vmware_nsx/neutron/tests/unit/vmware/etc/vcns.ini.test b/vmware_nsx/tests/unit/vmware/etc/vcns.ini.test similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/etc/vcns.ini.test rename to vmware_nsx/tests/unit/vmware/etc/vcns.ini.test diff --git a/vmware_nsx/neutron/tests/unit/vmware/extensions/__init__.py b/vmware_nsx/tests/unit/vmware/extensions/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/extensions/__init__.py rename to vmware_nsx/tests/unit/vmware/extensions/__init__.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_addresspairs.py b/vmware_nsx/tests/unit/vmware/extensions/test_addresspairs.py similarity index 95% rename from vmware_nsx/neutron/tests/unit/vmware/extensions/test_addresspairs.py rename to vmware_nsx/tests/unit/vmware/extensions/test_addresspairs.py index 9dfe55add4..8085e3dc57 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_addresspairs.py +++ b/vmware_nsx/tests/unit/vmware/extensions/test_addresspairs.py @@ -16,7 +16,7 @@ from neutron.extensions import allowedaddresspairs as addr_pair from neutron.tests.unit.db import test_allowedaddresspairs_db as ext_pairs -from vmware_nsx.neutron.tests.unit.vmware import test_nsx_plugin +from vmware_nsx.tests.unit.vmware import test_nsx_plugin class TestAllowedAddressPairs(test_nsx_plugin.NsxPluginV2TestCase, diff --git a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_maclearning.py b/vmware_nsx/tests/unit/vmware/extensions/test_maclearning.py similarity index 97% rename from vmware_nsx/neutron/tests/unit/vmware/extensions/test_maclearning.py rename to vmware_nsx/tests/unit/vmware/extensions/test_maclearning.py index 5176572131..12ecf0f948 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_maclearning.py +++ b/vmware_nsx/tests/unit/vmware/extensions/test_maclearning.py @@ -23,9 +23,9 @@ import six from vmware_nsx.neutron.plugins.vmware.api_client import version from vmware_nsx.neutron.plugins.vmware.common import sync -from vmware_nsx.neutron.tests.unit import vmware -from vmware_nsx.neutron.tests.unit.vmware.apiclient import fake -from vmware_nsx.neutron.tests.unit.vmware import test_utils +from vmware_nsx.tests.unit import vmware +from vmware_nsx.tests.unit.vmware.apiclient import fake +from vmware_nsx.tests.unit.vmware import test_utils class MacLearningExtensionManager(object): diff --git a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_networkgw.py b/vmware_nsx/tests/unit/vmware/extensions/test_networkgw.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/extensions/test_networkgw.py rename to vmware_nsx/tests/unit/vmware/extensions/test_networkgw.py index b7170c8225..dc12b1b893 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_networkgw.py +++ b/vmware_nsx/tests/unit/vmware/extensions/test_networkgw.py @@ -38,8 +38,8 @@ from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models from vmware_nsx.neutron.plugins.vmware.extensions import networkgw from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx.neutron.plugins.vmware.nsxlib import l2gateway as l2gwlib -from vmware_nsx.neutron.tests.unit import vmware -from vmware_nsx.neutron.tests.unit.vmware import test_nsx_plugin +from vmware_nsx.tests.unit import vmware +from vmware_nsx.tests.unit.vmware import test_nsx_plugin _uuid = test_base._uuid _get_path = test_base._get_path diff --git a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_portsecurity.py b/vmware_nsx/tests/unit/vmware/extensions/test_portsecurity.py similarity index 90% rename from vmware_nsx/neutron/tests/unit/vmware/extensions/test_portsecurity.py rename to vmware_nsx/tests/unit/vmware/extensions/test_portsecurity.py index 743fca8206..69ec314e70 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_portsecurity.py +++ b/vmware_nsx/tests/unit/vmware/extensions/test_portsecurity.py @@ -17,9 +17,9 @@ import mock from neutron.tests.unit.extensions import test_portsecurity as psec from vmware_nsx.neutron.plugins.vmware.common import sync -from vmware_nsx.neutron.tests.unit import vmware -from vmware_nsx.neutron.tests.unit.vmware.apiclient import fake -from vmware_nsx.neutron.tests.unit.vmware import test_utils +from vmware_nsx.tests.unit import vmware +from vmware_nsx.tests.unit.vmware.apiclient import fake +from vmware_nsx.tests.unit.vmware import test_utils class PortSecurityTestCase(psec.PortSecurityDBTestCase): diff --git a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_providernet.py b/vmware_nsx/tests/unit/vmware/extensions/test_providernet.py similarity index 98% rename from vmware_nsx/neutron/tests/unit/vmware/extensions/test_providernet.py rename to vmware_nsx/tests/unit/vmware/extensions/test_providernet.py index 7c9380033d..b23c78df58 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_providernet.py +++ b/vmware_nsx/tests/unit/vmware/extensions/test_providernet.py @@ -18,8 +18,8 @@ import webob.exc from neutron.extensions import multiprovidernet as mpnet from neutron.extensions import providernet as pnet -from vmware_nsx.neutron.tests.unit import vmware -from vmware_nsx.neutron.tests.unit.vmware import test_nsx_plugin +from vmware_nsx.tests.unit import vmware +from vmware_nsx.tests.unit.vmware import test_nsx_plugin class TestProvidernet(test_nsx_plugin.NsxPluginV2TestCase): diff --git a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_qosqueues.py b/vmware_nsx/tests/unit/vmware/extensions/test_qosqueues.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/extensions/test_qosqueues.py rename to vmware_nsx/tests/unit/vmware/extensions/test_qosqueues.py index e0c8fca474..a0d4f1818b 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_qosqueues.py +++ b/vmware_nsx/tests/unit/vmware/extensions/test_qosqueues.py @@ -24,8 +24,8 @@ from neutron.tests.unit.api import test_extensions from vmware_nsx.neutron.plugins.vmware.dbexts import qos_db from vmware_nsx.neutron.plugins.vmware.extensions import qos as ext_qos from vmware_nsx.neutron.plugins.vmware import nsxlib -from vmware_nsx.neutron.tests.unit import vmware -from vmware_nsx.neutron.tests.unit.vmware import test_nsx_plugin +from vmware_nsx.tests.unit import vmware +from vmware_nsx.tests.unit.vmware import test_nsx_plugin class QoSTestExtensionManager(object): diff --git a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_vnic_index.py b/vmware_nsx/tests/unit/vmware/extensions/test_vnic_index.py similarity index 97% rename from vmware_nsx/neutron/tests/unit/vmware/extensions/test_vnic_index.py rename to vmware_nsx/tests/unit/vmware/extensions/test_vnic_index.py index 3cfe679ecb..44bc05f246 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_vnic_index.py +++ b/vmware_nsx/tests/unit/vmware/extensions/test_vnic_index.py @@ -24,10 +24,10 @@ from neutron import manager from neutron.tests.unit.db import test_db_base_plugin_v2 as test_db_plugin from vmware_nsx.neutron.plugins.vmware.dbexts import vnic_index_db from vmware_nsx.neutron.plugins.vmware.extensions import vnicindex as vnicidx -from vmware_nsx.neutron.tests.unit import vmware +from vmware_nsx.tests.unit import vmware -DB_PLUGIN_KLASS = ('vmware_nsx.neutron.tests.unit.vmware.extensions.' +DB_PLUGIN_KLASS = ('vmware_nsx.tests.unit.vmware.extensions.' 'test_vnic_index.VnicIndexTestPlugin') _uuid = uuidutils.generate_uuid diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsx_v/__init__.py b/vmware_nsx/tests/unit/vmware/nsx_v/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/nsx_v/__init__.py rename to vmware_nsx/tests/unit/vmware/nsx_v/__init__.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsx_v/test_edge_loadbalancer_driver.py b/vmware_nsx/tests/unit/vmware/nsx_v/test_edge_loadbalancer_driver.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/nsx_v/test_edge_loadbalancer_driver.py rename to vmware_nsx/tests/unit/vmware/nsx_v/test_edge_loadbalancer_driver.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsx_v/test_nsxv_loadbalancer.py b/vmware_nsx/tests/unit/vmware/nsx_v/test_nsxv_loadbalancer.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/nsx_v/test_nsxv_loadbalancer.py rename to vmware_nsx/tests/unit/vmware/nsx_v/test_nsxv_loadbalancer.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsx_v3_mocks.py b/vmware_nsx/tests/unit/vmware/nsx_v3_mocks.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/nsx_v3_mocks.py rename to vmware_nsx/tests/unit/vmware/nsx_v3_mocks.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/__init__.py b/vmware_nsx/tests/unit/vmware/nsxlib/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/__init__.py rename to vmware_nsx/tests/unit/vmware/nsxlib/__init__.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/base.py b/vmware_nsx/tests/unit/vmware/nsxlib/base.py similarity index 96% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/base.py rename to vmware_nsx/tests/unit/vmware/nsxlib/base.py index 8d1b2a84fe..48b9958286 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/base.py +++ b/vmware_nsx/tests/unit/vmware/nsxlib/base.py @@ -23,8 +23,8 @@ from vmware_nsx.neutron.plugins.vmware.api_client import exception from vmware_nsx.neutron.plugins.vmware.api_client import version from vmware_nsx.neutron.plugins.vmware.common import config # noqa from vmware_nsx.neutron.plugins.vmware import nsx_cluster as cluster -from vmware_nsx.neutron.tests.unit import vmware -from vmware_nsx.neutron.tests.unit.vmware.apiclient import fake +from vmware_nsx.tests.unit import vmware +from vmware_nsx.tests.unit.vmware.apiclient import fake _uuid = test_base._uuid diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_l2gateway.py b/vmware_nsx/tests/unit/vmware/nsxlib/test_l2gateway.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_l2gateway.py rename to vmware_nsx/tests/unit/vmware/nsxlib/test_l2gateway.py index 1fd6af7e03..3df6938e0c 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_l2gateway.py +++ b/vmware_nsx/tests/unit/vmware/nsxlib/test_l2gateway.py @@ -24,7 +24,7 @@ from vmware_nsx.neutron.plugins.vmware.common import utils as nsx_utils from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx.neutron.plugins.vmware.nsxlib import l2gateway as l2gwlib from vmware_nsx.neutron.plugins.vmware.nsxlib import switch as switchlib -from vmware_nsx.neutron.tests.unit.vmware.nsxlib import base +from vmware_nsx.tests.unit.vmware.nsxlib import base _uuid = test_base._uuid diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_lsn.py b/vmware_nsx/tests/unit/vmware/nsxlib/test_lsn.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_lsn.py rename to vmware_nsx/tests/unit/vmware/nsxlib/test_lsn.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_queue.py b/vmware_nsx/tests/unit/vmware/nsxlib/test_queue.py similarity index 97% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_queue.py rename to vmware_nsx/tests/unit/vmware/nsxlib/test_queue.py index d31106eef9..552484f74e 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_queue.py +++ b/vmware_nsx/tests/unit/vmware/nsxlib/test_queue.py @@ -20,7 +20,7 @@ from neutron.common import exceptions from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx.neutron.plugins.vmware.nsxlib import queue as queuelib -from vmware_nsx.neutron.tests.unit.vmware.nsxlib import base +from vmware_nsx.tests.unit.vmware.nsxlib import base class TestLogicalQueueLib(base.NsxlibTestCase): diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_router.py b/vmware_nsx/tests/unit/vmware/nsxlib/test_router.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_router.py rename to vmware_nsx/tests/unit/vmware/nsxlib/test_router.py index 6eb6c0cab6..b3225de7aa 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_router.py +++ b/vmware_nsx/tests/unit/vmware/nsxlib/test_router.py @@ -27,7 +27,7 @@ from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx.neutron.plugins.vmware.nsxlib import router as routerlib from vmware_nsx.neutron.plugins.vmware.nsxlib import switch as switchlib -from vmware_nsx.neutron.tests.unit.vmware.nsxlib import base +from vmware_nsx.tests.unit.vmware.nsxlib import base _uuid = test_base._uuid diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_secgroup.py b/vmware_nsx/tests/unit/vmware/nsxlib/test_secgroup.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_secgroup.py rename to vmware_nsx/tests/unit/vmware/nsxlib/test_secgroup.py index 251d644b2c..e049e72291 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_secgroup.py +++ b/vmware_nsx/tests/unit/vmware/nsxlib/test_secgroup.py @@ -20,7 +20,7 @@ from neutron.tests.unit.api.v2 import test_base from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx.neutron.plugins.vmware.nsxlib import secgroup as secgrouplib -from vmware_nsx.neutron.tests.unit.vmware.nsxlib import base +from vmware_nsx.tests.unit.vmware.nsxlib import base _uuid = test_base._uuid diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_switch.py b/vmware_nsx/tests/unit/vmware/nsxlib/test_switch.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_switch.py rename to vmware_nsx/tests/unit/vmware/nsxlib/test_switch.py index 015ad9f9b6..7766dceb94 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_switch.py +++ b/vmware_nsx/tests/unit/vmware/nsxlib/test_switch.py @@ -23,7 +23,7 @@ from neutron.tests.unit.api.v2 import test_base from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.neutron.plugins.vmware.nsxlib import switch as switchlib -from vmware_nsx.neutron.tests.unit.vmware.nsxlib import base +from vmware_nsx.tests.unit.vmware.nsxlib import base _uuid = test_base._uuid diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_versioning.py b/vmware_nsx/tests/unit/vmware/nsxlib/test_versioning.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_versioning.py rename to vmware_nsx/tests/unit/vmware/nsxlib/test_versioning.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/__init__.py b/vmware_nsx/tests/unit/vmware/nsxlib/v3/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/__init__.py rename to vmware_nsx/tests/unit/vmware/nsxlib/v3/__init__.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/nsxlib_testcase.py b/vmware_nsx/tests/unit/vmware/nsxlib/v3/nsxlib_testcase.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/nsxlib_testcase.py rename to vmware_nsx/tests/unit/vmware/nsxlib/v3/nsxlib_testcase.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/test_port.py b/vmware_nsx/tests/unit/vmware/nsxlib/v3/test_port.py similarity index 94% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/test_port.py rename to vmware_nsx/tests/unit/vmware/nsxlib/v3/test_port.py index 2202e1421d..7b7b9d43a3 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/test_port.py +++ b/vmware_nsx/tests/unit/vmware/nsxlib/v3/test_port.py @@ -19,8 +19,8 @@ import mock from oslo_log import log from vmware_nsx.neutron.plugins.vmware.nsxlib import v3 as nsxlib -from vmware_nsx.neutron.tests.unit.vmware.nsxlib.v3 import nsxlib_testcase -from vmware_nsx.neutron.tests.unit.vmware import test_constants_v3 +from vmware_nsx.tests.unit.vmware.nsxlib.v3 import nsxlib_testcase +from vmware_nsx.tests.unit.vmware import test_constants_v3 LOG = log.getLogger(__name__) diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/test_qos_switching_profile.py b/vmware_nsx/tests/unit/vmware/nsxlib/v3/test_qos_switching_profile.py similarity index 95% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/test_qos_switching_profile.py rename to vmware_nsx/tests/unit/vmware/nsxlib/v3/test_qos_switching_profile.py index 73d6d61267..301a26e452 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/test_qos_switching_profile.py +++ b/vmware_nsx/tests/unit/vmware/nsxlib/v3/test_qos_switching_profile.py @@ -19,8 +19,8 @@ import mock from oslo_log import log from vmware_nsx.neutron.plugins.vmware.nsxlib import v3 as nsxlib -from vmware_nsx.neutron.tests.unit.vmware.nsxlib.v3 import nsxlib_testcase -from vmware_nsx.neutron.tests.unit.vmware import test_constants_v3 +from vmware_nsx.tests.unit.vmware.nsxlib.v3 import nsxlib_testcase +from vmware_nsx.tests.unit.vmware import test_constants_v3 LOG = log.getLogger(__name__) diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/test_switch.py b/vmware_nsx/tests/unit/vmware/nsxlib/v3/test_switch.py similarity index 95% rename from vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/test_switch.py rename to vmware_nsx/tests/unit/vmware/nsxlib/v3/test_switch.py index f3ea54f5ae..4141d1ab8f 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/test_switch.py +++ b/vmware_nsx/tests/unit/vmware/nsxlib/v3/test_switch.py @@ -21,8 +21,8 @@ from oslo_utils import uuidutils from vmware_nsx.neutron.plugins.vmware.common import nsx_constants from vmware_nsx.neutron.plugins.vmware.nsxlib import v3 as nsxlib -from vmware_nsx.neutron.tests.unit.vmware import nsx_v3_mocks -from vmware_nsx.neutron.tests.unit.vmware.nsxlib.v3 import nsxlib_testcase +from vmware_nsx.tests.unit.vmware import nsx_v3_mocks +from vmware_nsx.tests.unit.vmware.nsxlib.v3 import nsxlib_testcase LOG = log.getLogger(__name__) diff --git a/vmware_nsx/neutron/tests/unit/vmware/services/__init__.py b/vmware_nsx/tests/unit/vmware/services/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/services/__init__.py rename to vmware_nsx/tests/unit/vmware/services/__init__.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/services/l2gateway/__init__.py b/vmware_nsx/tests/unit/vmware/services/l2gateway/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/services/l2gateway/__init__.py rename to vmware_nsx/tests/unit/vmware/services/l2gateway/__init__.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/services/l2gateway/test_nsxv3_driver.py b/vmware_nsx/tests/unit/vmware/services/l2gateway/test_nsxv3_driver.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/services/l2gateway/test_nsxv3_driver.py rename to vmware_nsx/tests/unit/vmware/services/l2gateway/test_nsxv3_driver.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_agent_scheduler.py b/vmware_nsx/tests/unit/vmware/test_agent_scheduler.py similarity index 93% rename from vmware_nsx/neutron/tests/unit/vmware/test_agent_scheduler.py rename to vmware_nsx/tests/unit/vmware/test_agent_scheduler.py index 9f2645bcf3..dc431ec657 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/test_agent_scheduler.py +++ b/vmware_nsx/tests/unit/vmware/test_agent_scheduler.py @@ -21,9 +21,9 @@ from neutron.tests.unit.db import test_agentschedulers_db # noqa from vmware_nsx.neutron.plugins.vmware.common import sync from vmware_nsx.neutron.plugins.vmware.dhcp_meta import rpc -from vmware_nsx.neutron.tests.unit import vmware -from vmware_nsx.neutron.tests.unit.vmware.apiclient import fake -from vmware_nsx.neutron.tests.unit.vmware import test_utils +from vmware_nsx.tests.unit import vmware +from vmware_nsx.tests.unit.vmware.apiclient import fake +from vmware_nsx.tests.unit.vmware import test_utils class DhcpAgentNotifierTestCase( diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_constants_v3.py b/vmware_nsx/tests/unit/vmware/test_constants_v3.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/test_constants_v3.py rename to vmware_nsx/tests/unit/vmware/test_constants_v3.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_dhcpmeta.py b/vmware_nsx/tests/unit/vmware/test_dhcpmeta.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/test_dhcpmeta.py rename to vmware_nsx/tests/unit/vmware/test_dhcpmeta.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_dvs.py b/vmware_nsx/tests/unit/vmware/test_dvs.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/test_dvs.py rename to vmware_nsx/tests/unit/vmware/test_dvs.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_dvs_utils.py b/vmware_nsx/tests/unit/vmware/test_dvs_utils.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/test_dvs_utils.py rename to vmware_nsx/tests/unit/vmware/test_dvs_utils.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_misc.py b/vmware_nsx/tests/unit/vmware/test_nsx_misc.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/test_nsx_misc.py rename to vmware_nsx/tests/unit/vmware/test_nsx_misc.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_opts.py b/vmware_nsx/tests/unit/vmware/test_nsx_opts.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/test_nsx_opts.py rename to vmware_nsx/tests/unit/vmware/test_nsx_opts.py index 05b9082b7d..23c5ef7d70 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_opts.py +++ b/vmware_nsx/tests/unit/vmware/test_nsx_opts.py @@ -29,7 +29,7 @@ from vmware_nsx.neutron.plugins.vmware.common import exceptions from vmware_nsx.neutron.plugins.vmware.common import sync from vmware_nsx.neutron.plugins.vmware import nsx_cluster from vmware_nsx.neutron.plugins.vmware.nsxlib import lsn as lsnlib -from vmware_nsx.neutron.tests.unit import vmware +from vmware_nsx.tests.unit import vmware BASE_CONF_PATH = vmware.get_fake_conf('neutron.conf.test') NSX_INI_PATH = vmware.get_fake_conf('nsx.ini.basic.test') diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_parent_tag.py b/vmware_nsx/tests/unit/vmware/test_nsx_parent_tag.py similarity index 97% rename from vmware_nsx/neutron/tests/unit/vmware/test_nsx_parent_tag.py rename to vmware_nsx/tests/unit/vmware/test_nsx_parent_tag.py index 66cfd61b7d..6d90ece979 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_parent_tag.py +++ b/vmware_nsx/tests/unit/vmware/test_nsx_parent_tag.py @@ -16,7 +16,7 @@ from neutron.extensions import portbindings as pbin -from vmware_nsx.neutron.tests.unit.vmware import test_nsx_v3_plugin +from vmware_nsx.tests.unit.vmware import test_nsx_v3_plugin class TestParentTagPortBinding(test_nsx_v3_plugin.NsxPluginV3TestCase): diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_plugin.py b/vmware_nsx/tests/unit/vmware/test_nsx_plugin.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/test_nsx_plugin.py rename to vmware_nsx/tests/unit/vmware/test_nsx_plugin.py index 3120fb141e..0f3ba9eced 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_plugin.py +++ b/vmware_nsx/tests/unit/vmware/test_nsx_plugin.py @@ -51,9 +51,9 @@ from vmware_nsx.neutron.plugins.vmware.common import sync from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db from vmware_nsx.neutron.plugins.vmware import nsxlib -from vmware_nsx.neutron.tests.unit import vmware -from vmware_nsx.neutron.tests.unit.vmware.apiclient import fake -from vmware_nsx.neutron.tests.unit.vmware import test_utils +from vmware_nsx.tests.unit import vmware +from vmware_nsx.tests.unit.vmware.apiclient import fake +from vmware_nsx.tests.unit.vmware import test_utils LOG = log.getLogger(__name__) diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_sync.py b/vmware_nsx/tests/unit/vmware/test_nsx_sync.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/test_nsx_sync.py rename to vmware_nsx/tests/unit/vmware/test_nsx_sync.py index fce30c5be0..ea0d1f1afc 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_sync.py +++ b/vmware_nsx/tests/unit/vmware/test_nsx_sync.py @@ -39,8 +39,8 @@ from vmware_nsx.neutron.plugins.vmware.dbexts import db from vmware_nsx.neutron.plugins.vmware import nsx_cluster as cluster from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx.neutron.plugins.vmware import plugin -from vmware_nsx.neutron.tests.unit import vmware -from vmware_nsx.neutron.tests.unit.vmware.apiclient import fake +from vmware_nsx.tests.unit import vmware +from vmware_nsx.tests.unit.vmware.apiclient import fake LOG = log.getLogger(__name__) diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_utils.py b/vmware_nsx/tests/unit/vmware/test_nsx_utils.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/test_nsx_utils.py rename to vmware_nsx/tests/unit/vmware/test_nsx_utils.py index 49a22bdbb3..4b138e8004 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_utils.py +++ b/vmware_nsx/tests/unit/vmware/test_nsx_utils.py @@ -26,8 +26,8 @@ from vmware_nsx.neutron.plugins.vmware.common import nsx_utils from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models from vmware_nsx.neutron.plugins.vmware import nsxlib -from vmware_nsx.neutron.tests.unit import vmware -from vmware_nsx.neutron.tests.unit.vmware.nsxlib import base as nsx_base +from vmware_nsx.tests.unit import vmware +from vmware_nsx.tests.unit.vmware.nsxlib import base as nsx_base class NsxUtilsTestCase(base.BaseTestCase): diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_v3_plugin.py b/vmware_nsx/tests/unit/vmware/test_nsx_v3_plugin.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/test_nsx_v3_plugin.py rename to vmware_nsx/tests/unit/vmware/test_nsx_v3_plugin.py index ace2e70f71..47e5642580 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_v3_plugin.py +++ b/vmware_nsx/tests/unit/vmware/test_nsx_v3_plugin.py @@ -36,8 +36,8 @@ from neutron import version from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.neutron.plugins.vmware.nsxlib import v3 as nsxlib from vmware_nsx.neutron.plugins.vmware.nsxlib.v3 import dfw_api as firewall -from vmware_nsx.neutron.tests.unit import vmware -from vmware_nsx.neutron.tests.unit.vmware import nsx_v3_mocks +from vmware_nsx.tests.unit import vmware +from vmware_nsx.tests.unit.vmware import nsx_v3_mocks PLUGIN_NAME = ('vmware_nsx.neutron.plugins.vmware.' 'plugins.nsx_v3_plugin.NsxV3Plugin') diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_v_plugin.py b/vmware_nsx/tests/unit/vmware/test_nsx_v_plugin.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/test_nsx_v_plugin.py rename to vmware_nsx/tests/unit/vmware/test_nsx_v_plugin.py index 23f7734eb5..b3e7ddb590 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_v_plugin.py +++ b/vmware_nsx/tests/unit/vmware/test_nsx_v_plugin.py @@ -54,10 +54,10 @@ from vmware_nsx.neutron.plugins.vmware.extensions import ( from vmware_nsx.neutron.plugins.vmware.vshield.common import ( constants as vcns_const) from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils -from vmware_nsx.neutron.tests.unit import vmware -from vmware_nsx.neutron.tests.unit.vmware.extensions import test_vnic_index -from vmware_nsx.neutron.tests.unit.vmware import test_utils -from vmware_nsx.neutron.tests.unit.vmware.vshield import fake_vcns +from vmware_nsx.tests.unit import vmware +from vmware_nsx.tests.unit.vmware.extensions import test_vnic_index +from vmware_nsx.tests.unit.vmware import test_utils +from vmware_nsx.tests.unit.vmware.vshield import fake_vcns PLUGIN_NAME = 'vmware_nsx.neutron.plugins.vmware.plugin.NsxVPlugin' diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_utils.py b/vmware_nsx/tests/unit/vmware/test_utils.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/test_utils.py rename to vmware_nsx/tests/unit/vmware/test_utils.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/vshield/__init__.py b/vmware_nsx/tests/unit/vmware/vshield/__init__.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/vshield/__init__.py rename to vmware_nsx/tests/unit/vmware/vshield/__init__.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/vshield/fake_vcns.py b/vmware_nsx/tests/unit/vmware/vshield/fake_vcns.py similarity index 100% rename from vmware_nsx/neutron/tests/unit/vmware/vshield/fake_vcns.py rename to vmware_nsx/tests/unit/vmware/vshield/fake_vcns.py diff --git a/vmware_nsx/neutron/tests/unit/vmware/vshield/test_edge_utils.py b/vmware_nsx/tests/unit/vmware/vshield/test_edge_utils.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/vshield/test_edge_utils.py rename to vmware_nsx/tests/unit/vmware/vshield/test_edge_utils.py index 785718d037..6289a5820f 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/vshield/test_edge_utils.py +++ b/vmware_nsx/tests/unit/vmware/vshield/test_edge_utils.py @@ -27,7 +27,7 @@ from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db from vmware_nsx.neutron.plugins.vmware.vshield.common import ( constants as vcns_const) from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils -from vmware_nsx.neutron.tests.unit import vmware +from vmware_nsx.tests.unit import vmware _uuid = uuidutils.generate_uuid diff --git a/vmware_nsx/neutron/tests/unit/vmware/vshield/test_vcns_driver.py b/vmware_nsx/tests/unit/vmware/vshield/test_vcns_driver.py similarity index 99% rename from vmware_nsx/neutron/tests/unit/vmware/vshield/test_vcns_driver.py rename to vmware_nsx/tests/unit/vmware/vshield/test_vcns_driver.py index 2810a85dee..e3c750dec8 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/vshield/test_vcns_driver.py +++ b/vmware_nsx/tests/unit/vmware/vshield/test_vcns_driver.py @@ -25,8 +25,8 @@ from vmware_nsx.neutron.plugins.vmware.vshield.tasks import ( constants as ts_const) from vmware_nsx.neutron.plugins.vmware.vshield.tasks import tasks as ts from vmware_nsx.neutron.plugins.vmware.vshield import vcns_driver -from vmware_nsx.neutron.tests.unit import vmware -from vmware_nsx.neutron.tests.unit.vmware.vshield import fake_vcns +from vmware_nsx.tests.unit import vmware +from vmware_nsx.tests.unit.vmware.vshield import fake_vcns VCNS_CONFIG_FILE = vmware.get_fake_conf("vcns.ini.test")