Move vmware_nsx/neutron/plugins/vmware to vmware_nsx

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

Change-Id: I60d6ef62eb724df71dfda90137e00f107e220971
This commit is contained in:
Shih-Hao Li 2015-09-14 18:51:57 -07:00
parent 8918b10b67
commit d8eeda9baf
151 changed files with 443 additions and 440 deletions

View File

@ -61,7 +61,7 @@ function neutron_plugin_configure_common {
mkdir -p /$Q_PLUGIN_CONF_PATH 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 cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/$Q_PLUGIN_CONF_FILENAME /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
Q_DB_NAME="neutron_nsx" Q_DB_NAME="neutron_nsx"
Q_PLUGIN_CLASS="vmware_nsx.neutron.plugins.vmware.plugin.NsxDvsPlugin" Q_PLUGIN_CLASS="vmware_nsx.plugin.NsxDvsPlugin"
} }
function neutron_plugin_configure_debug_command { function neutron_plugin_configure_debug_command {

View File

@ -53,7 +53,7 @@ function neutron_plugin_configure_common {
mkdir -p /$Q_PLUGIN_CONF_PATH 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 cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/$Q_PLUGIN_CONF_FILENAME /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
Q_DB_NAME="neutron_nsx" Q_DB_NAME="neutron_nsx"
Q_PLUGIN_CLASS="vmware_nsx.neutron.plugins.vmware.plugin.NsxVPlugin" Q_PLUGIN_CLASS="vmware_nsx.plugin.NsxVPlugin"
} }
function neutron_plugin_configure_debug_command { function neutron_plugin_configure_debug_command {

View File

@ -62,7 +62,7 @@ function neutron_plugin_configure_common {
Q_PLUGIN_SRC_CONF_PATH=vmware-nsx/etc Q_PLUGIN_SRC_CONF_PATH=vmware-nsx/etc
mkdir -p /$Q_PLUGIN_CONF_PATH 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 cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/$Q_PLUGIN_CONF_FILENAME /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
Q_PLUGIN_CLASS="vmware_nsx.neutron.plugins.vmware.plugins.nsx_v3_plugin.NsxV3Plugin" Q_PLUGIN_CLASS="vmware_nsx.plugins.nsx_v3_plugin.NsxV3Plugin"
} }
function neutron_plugin_configure_debug_command { function neutron_plugin_configure_debug_command {

View File

@ -26,18 +26,18 @@ data_files =
[entry_points] [entry_points]
console_scripts = console_scripts =
neutron-check-nsx-config = vmware_nsx.neutron.plugins.vmware.check_nsx_config:main neutron-check-nsx-config = vmware_nsx.check_nsx_config:main
neutron.db.alembic_migrations = neutron.db.alembic_migrations =
vmware-nsx = vmware_nsx.db.migration:alembic_migrations vmware-nsx = vmware_nsx.db.migration:alembic_migrations
neutron.core_plugins = neutron.core_plugins =
vmware = vmware_nsx.neutron.plugins.vmware.plugin:NsxMhPlugin vmware = vmware_nsx.plugin:NsxMhPlugin
neutron.service_plugins = neutron.service_plugins =
vmware_nsx_l2gw = vmware_nsx.services.l2gateway.plugin:NsxL2GatewayPlugin vmware_nsx_l2gw = vmware_nsx.services.l2gateway.plugin:NsxL2GatewayPlugin
vmware_nsx_qos = vmware_nsx.services.qos.plugin:NsxQosPlugin vmware_nsx_qos = vmware_nsx.services.qos.plugin:NsxQosPlugin
vmware_nsx.neutron.nsxv.router_type_drivers = vmware_nsx.neutron.nsxv.router_type_drivers =
shared = vmware_nsx.neutron.plugins.vmware.plugins.nsx_v_drivers.shared_router_driver:RouterSharedDriver shared = vmware_nsx.plugins.nsx_v_drivers.shared_router_driver:RouterSharedDriver
distributed = vmware_nsx.neutron.plugins.vmware.plugins.nsx_v_drivers.distributed_router_driver:RouterDistributedDriver distributed = vmware_nsx.plugins.nsx_v_drivers.distributed_router_driver:RouterDistributedDriver
exclusive = vmware_nsx.neutron.plugins.vmware.plugins.nsx_v_drivers.exclusive_router_driver:RouterExclusiveDriver exclusive = vmware_nsx.plugins.nsx_v_drivers.exclusive_router_driver:RouterExclusiveDriver
[build_sphinx] [build_sphinx]
source-dir = doc/source source-dir = doc/source
build-dir = doc/build build-dir = doc/build

View File

@ -0,0 +1,3 @@
import os
NSX_EXT_PATH = os.path.join(os.path.dirname(__file__), 'extensions')

View File

@ -23,7 +23,7 @@ from oslo_log import log as logging
import six import six
from six.moves import http_client as httplib from six.moves import http_client as httplib
from vmware_nsx.neutron.plugins.vmware import api_client from vmware_nsx import api_client
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -20,11 +20,11 @@ from oslo_log import log as logging
from six.moves import http_client as httplib from six.moves import http_client as httplib
from neutron.i18n import _LE from neutron.i18n import _LE
from vmware_nsx.neutron.plugins.vmware.api_client import base from vmware_nsx.api_client import base
from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_client from vmware_nsx.api_client import eventlet_client
from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_request from vmware_nsx.api_client import eventlet_request
from vmware_nsx.neutron.plugins.vmware.api_client import exception from vmware_nsx.api_client import exception
from vmware_nsx.neutron.plugins.vmware.api_client import version from vmware_nsx.api_client import version
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -22,8 +22,8 @@ eventlet.monkey_patch()
from oslo_log import log as logging from oslo_log import log as logging
from neutron.i18n import _LE from neutron.i18n import _LE
from vmware_nsx.neutron.plugins.vmware.api_client import base from vmware_nsx.api_client import base
from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_request from vmware_nsx.api_client import eventlet_request
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -22,7 +22,7 @@ from six.moves import http_client as httplib
from six.moves.urllib import parse from six.moves.urllib import parse
from neutron.i18n import _LI, _LW from neutron.i18n import _LI, _LW
from vmware_nsx.neutron.plugins.vmware.api_client import request from vmware_nsx.api_client import request
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
USER_AGENT = "Neutron eventlet client/2.0" USER_AGENT = "Neutron eventlet client/2.0"

View File

@ -28,7 +28,7 @@ from six.moves import http_client as httplib
import six.moves.urllib.parse as urlparse import six.moves.urllib.parse as urlparse
from neutron.i18n import _LI, _LW from neutron.i18n import _LI, _LW
from vmware_nsx.neutron.plugins.vmware import api_client from vmware_nsx import api_client
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -20,9 +20,9 @@ import sys
from oslo_config import cfg from oslo_config import cfg
from neutron.common import config from neutron.common import config
from vmware_nsx.neutron.plugins.vmware.common import config as nsx_config # noqa from vmware_nsx.common import config as nsx_config # noqa
from vmware_nsx.neutron.plugins.vmware.common import nsx_utils from vmware_nsx.common import nsx_utils
from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx import nsxlib
config.setup_logging() config.setup_logging()

View File

@ -17,7 +17,7 @@ import logging
from oslo_config import cfg from oslo_config import cfg
from neutron.i18n import _LW from neutron.i18n import _LW
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -21,16 +21,16 @@ from neutron.i18n import _LW
from oslo_log import log from oslo_log import log
import six import six
from vmware_nsx.neutron.plugins.vmware.api_client import client from vmware_nsx.api_client import client
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import utils as vmw_utils from vmware_nsx.common import utils as vmw_utils
from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db from vmware_nsx.db import db as nsx_db
from vmware_nsx.neutron.plugins.vmware.dbexts import networkgw_db from vmware_nsx.db import networkgw_db
from vmware_nsx.neutron.plugins.vmware import nsx_cluster from vmware_nsx import nsx_cluster
from vmware_nsx.neutron.plugins.vmware.nsxlib import l2gateway as l2gwlib from vmware_nsx.nsxlib import l2gateway as l2gwlib
from vmware_nsx.neutron.plugins.vmware.nsxlib import router as routerlib from vmware_nsx.nsxlib import router as routerlib
from vmware_nsx.neutron.plugins.vmware.nsxlib import secgroup as secgrouplib from vmware_nsx.nsxlib import secgroup as secgrouplib
from vmware_nsx.neutron.plugins.vmware.nsxlib import switch as switchlib from vmware_nsx.nsxlib import switch as switchlib
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)

View File

@ -16,7 +16,7 @@
from oslo_log import log from oslo_log import log
import six import six
from vmware_nsx.neutron.plugins.vmware.common import nsx_utils from vmware_nsx.common import nsx_utils
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
# Protocol number look up for supported protocols # Protocol number look up for supported protocols

View File

@ -30,12 +30,12 @@ from neutron.db import models_v2
from neutron.extensions import l3 from neutron.extensions import l3
from neutron.i18n import _LE, _LI, _LW from neutron.i18n import _LE, _LI, _LW
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import nsx_utils from vmware_nsx.common import nsx_utils
from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx import nsxlib
from vmware_nsx.neutron.plugins.vmware.nsxlib import router as routerlib from vmware_nsx.nsxlib import router as routerlib
from vmware_nsx.neutron.plugins.vmware.nsxlib import switch as switchlib from vmware_nsx.nsxlib import switch as switchlib
# Maximum page size for a single request # Maximum page size for a single request
# NOTE(salv-orlando): This might become a version-dependent map should the # NOTE(salv-orlando): This might become a version-dependent map should the

View File

@ -21,8 +21,8 @@ from sqlalchemy.orm import exc
import neutron.db.api as db import neutron.db.api as db
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models from vmware_nsx.db import nsx_models
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -15,7 +15,7 @@
# #
from neutron.extensions import dvr as dist_rtr from neutron.extensions import dvr as dist_rtr
from vmware_nsx.neutron.plugins.vmware.dbexts import nsxrouter from vmware_nsx.db import nsxrouter
class DistributedRouter_mixin(nsxrouter.NsxRouterMixin): class DistributedRouter_mixin(nsxrouter.NsxRouterMixin):

View File

@ -19,8 +19,8 @@ from oslo_db import exception as d_exc
from oslo_log import log as logging from oslo_log import log as logging
from sqlalchemy import orm from sqlalchemy import orm
from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc from vmware_nsx.common import exceptions as p_exc
from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models from vmware_nsx.db import nsx_models
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -20,8 +20,8 @@ from neutron.db import db_base_plugin_v2
from oslo_log import log as logging from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models from vmware_nsx.db import nsx_models
from vmware_nsx.neutron.plugins.vmware.extensions import maclearning as mac from vmware_nsx.extensions import maclearning as mac
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -14,9 +14,9 @@
from neutron.db.migration.models import head from neutron.db.migration.models import head
from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models # noqa from vmware_nsx.db import nsx_models # noqa
from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_models # noqa from vmware_nsx.db import nsxv_models # noqa
from vmware_nsx.neutron.plugins.vmware.dbexts import vcns_models # noqa from vmware_nsx.db import vcns_models # noqa
def get_metadata(): def get_metadata():

View File

@ -21,8 +21,8 @@ from oslo_log import log as logging
from oslo_utils import uuidutils from oslo_utils import uuidutils
import six import six
from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models from vmware_nsx.db import nsx_models
from vmware_nsx.neutron.plugins.vmware.extensions import networkgw from vmware_nsx.extensions import networkgw
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
DEVICE_OWNER_NET_GW_INTF = 'network:gateway-interface' DEVICE_OWNER_NET_GW_INTF = 'network:gateway-interface'

View File

@ -17,7 +17,7 @@ from neutron.db import db_base_plugin_v2
from neutron.extensions import l3 from neutron.extensions import l3
from oslo_log import log as logging from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_models from vmware_nsx.db import nsxv_models
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -24,10 +24,10 @@ from sqlalchemy.sql import expression as expr
from neutron.i18n import _, _LE from neutron.i18n import _, _LE
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import nsxv_constants from vmware_nsx.common import nsxv_constants
from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_models from vmware_nsx.db import nsxv_models
from vmware_nsx.neutron.plugins.vmware.vshield.common import constants from vmware_nsx.vshield.common import constants
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -22,7 +22,7 @@ from neutron.db import l3_db
from neutron.db import model_base from neutron.db import model_base
from neutron.db import models_v2 from neutron.db import models_v2
from vmware_nsx.neutron.plugins.vmware.common import nsxv_constants from vmware_nsx.common import nsxv_constants
class NsxvRouterBinding(model_base.BASEV2, models_v2.HasStatusDescription): class NsxvRouterBinding(model_base.BASEV2, models_v2.HasStatusDescription):

View File

@ -23,8 +23,8 @@ from neutron.i18n import _LI
from oslo_log import log from oslo_log import log
from oslo_utils import uuidutils from oslo_utils import uuidutils
from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models from vmware_nsx.db import nsx_models
from vmware_nsx.neutron.plugins.vmware.extensions import qos from vmware_nsx.extensions import qos
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)

View File

@ -14,9 +14,9 @@
# under the License. # under the License.
# #
from vmware_nsx.neutron.plugins.vmware.dbexts import ( from vmware_nsx.db import (
distributedrouter as dist_rtr) distributedrouter as dist_rtr)
from vmware_nsx.neutron.plugins.vmware.extensions import routertype as rt_rtr from vmware_nsx.extensions import routertype as rt_rtr
class RouterType_mixin(dist_rtr.DistributedRouter_mixin): class RouterType_mixin(dist_rtr.DistributedRouter_mixin):

View File

@ -20,8 +20,8 @@ from neutron.db import db_base_plugin_v2
from oslo_log import log as logging from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_models from vmware_nsx.db import nsxv_models
from vmware_nsx.neutron.plugins.vmware.extensions import vnicindex as vnicidx from vmware_nsx.extensions import vnicindex as vnicidx
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -18,8 +18,8 @@
from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
from neutron.common import constants as const from neutron.common import constants as const
from neutron.common import topics from neutron.common import topics
from vmware_nsx.neutron.plugins.vmware.dhcp_meta import nsx as nsx_svc from vmware_nsx.dhcp_meta import nsx as nsx_svc
from vmware_nsx.neutron.plugins.vmware.dhcp_meta import rpc as nsx_rpc from vmware_nsx.dhcp_meta import rpc as nsx_rpc
class DhcpAgentNotifyAPI(dhcp_rpc_agent_api.DhcpAgentNotifyAPI): class DhcpAgentNotifyAPI(dhcp_rpc_agent_api.DhcpAgentNotifyAPI):

View File

@ -22,13 +22,13 @@ from oslo_log import log as logging
from oslo_utils import excutils from oslo_utils import excutils
from neutron.i18n import _LE, _LW from neutron.i18n import _LE, _LW
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc from vmware_nsx.common import exceptions as p_exc
from vmware_nsx.neutron.plugins.vmware.common import nsx_utils from vmware_nsx.common import nsx_utils
from vmware_nsx.neutron.plugins.vmware.dbexts import lsn_db from vmware_nsx.db import lsn_db
from vmware_nsx.neutron.plugins.vmware.dhcp_meta import constants as const from vmware_nsx.dhcp_meta import constants as const
from vmware_nsx.neutron.plugins.vmware.nsxlib import lsn as lsn_api from vmware_nsx.nsxlib import lsn as lsn_api
from vmware_nsx.neutron.plugins.vmware.nsxlib import switch as switch_api from vmware_nsx.nsxlib import switch as switch_api
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -21,9 +21,9 @@ from neutron.extensions import external_net
from oslo_log import log as logging from oslo_log import log as logging
from neutron.i18n import _LE from neutron.i18n import _LE
from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc from vmware_nsx.common import exceptions as p_exc
from vmware_nsx.neutron.plugins.vmware.dhcp_meta import nsx from vmware_nsx.dhcp_meta import nsx
from vmware_nsx.neutron.plugins.vmware.dhcp_meta import rpc from vmware_nsx.dhcp_meta import rpc
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -26,9 +26,9 @@ from neutron.db import db_base_plugin_v2
from neutron.db import l3_db from neutron.db import l3_db
from neutron.extensions import external_net from neutron.extensions import external_net
from neutron.i18n import _LE, _LI from neutron.i18n import _LE, _LI
from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc from vmware_nsx.common import exceptions as p_exc
from vmware_nsx.neutron.plugins.vmware.dhcp_meta import constants as d_const from vmware_nsx.dhcp_meta import constants as d_const
from vmware_nsx.neutron.plugins.vmware.nsxlib import lsn as lsn_api from vmware_nsx.nsxlib import lsn as lsn_api
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -26,9 +26,9 @@ from neutron.common import exceptions as ntn_exc
from neutron.db import db_base_plugin_v2 from neutron.db import db_base_plugin_v2
from neutron.db import models_v2 from neutron.db import models_v2
from neutron.i18n import _LE, _LI, _LW from neutron.i18n import _LE, _LI, _LW
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import config from vmware_nsx.common import config
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -29,14 +29,14 @@ from neutron.common import topics
from neutron.db import agents_db from neutron.db import agents_db
from neutron.i18n import _LW from neutron.i18n import _LW
from vmware_nsx.neutron.plugins.vmware.common import config from vmware_nsx.common import config
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.dhcp_meta import combined from vmware_nsx.dhcp_meta import combined
from vmware_nsx.neutron.plugins.vmware.dhcp_meta import lsnmanager from vmware_nsx.dhcp_meta import lsnmanager
from vmware_nsx.neutron.plugins.vmware.dhcp_meta import migration from vmware_nsx.dhcp_meta import migration
from vmware_nsx.neutron.plugins.vmware.dhcp_meta import nsx as nsx_svc from vmware_nsx.dhcp_meta import nsx as nsx_svc
from vmware_nsx.neutron.plugins.vmware.dhcp_meta import rpc as nsx_rpc from vmware_nsx.dhcp_meta import rpc as nsx_rpc
from vmware_nsx.neutron.plugins.vmware.extensions import lsn from vmware_nsx.extensions import lsn
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -18,8 +18,8 @@ from oslo_utils import excutils
from oslo_vmware import vim_util from oslo_vmware import vim_util
from neutron.i18n import _LE, _LI from neutron.i18n import _LE, _LI
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.dvs import dvs_utils from vmware_nsx.dvs import dvs_utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -17,7 +17,7 @@
# TODO(arosen): This is deprecated in Juno, and # TODO(arosen): This is deprecated in Juno, and
# to be removed in Kxxxx. # to be removed in Kxxxx.
from vmware_nsx.neutron.plugins.vmware.extensions import qos from vmware_nsx.extensions import qos
class Nvp_qos(qos.Qos): class Nvp_qos(qos.Qos):

View File

@ -1,3 +0,0 @@
import os
NSX_EXT_PATH = os.path.join(os.path.dirname(__file__), 'extensions')

View File

@ -18,7 +18,7 @@ from oslo_log import log as logging
import six import six
from neutron.i18n import _LI from neutron.i18n import _LI
from vmware_nsx.neutron.plugins.vmware.common import exceptions from vmware_nsx.common import exceptions
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
DEFAULT_PORT = 443 DEFAULT_PORT = 443

View File

@ -19,8 +19,8 @@ from oslo_log import log
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
import six import six
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
HTTP_GET = "GET" HTTP_GET = "GET"
HTTP_POST = "POST" HTTP_POST = "POST"

View File

@ -18,11 +18,11 @@ from neutron.i18n import _LE
from oslo_log import log from oslo_log import log
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.common import utils
from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx import nsxlib
from vmware_nsx.neutron.plugins.vmware.nsxlib import switch from vmware_nsx.nsxlib import switch
HTTP_GET = "GET" HTTP_GET = "GET"
HTTP_POST = "POST" HTTP_POST = "POST"

View File

@ -18,10 +18,10 @@ from oslo_log import log
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
import six import six
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.common import utils
from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx import nsxlib
HTTP_GET = "GET" HTTP_GET = "GET"
HTTP_POST = "POST" HTTP_POST = "POST"

View File

@ -20,9 +20,9 @@ from oslo_serialization import jsonutils
from oslo_utils import excutils from oslo_utils import excutils
import six import six
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.common import utils
from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx import nsxlib
HTTP_POST = "POST" HTTP_POST = "POST"
HTTP_DELETE = "DELETE" HTTP_DELETE = "DELETE"

View File

@ -21,12 +21,12 @@ from oslo_utils import excutils
import six import six
from neutron.i18n import _LE, _LI, _LW from neutron.i18n import _LE, _LI, _LW
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.common import utils
from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx import nsxlib
from vmware_nsx.neutron.plugins.vmware.nsxlib import switch from vmware_nsx.nsxlib import switch
from vmware_nsx.neutron.plugins.vmware.nsxlib import versioning from vmware_nsx.nsxlib import versioning
# @versioning.versioned decorator makes the apparent function body # @versioning.versioned decorator makes the apparent function body
# totally unrelated to the real function. This confuses pylint :( # totally unrelated to the real function. This confuses pylint :(

View File

@ -21,8 +21,8 @@ from neutron.common import constants
from neutron.common import exceptions from neutron.common import exceptions
from neutron.i18n import _LW from neutron.i18n import _LW
from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.common import utils
from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx import nsxlib
HTTP_GET = "GET" HTTP_GET = "GET"
HTTP_POST = "POST" HTTP_POST = "POST"

View File

@ -22,10 +22,10 @@ from neutron.common import constants
from neutron.common import exceptions as exception from neutron.common import exceptions as exception
from neutron.i18n import _LE, _LI, _LW from neutron.i18n import _LE, _LI, _LW
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.common import utils
from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx import nsxlib
HTTP_GET = "GET" HTTP_GET = "GET"
HTTP_POST = "POST" HTTP_POST = "POST"

View File

@ -18,10 +18,10 @@ from oslo_log import log
from neutron.i18n import _LW from neutron.i18n import _LW
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import nsx_constants from vmware_nsx.common import nsx_constants
from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.common import utils
from vmware_nsx.neutron.plugins.vmware.nsxlib.v3 import client from vmware_nsx.nsxlib.v3 import client
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)

View File

@ -20,7 +20,7 @@ import requests
from requests import auth from requests import auth
from neutron.i18n import _LW from neutron.i18n import _LW
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)

