x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|P: Fix vlan transparent configuration"

Browse Source
This commit is contained in:
Zuul 2019-02-12 10:43:53 +00:00 committed by Gerrit Code Review
commit a67bf12ede
2 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
vmware_nsx/plugins/nsx_p/plugin.py
View File

@ -34,6 +34,7 @@ from neutron_lib.api.definitions import extra_dhcp_opt as ext_edo
from neutron_lib.api.definitions import l3 as l3_apidef
from neutron_lib.api.definitions import port_security as psec
from neutron_lib.api.definitions import vlantransparent as vlan_apidef
from neutron_lib.api import extensions
from neutron_lib.api import validators
from neutron_lib.callbacks import events
from neutron_lib.callbacks import registry
@ -128,7 +129,6 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
"security-group-logging",
"provider-security-group",
"port-security-groups-filtering",
"vlan-transparent",
'mac-learning']
@resource_registry.tracked_resources(
@ -170,6 +170,11 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
self.supported_extension_aliases.extend(
self._extension_manager.extension_aliases())
# Support transparent VLANS only if the global configuration flag
# vlan_transparent is True
if cfg.CONF.vlan_transparent:
self.supported_extension_aliases.append("vlan-transparent")
nsxlib_utils.set_inject_headers_callback(v3_utils.inject_headers)
self._validate_nsx_policy_version()
@ -361,7 +366,7 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
net_data['id'], admin_state)
def _tier0_validator(self, tier0_uuid):
# Fail of the tier0 uuid was not found on the BSX
# Fail if the tier0 uuid was not found on the NSX
self.nsxpolicy.tier0.get(tier0_uuid)
def _get_nsx_net_tz_id(self, nsx_net):
@ -402,7 +407,10 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
az = self._validate_obj_az_on_creation(context, net_data, 'network')
self._ensure_default_security_group(context, tenant_id)
vlt = vlan_apidef.get_vlan_transparent(net_data)
vlt = False
if extensions.is_extension_supported(self, 'vlan-transparent'):
vlt = vlan_apidef.get_vlan_transparent(net_data)
self._validate_create_network(context, net_data)
self._assert_on_resource_admin_state_down(net_data)
@ -425,6 +433,15 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
self.nsxpolicy.transport_zone,
self.nsxpolicy.segment,
transparent_vlan=vlt)
# Vlan range is only supported with vlan transport zone
if (vlt and
provider_data['net_type'] != utils.NsxV3NetworkTypes.VLAN and
provider_data['net_type'] != utils.NsxV3NetworkTypes.FLAT):
err_msg = (_('vlan_transparent network can be configured only '
'with network-type:vlan or flat'))
raise n_exc.InvalidInput(error_message=err_msg)
if (provider_data['is_provider_net'] and
provider_data['net_type'] ==
utils.NsxV3NetworkTypes.NSX_NETWORK):
@ -438,9 +455,10 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
created_net = super(NsxPolicyPlugin, self).create_network(
context, network)
net_id = created_net['id']
super(NsxPolicyPlugin, self).update_network(
context, net_id,
{'network': {'vlan_transparent': vlt}})
if extensions.is_extension_supported(self, 'vlan-transparent'):
super(NsxPolicyPlugin, self).update_network(
context, net_id,
{'network': {'vlan_transparent': vlt}})
self._extension_manager.process_create_network(
context, net_data, created_net)
if psec.PORTSECURITY not in net_data:

53
vmware_nsx/tests/unit/nsx_p/test_plugin.py
View File

@ -227,6 +227,8 @@ class NsxPTestNetworks(test_db_base_plugin_v2.TestNetworksV2,
def setUp(self, plugin=PLUGIN_NAME,
ext_mgr=None,
service_plugins=None):
# add vlan transparent to the configuration
cfg.CONF.set_override('vlan_transparent', True)
super(NsxPTestNetworks, self).setUp(plugin=plugin,
ext_mgr=ext_mgr)
@ -403,31 +405,50 @@ class NsxPTestNetworks(test_db_base_plugin_v2.TestNetworksV2,
# should fail
self.assertEqual('InvalidInput', data['NeutronError']['type'])
def test_create_transparent_vlan_network(self):
providernet_args = {vlan_apidef.VLANTRANSPARENT: True}
with mock.patch('vmware_nsxlib.v3.policy.core_resources.'
'NsxPolicyTransportZoneApi.get_transport_type',
return_value=nsx_constants.TRANSPORT_TYPE_OVERLAY), \
self.network(name='vt_net',
providernet_args=providernet_args,
arg_list=(vlan_apidef.VLANTRANSPARENT, )) as net:
self.assertTrue(net['network'].get(vlan_apidef.VLANTRANSPARENT))
def test_create_provider_vlan_network_with_transparent(self):
providernet_args = {pnet.NETWORK_TYPE: 'vlan',
def _test_transparent_vlan_net(self, net_type, tz_type, should_succeed):
providernet_args = {pnet.NETWORK_TYPE: net_type,
vlan_apidef.VLANTRANSPARENT: True}
with mock.patch('vmware_nsxlib.v3.policy.core_resources.'
'NsxPolicyTransportZoneApi.get_transport_type',
return_value=nsx_constants.TRANSPORT_TYPE_VLAN):
result = self._create_network(fmt='json', name='badvlan_net',
return_value=tz_type):
result = self._create_network(fmt='json', name='vlan_net',
admin_state_up=True,
providernet_args=providernet_args,
arg_list=(
pnet.NETWORK_TYPE,
pnet.SEGMENTATION_ID,
vlan_apidef.VLANTRANSPARENT))
data = self.deserialize('json', result)
self.assertEqual('vlan', data['network'].get(pnet.NETWORK_TYPE))
if should_succeed:
self.assertEqual(net_type,
data['network'].get(pnet.NETWORK_TYPE))
self.assertTrue(
data['network'].get(vlan_apidef.VLANTRANSPARENT))
else:
self.assertEqual('InvalidInput', data['NeutronError']['type'])
def test_create_non_provider_network_with_transparent(self):
self._test_transparent_vlan_net(
net_type="",
tz_type=nsx_constants.TRANSPORT_TYPE_OVERLAY,
should_succeed=False)
def test_create_provider_overlay_network_with_transparent(self):
self._test_transparent_vlan_net(
net_type=utils.NsxV3NetworkTypes.GENEVE,
tz_type=nsx_constants.TRANSPORT_TYPE_OVERLAY,
should_succeed=False)
def test_create_provider_flat_network_with_transparent(self):
self._test_transparent_vlan_net(
net_type=utils.NsxV3NetworkTypes.FLAT,
tz_type=nsx_constants.TRANSPORT_TYPE_VLAN,
should_succeed=True)
def test_create_provider_vlan_network_with_transparent(self):
self._test_transparent_vlan_net(
net_type=utils.NsxV3NetworkTypes.VLAN,
tz_type=nsx_constants.TRANSPORT_TYPE_VLAN,
should_succeed=True)
def test_network_update_external_failure(self):
data = {'network': {'name': 'net1',