Browse Source

Divide vmware_nsx/plugins into plugin-specific subdirectories

This patch will create:
vmware_nsx/plugins/dvs for DVS specific files
vmware_nsx/plugins/nsx_mh for MH specific files
vmware_nsx/plugins/nsx_v for nsx_v specific files
vmware_nsx/plugins/nsx_v3 for nsx_v3 specific files

also move vmware_nsx/vsphere/ to vmware_nsx/plugins/nsx_v/vsphere/.

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

Change-Id: I00ee12da2eea0add988bae3d4f3e12940ea829bb
changes/65/223865/3
Shih-Hao Li 6 years ago
parent
commit
09d19bb138
  1. 2
      devstack/lib/vmware_nsx_v3
  2. 6
      setup.cfg
  3. 2
      vmware_nsx/db/nsxv_db.py
  4. 14
      vmware_nsx/plugin.py
  5. 0
      vmware_nsx/plugins/dvs/__init__.py
  6. 0
      vmware_nsx/plugins/dvs/plugin.py
  7. 0
      vmware_nsx/plugins/nsx_mh/__init__.py
  8. 0
      vmware_nsx/plugins/nsx_mh/plugin.py
  9. 0
      vmware_nsx/plugins/nsx_v/__init__.py
  10. 0
      vmware_nsx/plugins/nsx_v/drivers/__init__.py
  11. 0
      vmware_nsx/plugins/nsx_v/drivers/abstract_router_driver.py
  12. 8
      vmware_nsx/plugins/nsx_v/drivers/distributed_router_driver.py
  13. 6
      vmware_nsx/plugins/nsx_v/drivers/exclusive_router_driver.py
  14. 10
      vmware_nsx/plugins/nsx_v/drivers/shared_router_driver.py
  15. 0
      vmware_nsx/plugins/nsx_v/managers.py
  16. 6
      vmware_nsx/plugins/nsx_v/md_proxy.py
  17. 14
      vmware_nsx/plugins/nsx_v/plugin.py
  18. 0
      vmware_nsx/plugins/nsx_v/vshield/__init__.py
  19. 2
      vmware_nsx/plugins/nsx_v/vshield/common/VcnsApiClient.py
  20. 0
      vmware_nsx/plugins/nsx_v/vshield/common/__init__.py
  21. 0
      vmware_nsx/plugins/nsx_v/vshield/common/constants.py
  22. 0
      vmware_nsx/plugins/nsx_v/vshield/common/exceptions.py
  23. 8
      vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py
  24. 6
      vmware_nsx/plugins/nsx_v/vshield/edge_firewall_driver.py
  25. 2
      vmware_nsx/plugins/nsx_v/vshield/edge_ipsecvpn_driver.py
  26. 4
      vmware_nsx/plugins/nsx_v/vshield/edge_loadbalancer_driver.py
  27. 8
      vmware_nsx/plugins/nsx_v/vshield/edge_utils.py
  28. 2
      vmware_nsx/plugins/nsx_v/vshield/nsxv_edge_cfg_obj.py
  29. 2
      vmware_nsx/plugins/nsx_v/vshield/nsxv_loadbalancer.py
  30. 0
      vmware_nsx/plugins/nsx_v/vshield/securitygroup_utils.py
  31. 0
      vmware_nsx/plugins/nsx_v/vshield/tasks/__init__.py
  32. 0
      vmware_nsx/plugins/nsx_v/vshield/tasks/constants.py
  33. 2
      vmware_nsx/plugins/nsx_v/vshield/tasks/tasks.py
  34. 4
      vmware_nsx/plugins/nsx_v/vshield/vcns.py
  35. 10
      vmware_nsx/plugins/nsx_v/vshield/vcns_driver.py
  36. 0
      vmware_nsx/plugins/nsx_v3/__init__.py
  37. 0
      vmware_nsx/plugins/nsx_v3/plugin.py
  38. 8
      vmware_nsx/tests/unit/vmware/__init__.py
  39. 2
      vmware_nsx/tests/unit/vmware/nsx_v/test_edge_loadbalancer_driver.py
  40. 4
      vmware_nsx/tests/unit/vmware/nsx_v/test_nsxv_loadbalancer.py
  41. 4
      vmware_nsx/tests/unit/vmware/test_nsx_misc.py
  42. 3
      vmware_nsx/tests/unit/vmware/test_nsx_v3_plugin.py
  43. 6
      vmware_nsx/tests/unit/vmware/test_nsx_v_plugin.py
  44. 2
      vmware_nsx/tests/unit/vmware/vshield/fake_vcns.py
  45. 6
      vmware_nsx/tests/unit/vmware/vshield/test_edge_utils.py
  46. 12
      vmware_nsx/tests/unit/vmware/vshield/test_vcns_driver.py