View File

@ -18,9 +18,9 @@
NSX-V3 Distributed Firewall NSX-V3 Distributed Firewall
""" """
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.common import utils
from vmware_nsx.neutron.plugins.vmware.nsxlib.v3 import client as nsclient from vmware_nsx.nsxlib.v3 import client as nsclient
# firewall section types # firewall section types

View File

@ -23,8 +23,8 @@ from neutron.common import exceptions as n_exc
from neutron.i18n import _LW from neutron.i18n import _LW
from oslo_log import log from oslo_log import log
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.nsxlib import v3 as nsxlib from vmware_nsx.nsxlib import v3 as nsxlib
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)

View File

@ -20,8 +20,8 @@ NSX-V3 Plugin security integration module
from neutron.db import securitygroups_db from neutron.db import securitygroups_db
from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models from vmware_nsx.db import nsx_models
from vmware_nsx.neutron.plugins.vmware.nsxlib.v3 import dfw_api as firewall from vmware_nsx.nsxlib.v3 import dfw_api as firewall
NSGROUP_CONTAINER = 'NSGroup Container' NSGROUP_CONTAINER = 'NSGroup Container'

View File

@ -15,7 +15,7 @@
import inspect import inspect
from vmware_nsx.neutron.plugins.vmware.api_client import exception from vmware_nsx.api_client import exception
DEFAULT_VERSION = -1 DEFAULT_VERSION = -1

