Browse Source

Move vmware_nsx/neutron/tests to vmware_nsx/tests

This is part of new vmware_nsx directory structure proposed in
https://goo.gl/GdWXyH.

Change-Id: I86262470a03c520bf8fe0f5129d940107701004f
changes/73/223373/1
Shih-Hao Li 6 years ago
parent
commit
8918b10b67
  1. 2
      .testr.conf
  2. 6
      TESTING.rst
  3. 2
      run_tests.sh
  4. 2
      tools/i18n_cfg.py
  5. 2
      tox.ini
  6. 0
      vmware_nsx/tests/__init__.py
  7. 0
      vmware_nsx/tests/functional/__init__.py
  8. 0
      vmware_nsx/tests/functional/db/__init__.py
  9. 0
      vmware_nsx/tests/functional/db/test_migrations.py
  10. 0
      vmware_nsx/tests/functional/requirements.txt
  11. 0
      vmware_nsx/tests/unit/__init__.py
  12. 0
      vmware_nsx/tests/unit/vmware/__init__.py
  13. 0
      vmware_nsx/tests/unit/vmware/apiclient/__init__.py
  14. 0
      vmware_nsx/tests/unit/vmware/apiclient/fake.py
  15. 0
      vmware_nsx/tests/unit/vmware/apiclient/test_api_common.py
  16. 8
      vmware_nsx/tests/unit/vmware/apiclient/test_api_eventlet_request.py
  17. 0
      vmware_nsx/tests/unit/vmware/db/__init__.py
  18. 0
      vmware_nsx/tests/unit/vmware/db/test_lsn_db.py
  19. 0
      vmware_nsx/tests/unit/vmware/db/test_nsx_db.py
  20. 0
      vmware_nsx/tests/unit/vmware/etc/fake_get_gwservice.json
  21. 0
      vmware_nsx/tests/unit/vmware/etc/fake_get_lqueue.json
  22. 0
      vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter.json
  23. 0
      vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter_lport.json
  24. 0
      vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter_lport_att.json
  25. 0
      vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter_nat.json
  26. 0
      vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch.json
  27. 0
      vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch_lport.json
  28. 0
      vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch_lport_att.json
  29. 0
      vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch_lport_status.json
  30. 0
      vmware_nsx/tests/unit/vmware/etc/fake_get_security_profile.json
  31. 0
      vmware_nsx/tests/unit/vmware/etc/fake_post_gwservice.json
  32. 0
      vmware_nsx/tests/unit/vmware/etc/fake_post_lqueue.json
  33. 0
      vmware_nsx/tests/unit/vmware/etc/fake_post_lrouter.json
  34. 0
      vmware_nsx/tests/unit/vmware/etc/fake_post_lrouter_lport.json
  35. 0
      vmware_nsx/tests/unit/vmware/etc/fake_post_lrouter_nat.json
  36. 0
      vmware_nsx/tests/unit/vmware/etc/fake_post_lswitch.json
  37. 0
      vmware_nsx/tests/unit/vmware/etc/fake_post_lswitch_lport.json
  38. 0
      vmware_nsx/tests/unit/vmware/etc/fake_post_security_profile.json
  39. 0
      vmware_nsx/tests/unit/vmware/etc/fake_put_lrouter_lport_att.json
  40. 0
      vmware_nsx/tests/unit/vmware/etc/fake_put_lswitch_lport_att.json
  41. 0
      vmware_nsx/tests/unit/vmware/etc/neutron.conf.test
  42. 0
      vmware_nsx/tests/unit/vmware/etc/nsx.ini.agentless.test
  43. 0
      vmware_nsx/tests/unit/vmware/etc/nsx.ini.basic.test
  44. 0
      vmware_nsx/tests/unit/vmware/etc/nsx.ini.combined.test
  45. 0
      vmware_nsx/tests/unit/vmware/etc/nsx.ini.full.test
  46. 0
      vmware_nsx/tests/unit/vmware/etc/nsx.ini.test
  47. 0
      vmware_nsx/tests/unit/vmware/etc/nvp.ini.full.test
  48. 0
      vmware_nsx/tests/unit/vmware/etc/vcns.ini.test
  49. 0
      vmware_nsx/tests/unit/vmware/extensions/__init__.py
  50. 2
      vmware_nsx/tests/unit/vmware/extensions/test_addresspairs.py
  51. 6
      vmware_nsx/tests/unit/vmware/extensions/test_maclearning.py
  52. 4
      vmware_nsx/tests/unit/vmware/extensions/test_networkgw.py
  53. 6
      vmware_nsx/tests/unit/vmware/extensions/test_portsecurity.py
  54. 4
      vmware_nsx/tests/unit/vmware/extensions/test_providernet.py
  55. 4
      vmware_nsx/tests/unit/vmware/extensions/test_qosqueues.py
  56. 4
      vmware_nsx/tests/unit/vmware/extensions/test_vnic_index.py
  57. 0
      vmware_nsx/tests/unit/vmware/nsx_v/__init__.py
  58. 0
      vmware_nsx/tests/unit/vmware/nsx_v/test_edge_loadbalancer_driver.py
  59. 0
      vmware_nsx/tests/unit/vmware/nsx_v/test_nsxv_loadbalancer.py
  60. 0
      vmware_nsx/tests/unit/vmware/nsx_v3_mocks.py
  61. 0
      vmware_nsx/tests/unit/vmware/nsxlib/__init__.py
  62. 4
      vmware_nsx/tests/unit/vmware/nsxlib/base.py
  63. 2
      vmware_nsx/tests/unit/vmware/nsxlib/test_l2gateway.py
  64. 0
      vmware_nsx/tests/unit/vmware/nsxlib/test_lsn.py
  65. 2
      vmware_nsx/tests/unit/vmware/nsxlib/test_queue.py
  66. 2
      vmware_nsx/tests/unit/vmware/nsxlib/test_router.py
  67. 2
      vmware_nsx/tests/unit/vmware/nsxlib/test_secgroup.py
  68. 2
      vmware_nsx/tests/unit/vmware/nsxlib/test_switch.py
  69. 0
      vmware_nsx/tests/unit/vmware/nsxlib/test_versioning.py
  70. 0
      vmware_nsx/tests/unit/vmware/nsxlib/v3/__init__.py
  71. 0
      vmware_nsx/tests/unit/vmware/nsxlib/v3/nsxlib_testcase.py
  72. 4
      vmware_nsx/tests/unit/vmware/nsxlib/v3/test_port.py
  73. 4
      vmware_nsx/tests/unit/vmware/nsxlib/v3/test_qos_switching_profile.py
  74. 4
      vmware_nsx/tests/unit/vmware/nsxlib/v3/test_switch.py
  75. 0
      vmware_nsx/tests/unit/vmware/services/__init__.py
  76. 0
      vmware_nsx/tests/unit/vmware/services/l2gateway/__init__.py
  77. 0
      vmware_nsx/tests/unit/vmware/services/l2gateway/test_nsxv3_driver.py
  78. 6
      vmware_nsx/tests/unit/vmware/test_agent_scheduler.py
  79. 0
      vmware_nsx/tests/unit/vmware/test_constants_v3.py
  80. 0
      vmware_nsx/tests/unit/vmware/test_dhcpmeta.py
  81. 0
      vmware_nsx/tests/unit/vmware/test_dvs.py
  82. 0
      vmware_nsx/tests/unit/vmware/test_dvs_utils.py
  83. 0
      vmware_nsx/tests/unit/vmware/test_nsx_misc.py
  84. 2
      vmware_nsx/tests/unit/vmware/test_nsx_opts.py
  85. 2
      vmware_nsx/tests/unit/vmware/test_nsx_parent_tag.py
  86. 6
      vmware_nsx/tests/unit/vmware/test_nsx_plugin.py
  87. 4
      vmware_nsx/tests/unit/vmware/test_nsx_sync.py
  88. 4
      vmware_nsx/tests/unit/vmware/test_nsx_utils.py
  89. 4
      vmware_nsx/tests/unit/vmware/test_nsx_v3_plugin.py
  90. 8
      vmware_nsx/tests/unit/vmware/test_nsx_v_plugin.py
  91. 0
      vmware_nsx/tests/unit/vmware/test_utils.py
  92. 0
      vmware_nsx/tests/unit/vmware/vshield/__init__.py
  93. 0
      vmware_nsx/tests/unit/vmware/vshield/fake_vcns.py
  94. 2
      vmware_nsx/tests/unit/vmware/vshield/test_edge_utils.py
  95. 4
      vmware_nsx/tests/unit/vmware/vshield/test_vcns_driver.py

