x/vmware-nsx
Code Issues Proposed changes

TVD: add in DVS extenion_driver support

Browse Source 
Ensure that we are able to support DVS extension_drivers

Change-Id: I4a5323bcd035dd3c7b074024b906c0bfa16788c4
This commit is contained in:
Gary Kotton 2017-12-19 02:37:51 -08:00
parent bc888c65b9
commit cfb24ec003
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/lib/vmware_nsx_tvd
View File

@ -161,6 +161,7 @@ function neutron_plugin_configure_service {
nsxv_configure_service nsxv_configure_service
iniset /$Q_PLUGIN_CONF_FILE nsx_tvd nsx_v_extension_drivers vmware_nsxv_dns iniset /$Q_PLUGIN_CONF_FILE nsx_tvd nsx_v_extension_drivers vmware_nsxv_dns
iniset /$Q_PLUGIN_CONF_FILE nsx_tvd nsx_v3_extension_drivers vmware_nsxv3_dns iniset /$Q_PLUGIN_CONF_FILE nsx_tvd nsx_v3_extension_drivers vmware_nsxv3_dns
iniset /$Q_PLUGIN_CONF_FILE nsx_tvd dvs_extension_drivers vmware_dvs_dns
iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_availability_zones $NSX_DEFAULT_AZ iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_availability_zones $NSX_DEFAULT_AZ
} }

5
vmware_nsx/common/config.py
View File

@ -824,6 +824,11 @@ nsx_tvd_opts = [
help=_("An ordered list of NSX-T extension driver " help=_("An ordered list of NSX-T extension driver "
"entrypoints to be loaded from the " "entrypoints to be loaded from the "
"vmware_nsx.extension_drivers namespace.")), "vmware_nsx.extension_drivers namespace.")),
cfg.ListOpt('dvs_extension_drivers',
default=[],
help=_("An ordered list of DVS extension driver "
"entrypoints to be loaded from the "
"vmware_nsx.extension_drivers namespace.")),
] ]
# Register the configuration options # Register the configuration options

10
vmware_nsx/plugins/dvs/plugin.py
View File

@ -20,6 +20,7 @@ from neutron_lib.api.definitions import port as port_def
from neutron_lib.api.definitions import port_security as psec from neutron_lib.api.definitions import port_security as psec
from neutron_lib.exceptions import allowedaddresspairs as addr_exc from neutron_lib.exceptions import allowedaddresspairs as addr_exc
from neutron_lib.exceptions import port_security as psec_exc from neutron_lib.exceptions import port_security as psec_exc
from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import excutils from oslo_utils import excutils
@ -63,6 +64,7 @@ from vmware_nsx.dvs import dvs
from vmware_nsx.dvs import dvs_utils from vmware_nsx.dvs import dvs_utils
from vmware_nsx.extensions import projectpluginmap from vmware_nsx.extensions import projectpluginmap
from vmware_nsx.plugins.common import plugin as nsx_plugin_common from vmware_nsx.plugins.common import plugin as nsx_plugin_common
from vmware_nsx.plugins.nsx import utils as tvd_utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -103,9 +105,15 @@ class NsxDvsV2(addr_pair_db.AllowedAddressPairsMixin,
security_group=securitygroup_model.SecurityGroup, security_group=securitygroup_model.SecurityGroup,
security_group_rule=securitygroup_model.SecurityGroupRule) security_group_rule=securitygroup_model.SecurityGroupRule)
def __init__(self): def __init__(self):
self._is_sub_plugin = tvd_utils.is_tvd_core_plugin()
dvs_utils.dvs_register_exceptions() dvs_utils.dvs_register_exceptions()
self._extension_manager = nsx_managers.ExtensionManager()
super(NsxDvsV2, self).__init__() super(NsxDvsV2, self).__init__()
if self._is_sub_plugin:
extension_drivers = cfg.CONF.nsx_tvd.dvs_extension_drivers
else:
extension_drivers = cfg.CONF.nsx_extension_drivers
self._extension_manager = nsx_managers.ExtensionManager(
extension_drivers=extension_drivers)
LOG.debug('Driver support: DVS: %s' % dvs_utils.dvs_is_enabled()) LOG.debug('Driver support: DVS: %s' % dvs_utils.dvs_is_enabled())
self._extension_manager.initialize() self._extension_manager.initialize()
self.supported_extension_aliases.extend( self.supported_extension_aliases.extend(