View File

@ -15,10 +15,10 @@
# under the License. # under the License.
# #
from vmware_nsx.neutron.plugins.vmware.plugins import base from vmware_nsx.plugins import base
from vmware_nsx.neutron.plugins.vmware.plugins import dvs from vmware_nsx.plugins import dvs
from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v from vmware_nsx.plugins import nsx_v
from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v3_plugin from vmware_nsx.plugins import nsx_v3_plugin
NsxPlugin = base.NsxPluginV2 NsxPlugin = base.NsxPluginV2
NsxVPlugin = nsx_v.NsxVPluginV2 NsxVPlugin = nsx_v.NsxVPluginV2

View File

@ -59,28 +59,28 @@ from neutron.i18n import _LE, _LI, _LW
from neutron.plugins.common import constants as plugin_const from neutron.plugins.common import constants as plugin_const
from neutron.plugins.common import utils from neutron.plugins.common import utils
from vmware_nsx.neutron.plugins import vmware import vmware_nsx
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import config # noqa from vmware_nsx.common import config # noqa
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import nsx_utils from vmware_nsx.common import nsx_utils
from vmware_nsx.neutron.plugins.vmware.common import securitygroups as sg_utils from vmware_nsx.common import securitygroups as sg_utils
from vmware_nsx.neutron.plugins.vmware.common import sync from vmware_nsx.common import sync
from vmware_nsx.neutron.plugins.vmware.common import utils as c_utils from vmware_nsx.common import utils as c_utils
from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db from vmware_nsx.db import db as nsx_db
from vmware_nsx.neutron.plugins.vmware.dbexts import maclearning as mac_db from vmware_nsx.db import maclearning as mac_db
from vmware_nsx.neutron.plugins.vmware.dbexts import networkgw_db from vmware_nsx.db import networkgw_db
from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models from vmware_nsx.db import nsx_models
from vmware_nsx.neutron.plugins.vmware.dbexts import qos_db from vmware_nsx.db import qos_db
from vmware_nsx.neutron.plugins.vmware import dhcpmeta_modes from vmware_nsx import dhcpmeta_modes
from vmware_nsx.neutron.plugins.vmware.extensions import maclearning as mac_ext from vmware_nsx.extensions import maclearning as mac_ext
from vmware_nsx.neutron.plugins.vmware.extensions import networkgw from vmware_nsx.extensions import networkgw
from vmware_nsx.neutron.plugins.vmware.extensions import qos from vmware_nsx.extensions import qos
from vmware_nsx.neutron.plugins.vmware.nsxlib import l2gateway as l2gwlib from vmware_nsx.nsxlib import l2gateway as l2gwlib
from vmware_nsx.neutron.plugins.vmware.nsxlib import queue as queuelib from vmware_nsx.nsxlib import queue as queuelib
from vmware_nsx.neutron.plugins.vmware.nsxlib import router as routerlib from vmware_nsx.nsxlib import router as routerlib
from vmware_nsx.neutron.plugins.vmware.nsxlib import secgroup as secgrouplib from vmware_nsx.nsxlib import secgroup as secgrouplib
from vmware_nsx.neutron.plugins.vmware.nsxlib import switch as switchlib from vmware_nsx.nsxlib import switch as switchlib
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -165,7 +165,8 @@ class NsxPluginV2(addr_pair_db.AllowedAddressPairsMixin,
'default': self._nsx_delete_port} 'default': self._nsx_delete_port}
} }
neutron_extensions.append_api_extensions_path([vmware.NSX_EXT_PATH]) neutron_extensions.append_api_extensions_path(
[vmware_nsx.NSX_EXT_PATH])
self.nsx_opts = cfg.CONF.NSX self.nsx_opts = cfg.CONF.NSX
self.nsx_sync_opts = cfg.CONF.NSX_SYNC self.nsx_sync_opts = cfg.CONF.NSX_SYNC
self.cluster = nsx_utils.create_nsx_cluster( self.cluster = nsx_utils.create_nsx_cluster(

View File

@ -39,15 +39,15 @@ from neutron.i18n import _LE, _LW
from neutron.plugins.common import constants from neutron.plugins.common import constants
from neutron.plugins.common import utils from neutron.plugins.common import utils
from vmware_nsx.neutron.plugins import vmware import vmware_nsx
from vmware_nsx.neutron.plugins.vmware.common import config # noqa from vmware_nsx.common import config # noqa
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import nsx_constants from vmware_nsx.common import nsx_constants
from vmware_nsx.neutron.plugins.vmware.common import utils as c_utils from vmware_nsx.common import utils as c_utils
from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db from vmware_nsx.db import db as nsx_db
from vmware_nsx.neutron.plugins.vmware import dhcpmeta_modes from vmware_nsx import dhcpmeta_modes
from vmware_nsx.neutron.plugins.vmware.dvs import dvs from vmware_nsx.dvs import dvs
from vmware_nsx.neutron.plugins.vmware.dvs import dvs_utils from vmware_nsx.dvs import dvs_utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -80,7 +80,8 @@ class NsxDvsV2(addr_pair_db.AllowedAddressPairsMixin,
super(NsxDvsV2, self).__init__() super(NsxDvsV2, self).__init__()
config.validate_config_options() config.validate_config_options()
LOG.debug('Driver support: DVS: %s' % dvs_utils.dvs_is_enabled()) LOG.debug('Driver support: DVS: %s' % dvs_utils.dvs_is_enabled())
neutron_extensions.append_api_extensions_path([vmware.NSX_EXT_PATH]) neutron_extensions.append_api_extensions_path(
[vmware_nsx.NSX_EXT_PATH])
self._dvs = dvs.DvsManager() self._dvs = dvs.DvsManager()
# Common driver code # Common driver code

View File

@ -19,7 +19,7 @@ import stevedore
from oslo_log import log from oslo_log import log
from neutron.i18n import _LE, _LI from neutron.i18n import _LE, _LI
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
ROUTER_TYPE_DRIVERS = ["distributed", "exclusive", "shared"] ROUTER_TYPE_DRIVERS = ["distributed", "exclusive", "shared"]

View File

@ -50,30 +50,30 @@ from neutron.i18n import _LE, _LI, _LW
from neutron.plugins.common import constants as plugin_const from neutron.plugins.common import constants as plugin_const
from neutron.plugins.common import utils from neutron.plugins.common import utils
from vmware_nsx.neutron.plugins import vmware import vmware_nsx
from vmware_nsx.neutron.plugins.vmware.common import config # noqa from vmware_nsx.common import config # noqa
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import locking from vmware_nsx.common import locking
from vmware_nsx.neutron.plugins.vmware.common import nsx_constants from vmware_nsx.common import nsx_constants
from vmware_nsx.neutron.plugins.vmware.common import utils as c_utils from vmware_nsx.common import utils as c_utils
from vmware_nsx.neutron.plugins.vmware.dbexts import ( from vmware_nsx.db import (
routertype as rt_rtr) routertype as rt_rtr)
from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db from vmware_nsx.db import db as nsx_db
from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db from vmware_nsx.db import nsxv_db
from vmware_nsx.neutron.plugins.vmware.dbexts import vnic_index_db from vmware_nsx.db import vnic_index_db
from vmware_nsx.neutron.plugins.vmware.extensions import ( from vmware_nsx.extensions import (
advancedserviceproviders as as_providers) advancedserviceproviders as as_providers)
from vmware_nsx.neutron.plugins.vmware.extensions import ( from vmware_nsx.extensions import (
vnicindex as ext_vnic_idx) vnicindex as ext_vnic_idx)
from vmware_nsx.neutron.plugins.vmware.plugins import managers from vmware_nsx.plugins import managers
from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v_md_proxy from vmware_nsx.plugins import nsx_v_md_proxy
from vmware_nsx.neutron.plugins.vmware.vshield.common import ( from vmware_nsx.vshield.common import (
constants as vcns_const) constants as vcns_const)
from vmware_nsx.neutron.plugins.vmware.vshield.common import ( from vmware_nsx.vshield.common import (
exceptions as vsh_exc) exceptions as vsh_exc)
from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils from vmware_nsx.vshield import edge_utils
from vmware_nsx.neutron.plugins.vmware.vshield import securitygroup_utils from vmware_nsx.vshield import securitygroup_utils
from vmware_nsx.neutron.plugins.vmware.vshield import vcns_driver from vmware_nsx.vshield import vcns_driver
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
PORTGROUP_PREFIX = 'dvportgroup' PORTGROUP_PREFIX = 'dvportgroup'
@ -114,7 +114,8 @@ class NsxVPluginV2(agents_db.AgentDbMixin,
super(NsxVPluginV2, self).__init__() super(NsxVPluginV2, self).__init__()
self.metadata_proxy_handler = None self.metadata_proxy_handler = None
config.validate_nsxv_config_options() config.validate_nsxv_config_options()
neutron_extensions.append_api_extensions_path([vmware.NSX_EXT_PATH]) neutron_extensions.append_api_extensions_path(
[vmware_nsx.NSX_EXT_PATH])
self.base_binding_dict = { self.base_binding_dict = {
pbin.VNIC_TYPE: pbin.VNIC_NORMAL, pbin.VNIC_TYPE: pbin.VNIC_NORMAL,

View File

@ -56,15 +56,15 @@ from neutron.i18n import _LE, _LI, _LW
from neutron.plugins.common import constants as plugin_const from neutron.plugins.common import constants as plugin_const
from neutron.plugins.common import utils as n_utils from neutron.plugins.common import utils as n_utils
from vmware_nsx.neutron.plugins.vmware.common import config # noqa from vmware_nsx.common import config # noqa
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import nsx_constants from vmware_nsx.common import nsx_constants
from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.common import utils
from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db from vmware_nsx.db import db as nsx_db
from vmware_nsx.neutron.plugins.vmware.nsxlib import v3 as nsxlib from vmware_nsx.nsxlib import v3 as nsxlib
from vmware_nsx.neutron.plugins.vmware.nsxlib.v3 import dfw_api as firewall from vmware_nsx.nsxlib.v3 import dfw_api as firewall
from vmware_nsx.neutron.plugins.vmware.nsxlib.v3 import router as routerlib from vmware_nsx.nsxlib.v3 import router as routerlib
from vmware_nsx.neutron.plugins.vmware.nsxlib.v3 import security from vmware_nsx.nsxlib.v3 import security
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)

View File

@ -20,13 +20,13 @@ from neutron.common import exceptions as n_exc
from neutron.db import l3_db from neutron.db import l3_db
from neutron.i18n import _LE from neutron.i18n import _LE
from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db from vmware_nsx.db import nsxv_db
from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v from vmware_nsx.plugins import nsx_v
from vmware_nsx.neutron.plugins.vmware.plugins.nsx_v_drivers import ( from vmware_nsx.plugins.nsx_v_drivers import (
abstract_router_driver as router_driver) abstract_router_driver as router_driver)
from vmware_nsx.neutron.plugins.vmware.vshield.common import ( from vmware_nsx.vshield.common import (
constants as vcns_const) constants as vcns_const)
from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils from vmware_nsx.vshield import edge_utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
METADATA_CIDR = '169.254.169.254/32' METADATA_CIDR = '169.254.169.254/32'

View File

@ -16,13 +16,13 @@ from oslo_log import log as logging
from neutron.api.v2 import attributes as attr from neutron.api.v2 import attributes as attr
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsxv_exc from vmware_nsx.common import exceptions as nsxv_exc
from vmware_nsx.neutron.plugins.vmware.common import locking from vmware_nsx.common import locking
from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db from vmware_nsx.db import nsxv_db
from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v from vmware_nsx.plugins import nsx_v
from vmware_nsx.neutron.plugins.vmware.plugins.nsx_v_drivers import ( from vmware_nsx.plugins.nsx_v_drivers import (
abstract_router_driver as router_driver) abstract_router_driver as router_driver)
from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils from vmware_nsx.vshield import edge_utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -19,17 +19,17 @@ from neutron.api.v2 import attributes as attr
from neutron.db import l3_db from neutron.db import l3_db
from neutron.db import models_v2 from neutron.db import models_v2
from oslo_log import log as logging from oslo_log import log as logging
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import locking from vmware_nsx.common import locking
from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db from vmware_nsx.db import nsxv_db
from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_models from vmware_nsx.db import nsxv_models
from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v from vmware_nsx.plugins import nsx_v
from vmware_nsx.neutron.plugins.vmware.plugins.nsx_v_drivers import ( from vmware_nsx.plugins.nsx_v_drivers import (
abstract_router_driver as router_driver) abstract_router_driver as router_driver)
from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v_md_proxy from vmware_nsx.plugins import nsx_v_md_proxy
from vmware_nsx.neutron.plugins.vmware.vshield.common import ( from vmware_nsx.vshield.common import (
constants as vcns_const) constants as vcns_const)
from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils from vmware_nsx.vshield import edge_utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -25,15 +25,15 @@ from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from neutron.i18n import _LE from neutron.i18n import _LE
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsxv_exc from vmware_nsx.common import exceptions as nsxv_exc
from vmware_nsx.neutron.plugins.vmware.common import locking from vmware_nsx.common import locking
from vmware_nsx.neutron.plugins.vmware.common import nsxv_constants from vmware_nsx.common import nsxv_constants
from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db from vmware_nsx.db import nsxv_db
from vmware_nsx.neutron.plugins.vmware.vshield import ( from vmware_nsx.vshield import (
nsxv_loadbalancer as nsxv_lb) nsxv_loadbalancer as nsxv_lb)
from vmware_nsx.neutron.plugins.vmware.vshield.common import ( from vmware_nsx.vshield.common import (
constants as vcns_const) constants as vcns_const)
from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils from vmware_nsx.vshield import edge_utils
METADATA_VSE_NAME = 'MdSrv' METADATA_VSE_NAME = 'MdSrv'
METADATA_IP_ADDR = '169.254.169.254' METADATA_IP_ADDR = '169.254.169.254'

View File

@ -34,11 +34,11 @@ from neutron.i18n import _LE, _LI
from neutron import manager from neutron import manager
from neutron.plugins.common import utils as n_utils from neutron.plugins.common import utils as n_utils
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import nsx_constants from vmware_nsx.common import nsx_constants
from vmware_nsx.neutron.plugins.vmware.common import utils as nsx_utils from vmware_nsx.common import utils as nsx_utils
from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db from vmware_nsx.db import db as nsx_db
from vmware_nsx.neutron.plugins.vmware.nsxlib import v3 as nsxlib from vmware_nsx.nsxlib import v3 as nsxlib
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -21,7 +21,7 @@ from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import importutils from oslo_utils import importutils
from vmware_nsx.neutron.plugins.vmware.common import config # noqa from vmware_nsx.common import config # noqa
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -22,8 +22,8 @@ from neutron.i18n import _LE, _LI
from neutron.objects.qos import policy as policy_object from neutron.objects.qos import policy as policy_object
from neutron.services.qos import qos_plugin from neutron.services.qos import qos_plugin
from vmware_nsx.neutron.plugins.vmware.common import utils from vmware_nsx.common import utils
from vmware_nsx.neutron.plugins.vmware.nsxlib import v3 as nsxlib from vmware_nsx.nsxlib import v3 as nsxlib
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -17,7 +17,7 @@
import sys import sys
from neutronclient import shell from neutronclient import shell
from vmware_nsx.neutron.plugins.vmware.shell import commands as cmd from vmware_nsx.shell import commands as cmd
class NsxManage(shell.NeutronShell): class NsxManage(shell.NeutronShell):

View File

@ -18,15 +18,15 @@ import os
from networking_l2gw.db.l2gateway import l2gateway_models # noqa from networking_l2gw.db.l2gateway import l2gateway_models # noqa
from vmware_nsx.neutron.plugins.vmware.api_client import client as nsx_client from vmware_nsx.api_client import client as nsx_client
from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_client from vmware_nsx.api_client import eventlet_client
from vmware_nsx.neutron.plugins.vmware import extensions from vmware_nsx import extensions
import vmware_nsx.neutron.plugins.vmware.plugin as neutron_plugin import vmware_nsx.plugin as neutron_plugin
from vmware_nsx.neutron.plugins.vmware.vshield.common import ( from vmware_nsx.vshield.common import (
VcnsApiClient as vcnsapi) VcnsApiClient as vcnsapi)
from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils from vmware_nsx.vshield import edge_utils
from vmware_nsx.neutron.plugins.vmware.vshield import vcns from vmware_nsx.vshield import vcns
import vmware_nsx.neutron.plugins.vmware.vshield.vcns_driver as vcnsdriver import vmware_nsx.vshield.vcns_driver as vcnsdriver
plugin = neutron_plugin.NsxPlugin plugin = neutron_plugin.NsxPlugin
@ -54,5 +54,5 @@ def get_fake_conf(filename):
def nsx_method(method_name, module_name='nsxlib'): def nsx_method(method_name, module_name='nsxlib'):
return '%s.%s.%s' % ('vmware_nsx.neutron.plugins.vmware', module_name, return '%s.%s.%s' % ('vmware_nsx', module_name,
method_name) method_name)

View File

@ -18,7 +18,7 @@ from oslo_utils import uuidutils
import six import six
import six.moves.urllib.parse as urlparse import six.moves.urllib.parse as urlparse
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.api_client import exception as api_exc
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -18,7 +18,7 @@
from neutron.tests import base from neutron.tests import base
from six.moves import http_client as httplib from six.moves import http_client as httplib
from vmware_nsx.neutron.plugins.vmware import api_client from vmware_nsx import api_client
class ApiCommonTest(base.BaseTestCase): class ApiCommonTest(base.BaseTestCase):

View File

@ -23,9 +23,9 @@ from oslo_log import log as logging
from six.moves import http_client as httplib from six.moves import http_client as httplib
from vmware_nsx.neutron.plugins.vmware.api_client import ( from vmware_nsx.api_client import (
eventlet_client as client) eventlet_client as client)
from vmware_nsx.neutron.plugins.vmware.api_client import ( from vmware_nsx.api_client import (
eventlet_request as request) eventlet_request as request)
from vmware_nsx.tests.unit import vmware from vmware_nsx.tests.unit import vmware

View File

@ -17,9 +17,9 @@ from neutron import context
from neutron.tests.unit import testlib_api from neutron.tests.unit import testlib_api
from sqlalchemy import orm from sqlalchemy import orm
from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc from vmware_nsx.common import exceptions as p_exc
from vmware_nsx.neutron.plugins.vmware.dbexts import lsn_db from vmware_nsx.db import lsn_db
from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models from vmware_nsx.db import nsx_models
class LSNTestCase(testlib_api.SqlTestCase): class LSNTestCase(testlib_api.SqlTestCase):

View File

@ -18,8 +18,8 @@ from neutron.db import models_v2
from neutron.tests.unit import testlib_api from neutron.tests.unit import testlib_api
from oslo_db import exception as d_exc from oslo_db import exception as d_exc
from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db from vmware_nsx.db import db as nsx_db
from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models from vmware_nsx.db import nsx_models
class NsxDBTestCase(testlib_api.SqlTestCase): class NsxDBTestCase(testlib_api.SqlTestCase):

Some files were not shown because too many files have changed in this diff Show More