2
.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

6
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
~~~~~~~~~~~~~~~~~

2
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

2
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"]

2
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

0
vmware_nsx/neutron/tests/__init__.py → vmware_nsx/tests/__init__.py

0
vmware_nsx/neutron/tests/functional/__init__.py → vmware_nsx/tests/functional/__init__.py

0
vmware_nsx/neutron/tests/functional/db/__init__.py → vmware_nsx/tests/functional/db/__init__.py

0
vmware_nsx/neutron/tests/functional/db/test_migrations.py → vmware_nsx/tests/functional/db/test_migrations.py

0
vmware_nsx/neutron/tests/functional/requirements.txt → vmware_nsx/tests/functional/requirements.txt

0
vmware_nsx/neutron/tests/unit/__init__.py → vmware_nsx/tests/unit/__init__.py

0
vmware_nsx/neutron/tests/unit/vmware/__init__.py → vmware_nsx/tests/unit/vmware/__init__.py

0
vmware_nsx/neutron/tests/unit/vmware/apiclient/__init__.py → vmware_nsx/tests/unit/vmware/apiclient/__init__.py

0
vmware_nsx/neutron/tests/unit/vmware/apiclient/fake.py → vmware_nsx/tests/unit/vmware/apiclient/fake.py

0
vmware_nsx/neutron/tests/unit/vmware/apiclient/test_api_common.py → vmware_nsx/tests/unit/vmware/apiclient/test_api_common.py