2
devstack/lib/vmware_nsx_v3

@ -62,7 +62,7 @@ function neutron_plugin_configure_common {
Q_PLUGIN_SRC_CONF_PATH=vmware-nsx/etc
mkdir -p /$Q_PLUGIN_CONF_PATH
cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/$Q_PLUGIN_CONF_FILENAME /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
Q_PLUGIN_CLASS="vmware_nsx.plugins.nsx_v3_plugin.NsxV3Plugin"
Q_PLUGIN_CLASS="vmware_nsx.plugin.NsxV3Plugin"
}
function neutron_plugin_configure_debug_command {

6
setup.cfg

@ -35,9 +35,9 @@ neutron.service_plugins =
vmware_nsx_l2gw = vmware_nsx.services.l2gateway.common.plugin:NsxL2GatewayPlugin
vmware_nsx_qos = vmware_nsx.services.qos.plugin:NsxQosPlugin
vmware_nsx.neutron.nsxv.router_type_drivers =
shared = vmware_nsx.plugins.nsx_v_drivers.shared_router_driver:RouterSharedDriver
distributed = vmware_nsx.plugins.nsx_v_drivers.distributed_router_driver:RouterDistributedDriver
exclusive = vmware_nsx.plugins.nsx_v_drivers.exclusive_router_driver:RouterExclusiveDriver
shared = vmware_nsx.plugins.nsx_v.drivers.shared_router_driver:RouterSharedDriver
distributed = vmware_nsx.plugins.nsx_v.drivers.distributed_router_driver:RouterDistributedDriver
exclusive = vmware_nsx.plugins.nsx_v.drivers.exclusive_router_driver:RouterExclusiveDriver
[build_sphinx]
source-dir = doc/source
build-dir = doc/build

2
vmware_nsx/db/nsxv_db.py

@ -27,7 +27,7 @@ from neutron.i18n import _, _LE
from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.common import nsxv_constants
from vmware_nsx.db import nsxv_models
from vmware_nsx.vshield.common import constants
from vmware_nsx.plugins.nsx_v.vshield.common import constants
LOG = logging.getLogger(__name__)

14
vmware_nsx/plugin.py

@ -15,12 +15,12 @@
# under the License.
#
from vmware_nsx.plugins import base
from vmware_nsx.plugins import dvs
from vmware_nsx.plugins import nsx_v
from vmware_nsx.plugins import nsx_v3_plugin
from vmware_nsx.plugins.dvs import plugin as dvs
from vmware_nsx.plugins.nsx_mh import plugin as nsx_mh
from vmware_nsx.plugins.nsx_v import plugin as nsx_v
from vmware_nsx.plugins.nsx_v3 import plugin as nsx_v3
NsxPlugin = base.NsxPluginV2
NsxVPlugin = nsx_v.NsxVPluginV2
NsxDvsPlugin = dvs.NsxDvsV2
NsxV3Plugin = nsx_v3_plugin.NsxV3Plugin
NsxPlugin = nsx_mh.NsxPluginV2
NsxVPlugin = nsx_v.NsxVPluginV2
NsxV3Plugin = nsx_v3.NsxV3Plugin

0
vmware_nsx/plugins/nsx_v_drivers/__init__.py → vmware_nsx/plugins/dvs/__init__.py

0
vmware_nsx/plugins/dvs.py → vmware_nsx/plugins/dvs/plugin.py

0
vmware_nsx/vshield/__init__.py → vmware_nsx/plugins/nsx_mh/__init__.py

0
vmware_nsx/plugins/base.py → vmware_nsx/plugins/nsx_mh/plugin.py

0
vmware_nsx/vshield/common/__init__.py → vmware_nsx/plugins/nsx_v/__init__.py

0
vmware_nsx/vshield/tasks/__init__.py → vmware_nsx/plugins/nsx_v/drivers/__init__.py

0
vmware_nsx/plugins/nsx_v_drivers/abstract_router_driver.py → vmware_nsx/plugins/nsx_v/drivers/abstract_router_driver.py

8
vmware_nsx/plugins/nsx_v_drivers/distributed_router_driver.py → vmware_nsx/plugins/nsx_v/drivers/distributed_router_driver.py

@ -21,12 +21,12 @@ from neutron.db import l3_db
from neutron.i18n import _LE
from vmware_nsx.db import nsxv_db
from vmware_nsx.plugins import nsx_v
from vmware_nsx.plugins.nsx_v_drivers import (
from vmware_nsx.plugins.nsx_v.drivers import (
abstract_router_driver as router_driver)
from vmware_nsx.vshield.common import (
from vmware_nsx.plugins.nsx_v import plugin as nsx_v
from vmware_nsx.plugins.nsx_v.vshield.common import (
constants as vcns_const)
from vmware_nsx.vshield import edge_utils
from vmware_nsx.plugins.nsx_v.vshield import edge_utils
LOG = logging.getLogger(__name__)
METADATA_CIDR = '169.254.169.254/32'

6
vmware_nsx/plugins/nsx_v_drivers/exclusive_router_driver.py → vmware_nsx/plugins/nsx_v/drivers/exclusive_router_driver.py

@ -19,10 +19,10 @@ from neutron.api.v2 import attributes as attr
from vmware_nsx.common import exceptions as nsxv_exc
from vmware_nsx.common import locking
from vmware_nsx.db import nsxv_db
from vmware_nsx.plugins import nsx_v
from vmware_nsx.plugins.nsx_v_drivers import (
from vmware_nsx.plugins.nsx_v.drivers import (
abstract_router_driver as router_driver)
from vmware_nsx.vshield import edge_utils
from vmware_nsx.plugins.nsx_v import plugin as nsx_v
from vmware_nsx.plugins.nsx_v.vshield import edge_utils
LOG = logging.getLogger(__name__)

10
vmware_nsx/plugins/nsx_v_drivers/shared_router_driver.py → vmware_nsx/plugins/nsx_v/drivers/shared_router_driver.py

@ -23,13 +23,13 @@ from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.common import locking
from vmware_nsx.db import nsxv_db
from vmware_nsx.db import nsxv_models
from vmware_nsx.plugins import nsx_v
from vmware_nsx.plugins.nsx_v_drivers import (
from vmware_nsx.plugins.nsx_v.drivers import (
abstract_router_driver as router_driver)
from vmware_nsx.plugins import nsx_v_md_proxy
from vmware_nsx.vshield.common import (
from vmware_nsx.plugins.nsx_v import md_proxy as nsx_v_md_proxy
from vmware_nsx.plugins.nsx_v import plugin as nsx_v
from vmware_nsx.plugins.nsx_v.vshield.common import (
constants as vcns_const)
from vmware_nsx.vshield import edge_utils
from vmware_nsx.plugins.nsx_v.vshield import edge_utils
LOG = logging.getLogger(__name__)

0
vmware_nsx/plugins/managers.py → vmware_nsx/plugins/nsx_v/managers.py

6
vmware_nsx/plugins/nsx_v_md_proxy.py → vmware_nsx/plugins/nsx_v/md_proxy.py

@ -29,11 +29,11 @@ from vmware_nsx.common import exceptions as nsxv_exc
from vmware_nsx.common import locking
from vmware_nsx.common import nsxv_constants
from vmware_nsx.db import nsxv_db
from vmware_nsx.vshield import (
from vmware_nsx.plugins.nsx_v.vshield import (
nsxv_loadbalancer as nsxv_lb)
from vmware_nsx.vshield.common import (
from vmware_nsx.plugins.nsx_v.vshield.common import (
constants as vcns_const)
from vmware_nsx.vshield import edge_utils
from vmware_nsx.plugins.nsx_v.vshield import edge_utils
METADATA_VSE_NAME = 'MdSrv'
METADATA_IP_ADDR = '169.254.169.254'

14
vmware_nsx/plugins/nsx_v.py → vmware_nsx/plugins/nsx_v/plugin.py

@ -65,15 +65,15 @@ from vmware_nsx.extensions import (
advancedserviceproviders as as_providers)
from vmware_nsx.extensions import (
vnicindex as ext_vnic_idx)
from vmware_nsx.plugins import managers
from vmware_nsx.plugins import nsx_v_md_proxy
from vmware_nsx.vshield.common import (
from vmware_nsx.plugins.nsx_v import managers
from vmware_nsx.plugins.nsx_v import md_proxy as nsx_v_md_proxy
from vmware_nsx.plugins.nsx_v.vshield.common import (
constants as vcns_const)
from vmware_nsx.vshield.common import (
from vmware_nsx.plugins.nsx_v.vshield.common import (
exceptions as vsh_exc)
from vmware_nsx.vshield import edge_utils
from vmware_nsx.vshield import securitygroup_utils
from vmware_nsx.vshield import vcns_driver
from vmware_nsx.plugins.nsx_v.vshield import edge_utils
from vmware_nsx.plugins.nsx_v.vshield import securitygroup_utils
from vmware_nsx.plugins.nsx_v.vshield import vcns_driver
LOG = logging.getLogger(__name__)
PORTGROUP_PREFIX = 'dvportgroup'

0
vmware_nsx/plugins/nsx_v/vshield/__init__.py

2
vmware_nsx/vshield/common/VcnsApiClient.py → vmware_nsx/plugins/nsx_v/vshield/common/VcnsApiClient.py

@ -18,7 +18,7 @@ import eventlet
from oslo_serialization import jsonutils
import six
from vmware_nsx.vshield.common import exceptions
from vmware_nsx.plugins.nsx_v.vshield.common import exceptions
httplib2 = eventlet.import_patched('httplib2')

0
vmware_nsx/plugins/nsx_v/vshield/common/__init__.py

0
vmware_nsx/vshield/common/constants.py → vmware_nsx/plugins/nsx_v/vshield/common/constants.py

0
vmware_nsx/vshield/common/exceptions.py → vmware_nsx/plugins/nsx_v/vshield/common/exceptions.py

8
vmware_nsx/vshield/edge_appliance_driver.py → vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py

@ -24,11 +24,11 @@ from oslo_utils import excutils
from neutron.i18n import _LE, _LI, _LW
from vmware_nsx.common import nsxv_constants
from vmware_nsx.common import utils
from vmware_nsx.vshield.common import constants
from vmware_nsx.vshield.common import exceptions
from vmware_nsx.vshield.tasks import (
from vmware_nsx.plugins.nsx_v.vshield.common import constants
from vmware_nsx.plugins.nsx_v.vshield.common import exceptions
from vmware_nsx.plugins.nsx_v.vshield.tasks import (
constants as task_constants)
from vmware_nsx.vshield.tasks import tasks
from vmware_nsx.plugins.nsx_v.vshield.tasks import tasks
LOG = logging.getLogger(__name__)

6
vmware_nsx/vshield/edge_firewall_driver.py → vmware_nsx/plugins/nsx_v/vshield/edge_firewall_driver.py

@ -18,11 +18,11 @@ from oslo_utils import excutils
from neutron.i18n import _, _LE
from vmware_nsx.db import nsxv_db
from vmware_nsx.vshield.common import (
from vmware_nsx.plugins.nsx_v.vshield.common import (
exceptions as vcns_exc)
from vmware_nsx.vshield.tasks import (
from vmware_nsx.plugins.nsx_v.vshield.tasks import (
constants as task_const)
from vmware_nsx.vshield.tasks import tasks
from vmware_nsx.plugins.nsx_v.vshield.tasks import tasks
LOG = logging.getLogger(__name__)

2
vmware_nsx/vshield/edge_ipsecvpn_driver.py → vmware_nsx/plugins/nsx_v/vshield/edge_ipsecvpn_driver.py

@ -16,7 +16,7 @@ from oslo_log import log as logging
from oslo_utils import excutils
from neutron.i18n import _LE, _LW
from vmware_nsx.vshield.common import (
from vmware_nsx.plugins.nsx_v.vshield.common import (
exceptions as vcns_exc)
LOG = logging.getLogger(__name__)

4
vmware_nsx/vshield/edge_loadbalancer_driver.py → vmware_nsx/plugins/nsx_v/vshield/edge_loadbalancer_driver.py

@ -25,9 +25,9 @@ from neutron import manager
from neutron.plugins.common import constants
from vmware_nsx.common import locking
from vmware_nsx.db import nsxv_db
from vmware_nsx.vshield.common import (
from vmware_nsx.plugins.nsx_v.vshield.common import (
exceptions as nsxv_exc)
from vmware_nsx.vshield import vcns as nsxv_api
from vmware_nsx.plugins.nsx_v.vshield import vcns as nsxv_api
LOG = logging.getLogger(__name__)

8
vmware_nsx/vshield/edge_utils.py → vmware_nsx/plugins/nsx_v/vshield/edge_utils.py

@ -37,12 +37,12 @@ from vmware_nsx.common import locking
from vmware_nsx.common import nsxv_constants
from vmware_nsx.db import db as nsx_db
from vmware_nsx.db import nsxv_db
from vmware_nsx.vshield.common import (
from vmware_nsx.plugins.nsx_v.vshield.common import (
constants as vcns_const)
from vmware_nsx.vshield.tasks import (
from vmware_nsx.plugins.nsx_v.vshield.tasks import (
constants as task_const)
from vmware_nsx.vshield.tasks import tasks
from vmware_nsx.vshield import vcns
from vmware_nsx.plugins.nsx_v.vshield.tasks import tasks
from vmware_nsx.plugins.nsx_v.vshield import vcns
WORKER_POOL_SIZE = 8
RP_FILTER_PROPERTY_OFF_TEMPLATE = 'sysctl.net.ipv4.conf.%s.rp_filter=%s'

2
vmware_nsx/vshield/nsxv_edge_cfg_obj.py → vmware_nsx/plugins/nsx_v/vshield/nsxv_edge_cfg_obj.py

@ -18,7 +18,7 @@ import abc
from oslo_serialization import jsonutils
import six
from vmware_nsx.vshield import vcns
from vmware_nsx.plugins.nsx_v.vshield import vcns
@six.add_metaclass(abc.ABCMeta)

2
vmware_nsx/vshield/nsxv_loadbalancer.py → vmware_nsx/plugins/nsx_v/vshield/nsxv_loadbalancer.py

@ -16,7 +16,7 @@
from oslo_log import log as logging
from vmware_nsx.vshield import nsxv_edge_cfg_obj
from vmware_nsx.plugins.nsx_v.vshield import nsxv_edge_cfg_obj
LOG = logging.getLogger(__name__)

0
vmware_nsx/vshield/securitygroup_utils.py → vmware_nsx/plugins/nsx_v/vshield/securitygroup_utils.py

0
vmware_nsx/plugins/nsx_v/vshield/tasks/__init__.py

0
vmware_nsx/vshield/tasks/constants.py → vmware_nsx/plugins/nsx_v/vshield/tasks/constants.py

2
vmware_nsx/vshield/tasks/tasks.py → vmware_nsx/plugins/nsx_v/vshield/tasks/tasks.py

@ -24,7 +24,7 @@ from oslo_service import loopingcall
import six
from neutron.i18n import _LE, _LI
from vmware_nsx.vshield.tasks import constants
from vmware_nsx.plugins.nsx_v.vshield.tasks import constants
DEFAULT_INTERVAL = 1000

4
vmware_nsx/vshield/vcns.py → vmware_nsx/plugins/nsx_v/vshield/vcns.py

@ -20,8 +20,8 @@ from oslo_serialization import jsonutils
import retrying
import xml.etree.ElementTree as et
from vmware_nsx.vshield.common import exceptions
from vmware_nsx.vshield.common import VcnsApiClient
from vmware_nsx.plugins.nsx_v.vshield.common import exceptions
from vmware_nsx.plugins.nsx_v.vshield.common import VcnsApiClient
LOG = logging.getLogger(__name__)

10
vmware_nsx/vshield/vcns_driver.py → vmware_nsx/plugins/nsx_v/vshield/vcns_driver.py

@ -20,11 +20,11 @@ from oslo_config import cfg
from oslo_log import log as logging
from vmware_nsx.common import config # noqa
from vmware_nsx.vshield import edge_appliance_driver
from vmware_nsx.vshield import edge_firewall_driver
from vmware_nsx.vshield import edge_loadbalancer_driver
from vmware_nsx.vshield.tasks import tasks
from vmware_nsx.vshield import vcns
from vmware_nsx.plugins.nsx_v.vshield import edge_appliance_driver
from vmware_nsx.plugins.nsx_v.vshield import edge_firewall_driver
from vmware_nsx.plugins.nsx_v.vshield import edge_loadbalancer_driver
from vmware_nsx.plugins.nsx_v.vshield.tasks import tasks
from vmware_nsx.plugins.nsx_v.vshield import vcns
LOG = logging.getLogger(__name__)

0
vmware_nsx/plugins/nsx_v3/__init__.py

0
vmware_nsx/plugins/nsx_v3_plugin.py → vmware_nsx/plugins/nsx_v3/plugin.py

8
vmware_nsx/tests/unit/vmware/__init__.py

@ -22,11 +22,11 @@ from vmware_nsx.api_client import client as nsx_client
from vmware_nsx.api_client import eventlet_client
from vmware_nsx import extensions
import vmware_nsx.plugin as neutron_plugin
from vmware_nsx.vshield.common import (
from vmware_nsx.plugins.nsx_v.vshield.common import (
VcnsApiClient as vcnsapi)
from vmware_nsx.vshield import edge_utils
from vmware_nsx.vshield import vcns
import vmware_nsx.vshield.vcns_driver as vcnsdriver
from vmware_nsx.plugins.nsx_v.vshield import edge_utils
from vmware_nsx.plugins.nsx_v.vshield import vcns
import vmware_nsx.plugins.nsx_v.vshield.vcns_driver as vcnsdriver
plugin = neutron_plugin.NsxPlugin

2
vmware_nsx/tests/unit/vmware/nsx_v/test_edge_loadbalancer_driver.py

@ -18,7 +18,7 @@ import mock
from neutron import context
from neutron.tests import base
from vmware_nsx.vshield import vcns_driver
from vmware_nsx.plugins.nsx_v.vshield import vcns_driver
EDGE_PROVIDER = ('LOADBALANCER:vmwareedge:neutron.services.'
'loadbalancer.drivers.vmware.edge_driver.'

4
vmware_nsx/tests/unit/vmware/nsx_v/test_nsxv_loadbalancer.py

@ -17,8 +17,8 @@ import mock
from oslo_serialization import jsonutils
from neutron.tests import base
from vmware_nsx.vshield import nsxv_loadbalancer
from vmware_nsx.vshield import vcns
from vmware_nsx.plugins.nsx_v.vshield import nsxv_loadbalancer
from vmware_nsx.plugins.nsx_v.vshield import vcns
class NsxvLoadbalancerTestCase(base.BaseTestCase):

4
vmware_nsx/tests/unit/vmware/test_nsx_misc.py

@ -15,8 +15,8 @@
from neutron.tests import base
from vmware_nsx.vshield.common import exceptions
from vmware_nsx.vshield import vcns
from vmware_nsx.plugins.nsx_v.vshield.common import exceptions
from vmware_nsx.plugins.nsx_v.vshield import vcns
def raise_until_attempt(attempt, exception):

3
vmware_nsx/tests/unit/vmware/test_nsx_v3_plugin.py

@ -39,8 +39,7 @@ from vmware_nsx.nsxlib.v3 import dfw_api as firewall
from vmware_nsx.tests.unit import vmware
from vmware_nsx.tests.unit.vmware import nsx_v3_mocks
PLUGIN_NAME = ('vmware_nsx.'
'plugins.nsx_v3_plugin.NsxV3Plugin')
PLUGIN_NAME = ('vmware_nsx.plugin.NsxV3Plugin')
class NsxPluginV3TestCase(test_plugin.NeutronDbPluginV2TestCase):

6
vmware_nsx/tests/unit/vmware/test_nsx_v_plugin.py

@ -51,13 +51,13 @@ from vmware_nsx.extensions import (
routertype as router_type)
from vmware_nsx.extensions import (
vnicindex as ext_vnic_idx)
from vmware_nsx.plugins.nsx_v.vshield.common import (
constants as vcns_const)
from vmware_nsx.plugins.nsx_v.vshield import edge_utils
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
from vmware_nsx.vshield.common import (
constants as vcns_const)
from vmware_nsx.vshield import edge_utils
PLUGIN_NAME = 'vmware_nsx.plugin.NsxVPlugin'

2
vmware_nsx/tests/unit/vmware/vshield/fake_vcns.py

@ -19,7 +19,7 @@ from oslo_utils import uuidutils
import six
import xml.etree.ElementTree as ET
from vmware_nsx.vshield.common import exceptions
from vmware_nsx.plugins.nsx_v.vshield.common import exceptions
SECTION_LOCATION_HEADER = '/api/4.0/firewall/globalroot-0/config/%s/%s'

6
vmware_nsx/tests/unit/vmware/vshield/test_edge_utils.py

@ -24,10 +24,10 @@ from neutron.plugins.common import constants as plugin_const
from neutron.tests.unit import testlib_api
from vmware_nsx.common import nsxv_constants
from vmware_nsx.db import nsxv_db
from vmware_nsx.tests.unit import vmware
from vmware_nsx.vshield.common import (
from vmware_nsx.plugins.nsx_v.vshield.common import (
constants as vcns_const)
from vmware_nsx.vshield import edge_utils
from vmware_nsx.plugins.nsx_v.vshield import edge_utils
from vmware_nsx.tests.unit import vmware
_uuid = uuidutils.generate_uuid

12
vmware_nsx/tests/unit/vmware/vshield/test_vcns_driver.py

@ -19,14 +19,14 @@ import mock
from neutron.tests import base
import six
from vmware_nsx.tests.unit import vmware
from vmware_nsx.tests.unit.vmware.vshield import fake_vcns
from vmware_nsx.vshield.common import (
from vmware_nsx.plugins.nsx_v.vshield.common import (
constants as vcns_const)
from vmware_nsx.vshield.tasks import (
from vmware_nsx.plugins.nsx_v.vshield.tasks import (
constants as ts_const)
from vmware_nsx.vshield.tasks import tasks as ts
from vmware_nsx.vshield import vcns_driver
from vmware_nsx.plugins.nsx_v.vshield.tasks import tasks as ts
from vmware_nsx.plugins.nsx_v.vshield import vcns_driver
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