x/vmware-nsx
Code Issues Proposed changes

NSX|V: support name update for VLAN and FLAT networks

Browse Source 
Ensure that the VC updates the network name for a network update
for a VLAN/FLAT provider network. This is only for networks created
by the plugin.

Change-Id: I7f784a47697a13b5366bf78dba5b789b9d93bbd2
This commit is contained in:
Gary Kotton 2017-11-25 23:06:26 -08:00 committed by garyk
parent 3918b4586c
commit 98dc300108
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vmware_nsx/dvs/dvs.py
View File

@ -440,6 +440,9 @@ class DvsManager(VCManagerBase):
standby = list(set(uplinks.uplinkPortName) - set(ports)) standby = list(set(uplinks.uplinkPortName) - set(ports))
policy.uplinkPortOrder.standbyUplinkPort = standby policy.uplinkPortOrder.standbyUplinkPort = standby
def update_port_group_spec_name(self, pg_spec, name):
pg_spec.name = name
def update_port_group_spec_trunk(self, pg_spec, trunk_data): def update_port_group_spec_trunk(self, pg_spec, trunk_data):
port_conf = pg_spec.defaultPortConfig port_conf = pg_spec.defaultPortConfig
port_conf.vlan = self._get_trunk_vlan_spec() port_conf.vlan = self._get_trunk_vlan_spec()

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

@ -1688,6 +1688,29 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
net_res[qos_consts.QOS_POLICY_ID] = ( net_res[qos_consts.QOS_POLICY_ID] = (
qos_com_utils.get_network_policy_id(context, id)) qos_com_utils.get_network_policy_id(context, id))
# Handle case of network name update - this only is relevant for
# networks that we create - not portgroup providers
if (net_attrs.get('name') and
orig_net.get('name') != net_attrs.get('name') and
(orig_net.get(pnet.NETWORK_TYPE) ==
c_utils.NsxVNetworkTypes.VLAN or
orig_net.get(pnet.NETWORK_TYPE) ==
c_utils.NsxVNetworkTypes.FLAT)):
# Only update networks created by plugin
mappings = nsx_db.get_nsx_network_mappings(context.session, id)
for mapping in mappings:
network_name = self._get_vlan_network_name(net_res,
mapping.dvs_id)
try:
self._vcm.update_port_groups_config(
mapping.dvs_id, id, mapping.nsx_id,
self._dvs.update_port_group_spec_name,
network_name)
except Exception as e:
LOG.error('Unable to update name for net %(net_id)s. '
'Error: %(e)s',
{'net_id': id, 'e': e})
return net_res return net_res
def _validate_address_pairs(self, attrs, db_port): def _validate_address_pairs(self, attrs, db_port):