8
vmware_nsx/neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py → 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())

0
vmware_nsx/neutron/tests/unit/vmware/db/__init__.py → vmware_nsx/tests/unit/vmware/db/__init__.py

0
vmware_nsx/neutron/tests/unit/vmware/db/test_lsn_db.py → vmware_nsx/tests/unit/vmware/db/test_lsn_db.py

0
vmware_nsx/neutron/tests/unit/vmware/db/test_nsx_db.py → vmware_nsx/tests/unit/vmware/db/test_nsx_db.py

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_gwservice.json → vmware_nsx/tests/unit/vmware/etc/fake_get_gwservice.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lqueue.json → vmware_nsx/tests/unit/vmware/etc/fake_get_lqueue.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lrouter.json → vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lrouter_lport.json → vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter_lport.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lrouter_lport_att.json → vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter_lport_att.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lrouter_nat.json → vmware_nsx/tests/unit/vmware/etc/fake_get_lrouter_nat.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lswitch.json → vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lswitch_lport.json → vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch_lport.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lswitch_lport_att.json → vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch_lport_att.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_lswitch_lport_status.json → vmware_nsx/tests/unit/vmware/etc/fake_get_lswitch_lport_status.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_get_security_profile.json → vmware_nsx/tests/unit/vmware/etc/fake_get_security_profile.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_gwservice.json → vmware_nsx/tests/unit/vmware/etc/fake_post_gwservice.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lqueue.json → vmware_nsx/tests/unit/vmware/etc/fake_post_lqueue.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lrouter.json → vmware_nsx/tests/unit/vmware/etc/fake_post_lrouter.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lrouter_lport.json → vmware_nsx/tests/unit/vmware/etc/fake_post_lrouter_lport.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lrouter_nat.json → vmware_nsx/tests/unit/vmware/etc/fake_post_lrouter_nat.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lswitch.json → vmware_nsx/tests/unit/vmware/etc/fake_post_lswitch.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_lswitch_lport.json → vmware_nsx/tests/unit/vmware/etc/fake_post_lswitch_lport.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_post_security_profile.json → vmware_nsx/tests/unit/vmware/etc/fake_post_security_profile.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_put_lrouter_lport_att.json → vmware_nsx/tests/unit/vmware/etc/fake_put_lrouter_lport_att.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/fake_put_lswitch_lport_att.json → vmware_nsx/tests/unit/vmware/etc/fake_put_lswitch_lport_att.json

0
vmware_nsx/neutron/tests/unit/vmware/etc/neutron.conf.test → vmware_nsx/tests/unit/vmware/etc/neutron.conf.test

0
vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.agentless.test → vmware_nsx/tests/unit/vmware/etc/nsx.ini.agentless.test

0
vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.basic.test → vmware_nsx/tests/unit/vmware/etc/nsx.ini.basic.test

0
vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.combined.test → vmware_nsx/tests/unit/vmware/etc/nsx.ini.combined.test

0
vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.full.test → vmware_nsx/tests/unit/vmware/etc/nsx.ini.full.test

0
vmware_nsx/neutron/tests/unit/vmware/etc/nsx.ini.test → vmware_nsx/tests/unit/vmware/etc/nsx.ini.test

0
vmware_nsx/neutron/tests/unit/vmware/etc/nvp.ini.full.test → vmware_nsx/tests/unit/vmware/etc/nvp.ini.full.test

0
vmware_nsx/neutron/tests/unit/vmware/etc/vcns.ini.test → vmware_nsx/tests/unit/vmware/etc/vcns.ini.test

0
vmware_nsx/neutron/tests/unit/vmware/extensions/__init__.py → vmware_nsx/tests/unit/vmware/extensions/__init__.py

2
vmware_nsx/neutron/tests/unit/vmware/extensions/test_addresspairs.py → 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,

6
vmware_nsx/neutron/tests/unit/vmware/extensions/test_maclearning.py → 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):

4
vmware_nsx/neutron/tests/unit/vmware/extensions/test_networkgw.py → 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

6
vmware_nsx/neutron/tests/unit/vmware/extensions/test_portsecurity.py → 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):

4
vmware_nsx/neutron/tests/unit/vmware/extensions/test_providernet.py → 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):

4
vmware_nsx/neutron/tests/unit/vmware/extensions/test_qosqueues.py → 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):

