x/vmware-nsx
Code Issues Proposed changes

NSX|V: enable an external network to create backing network

Browse Source 
In the case that we have a provider network configured and it
is not a port group then the external network will be created by
the NSX.

This will create a VLAN, FLAT  or a VXLAN network depending on
what the admin has configured.

Change-Id: I2b98d76c24c98f0f0ba245fd820f95bf64da3ce0
This commit is contained in:
Gary Kotton 2017-05-07 20:18:09 -07:00
parent a68d379eee
commit a44ed01a4f
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
vmware_nsx/plugins/nsx_v/plugin.py
View File

@ -1036,20 +1036,24 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
external = net_data.get(ext_net_extn.EXTERNAL) external = net_data.get(ext_net_extn.EXTERNAL)
backend_network = (not validators.is_attr_set(external) or backend_network = (not validators.is_attr_set(external) or
validators.is_attr_set(external) and not external) validators.is_attr_set(external) and not external)
network_type = None
if provider_type is not None:
segment = net_data[mpnet.SEGMENTS][0]
network_type = segment.get(pnet.NETWORK_TYPE)
# A external network should be created in the case that we have a flat,
# vlan or vxlan network. For port groups we do not make any changes.
external_backend_network = (
external and provider_type is not None and
network_type != c_utils.NsxVNetworkTypes.PORTGROUP)
self._validate_network_qos(net_data, backend_network) self._validate_network_qos(net_data, backend_network)
# Update the transparent vlan if configured # Update the transparent vlan if configured
vlt = False vlt = False
if n_utils.is_extension_supported(self, 'vlan-transparent'): if n_utils.is_extension_supported(self, 'vlan-transparent'):
vlt = ext_vlan.get_vlan_transparent(net_data) vlt = ext_vlan.get_vlan_transparent(net_data)
network_type = None if backend_network or external_backend_network:
if backend_network:
#NOTE(abhiraut): Consider refactoring code below to have more #NOTE(abhiraut): Consider refactoring code below to have more
# readable conditions. # readable conditions.
if provider_type is not None:
segment = net_data[mpnet.SEGMENTS][0]
network_type = segment.get(pnet.NETWORK_TYPE)
if (provider_type is None or if (provider_type is None or
network_type == c_utils.NsxVNetworkTypes.VXLAN): network_type == c_utils.NsxVNetworkTypes.VXLAN):
virtual_wire = {"name": net_data['id'], virtual_wire = {"name": net_data['id'],
@ -1127,10 +1131,10 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
try: try:
net_data[psec.PORTSECURITY] = net_data.get(psec.PORTSECURITY, True) net_data[psec.PORTSECURITY] = net_data.get(psec.PORTSECURITY, True)
# Create SpoofGuard policy for network anti-spoofing # Create SpoofGuard policy for network anti-spoofing
sg_policy_id = None
if cfg.CONF.nsxv.spoofguard_enabled and backend_network: if cfg.CONF.nsxv.spoofguard_enabled and backend_network:
# This variable is set as the method below may result in a # This variable is set as the method below may result in a
# exception and we may need to rollback # exception and we may need to rollback
sg_policy_id = None
predefined = False predefined = False
sg_policy_id, predefined = self._prepare_spoofguard_policy( sg_policy_id, predefined = self._prepare_spoofguard_policy(
network_type, net_data, net_morefs) network_type, net_data, net_morefs)
@ -1175,9 +1179,12 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
physical_net_set = validators.is_attr_set( physical_net_set = validators.is_attr_set(
physical_network) physical_network)
if not physical_net_set: if not physical_net_set:
# Use the dvs_id of the availability zone if external_backend_network:
physical_network = self._get_network_az_dvs_id( physical_network = net_morefs[0]
net_data) else:
# Use the dvs_id of the availability zone
physical_network = self._get_network_az_dvs_id(
net_data)
net_bindings.append(nsxv_db.add_network_binding( net_bindings.append(nsxv_db.add_network_binding(
context.session, new_net['id'], context.session, new_net['id'],
network_type, network_type,
@ -1189,7 +1196,7 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
self._extend_network_dict_provider(context, new_net, self._extend_network_dict_provider(context, new_net,
provider_type, provider_type,
net_bindings) net_bindings)
if backend_network: if backend_network or external_backend_network:
# Save moref in the DB for future access # Save moref in the DB for future access
if (network_type == c_utils.NsxVNetworkTypes.VLAN or if (network_type == c_utils.NsxVNetworkTypes.VLAN or
network_type == c_utils.NsxVNetworkTypes.FLAT): network_type == c_utils.NsxVNetworkTypes.FLAT):
@ -1206,14 +1213,14 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
nsx_db.add_neutron_nsx_network_mapping( nsx_db.add_neutron_nsx_network_mapping(
context.session, new_net['id'], context.session, new_net['id'],
net_moref) net_moref)
if cfg.CONF.nsxv.spoofguard_enabled: if cfg.CONF.nsxv.spoofguard_enabled and backend_network:
nsxv_db.map_spoofguard_policy_for_network( nsxv_db.map_spoofguard_policy_for_network(
context.session, new_net['id'], sg_policy_id) context.session, new_net['id'], sg_policy_id)
except Exception: except Exception:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
# Delete the backend network # Delete the backend network
if backend_network: if backend_network or external_backend_network:
if (cfg.CONF.nsxv.spoofguard_enabled and sg_policy_id and if (cfg.CONF.nsxv.spoofguard_enabled and sg_policy_id and
not predefined): not predefined):
self.nsx_v.vcns.delete_spoofguard_policy(sg_policy_id) self.nsx_v.vcns.delete_spoofguard_policy(sg_policy_id)
@ -1495,7 +1502,12 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
if net_attrs.get("admin_state_up") is False: if net_attrs.get("admin_state_up") is False:
raise NotImplementedError(_("admin_state_up=False networks " raise NotImplementedError(_("admin_state_up=False networks "
"are not supported.")) "are not supported."))
net_morefs = nsx_db.get_nsx_switch_ids(context.session, id)
ext_net = self._get_network(context, id)
if not ext_net.external:
net_morefs = nsx_db.get_nsx_switch_ids(context.session, id)
else:
net_morefs = []
backend_network = True if len(net_morefs) > 0 else False backend_network = True if len(net_morefs) > 0 else False
self._validate_network_qos(net_attrs, backend_network) self._validate_network_qos(net_attrs, backend_network)
@ -1553,7 +1565,8 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
# Updating SpoofGuard policy if exists, on failure revert to network # Updating SpoofGuard policy if exists, on failure revert to network
# old state # old state
if (cfg.CONF.nsxv.spoofguard_enabled and if (not ext_net.external and
cfg.CONF.nsxv.spoofguard_enabled and
(psec_update or updated_morefs)): (psec_update or updated_morefs)):
policy_id = nsxv_db.get_spoofguard_policy_id(context.session, id) policy_id = nsxv_db.get_spoofguard_policy_id(context.session, id)
port_sec = (net_attrs[psec.PORTSECURITY] port_sec = (net_attrs[psec.PORTSECURITY]
@ -1573,7 +1586,8 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
# Handle QOS updates (Value can be None, meaning to delete the # Handle QOS updates (Value can be None, meaning to delete the
# current policy), or moref updates with an existing qos policy # current policy), or moref updates with an existing qos policy
if ((qos_consts.QOS_POLICY_ID in net_attrs) or if (not ext_net.external and
(qos_consts.QOS_POLICY_ID in net_attrs) or
(updated_morefs and orig_net.get(qos_consts.QOS_POLICY_ID))): (updated_morefs and orig_net.get(qos_consts.QOS_POLICY_ID))):
# update the qos data # update the qos data
qos_policy_id = (net_attrs[qos_consts.QOS_POLICY_ID] qos_policy_id = (net_attrs[qos_consts.QOS_POLICY_ID]