4
vmware_nsx/neutron/tests/unit/vmware/extensions/test_vnic_index.py → 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

0
vmware_nsx/neutron/tests/unit/vmware/nsx_v/__init__.py → vmware_nsx/tests/unit/vmware/nsx_v/__init__.py

0
vmware_nsx/neutron/tests/unit/vmware/nsx_v/test_edge_loadbalancer_driver.py → vmware_nsx/tests/unit/vmware/nsx_v/test_edge_loadbalancer_driver.py

0
vmware_nsx/neutron/tests/unit/vmware/nsx_v/test_nsxv_loadbalancer.py → vmware_nsx/tests/unit/vmware/nsx_v/test_nsxv_loadbalancer.py

0
vmware_nsx/neutron/tests/unit/vmware/nsx_v3_mocks.py → vmware_nsx/tests/unit/vmware/nsx_v3_mocks.py

0
vmware_nsx/neutron/tests/unit/vmware/nsxlib/__init__.py → vmware_nsx/tests/unit/vmware/nsxlib/__init__.py

4
vmware_nsx/neutron/tests/unit/vmware/nsxlib/base.py → 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

2
vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_l2gateway.py → 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

0
vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_lsn.py → vmware_nsx/tests/unit/vmware/nsxlib/test_lsn.py

2
vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_queue.py → 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):

2
vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_router.py → 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

2
vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_secgroup.py → 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

2
vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_switch.py → 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

0
vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_versioning.py → vmware_nsx/tests/unit/vmware/nsxlib/test_versioning.py

0
vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/__init__.py → vmware_nsx/tests/unit/vmware/nsxlib/v3/__init__.py

0
vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/nsxlib_testcase.py → vmware_nsx/tests/unit/vmware/nsxlib/v3/nsxlib_testcase.py

4
vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/test_port.py → 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__)

4
vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/test_qos_switching_profile.py → 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__)

4
vmware_nsx/neutron/tests/unit/vmware/nsxlib/v3/test_switch.py → 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__)

0
vmware_nsx/neutron/tests/unit/vmware/services/__init__.py → vmware_nsx/tests/unit/vmware/services/__init__.py

0
vmware_nsx/neutron/tests/unit/vmware/services/l2gateway/__init__.py → vmware_nsx/tests/unit/vmware/services/l2gateway/__init__.py

0
vmware_nsx/neutron/tests/unit/vmware/services/l2gateway/test_nsxv3_driver.py → vmware_nsx/tests/unit/vmware/services/l2gateway/test_nsxv3_driver.py

6
vmware_nsx/neutron/tests/unit/vmware/test_agent_scheduler.py → 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(

0
vmware_nsx/neutron/tests/unit/vmware/test_constants_v3.py → vmware_nsx/tests/unit/vmware/test_constants_v3.py

0
vmware_nsx/neutron/tests/unit/vmware/test_dhcpmeta.py → vmware_nsx/tests/unit/vmware/test_dhcpmeta.py

0
vmware_nsx/neutron/tests/unit/vmware/test_dvs.py → vmware_nsx/tests/unit/vmware/test_dvs.py

0
vmware_nsx/neutron/tests/unit/vmware/test_dvs_utils.py → vmware_nsx/tests/unit/vmware/test_dvs_utils.py

0
vmware_nsx/neutron/tests/unit/vmware/test_nsx_misc.py → vmware_nsx/tests/unit/vmware/test_nsx_misc.py

2
vmware_nsx/neutron/tests/unit/vmware/test_nsx_opts.py → 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')

2
vmware_nsx/neutron/tests/unit/vmware/test_nsx_parent_tag.py → 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):

6
vmware_nsx/neutron/tests/unit/vmware/test_nsx_plugin.py → 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__)

4
vmware_nsx/neutron/tests/unit/vmware/test_nsx_sync.py → 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__)

4
vmware_nsx/neutron/tests/unit/vmware/test_nsx_utils.py → 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):

4
vmware_nsx/neutron/tests/unit/vmware/test_nsx_v3_plugin.py → 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')

8
vmware_nsx/neutron/tests/unit/vmware/test_nsx_v_plugin.py → 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'

0
vmware_nsx/neutron/tests/unit/vmware/test_utils.py → vmware_nsx/tests/unit/vmware/test_utils.py

0
vmware_nsx/neutron/tests/unit/vmware/vshield/__init__.py → vmware_nsx/tests/unit/vmware/vshield/__init__.py

0
vmware_nsx/neutron/tests/unit/vmware/vshield/fake_vcns.py → vmware_nsx/tests/unit/vmware/vshield/fake_vcns.py

2
vmware_nsx/neutron/tests/unit/vmware/vshield/test_edge_utils.py → 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

4
vmware_nsx/neutron/tests/unit/vmware/vshield/test_vcns_driver.py → 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")
Loading…
Cancel
Save