x/vmware-nsx
Code Issues Proposed changes

NSXv: Fix update port update with provider security-groups

Browse Source 
Change-Id: Ia904df7752842454eea58d762caf0e700f4c1777
This commit is contained in:
Roey Chen 2017-02-05 02:11:50 -08:00
parent 904b0fb4be
commit 7183d393bc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vmware_nsx/db/extended_security_group.py
View File

@ -332,6 +332,7 @@ class ExtendedSecurityGroupPropertiesMixin(object):
self._process_port_create_provider_security_group(
context, updated_port,
updated_port[provider_sg.PROVIDER_SECURITYGROUPS])
return provider_sg_changed
def _prevent_non_admin_delete_provider_sg(self, context, sg_id):
# Only someone who is an admin is allowed to delete this.

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

@ -1677,9 +1677,8 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
original_port, ret_port)
# NOTE(roeyc): Should call this method only after
# update_security_group_on_port was called.
self._process_port_update_provider_security_group(context, port,
original_port,
ret_port)
pvd_sg_changed = self._process_port_update_provider_security_group(
context, port, original_port, ret_port)
LOG.debug("Updating port: %s", port)
self._process_portbindings_create_and_update(context,
@ -1824,7 +1823,8 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
"function properly "),
{'id': id,
'device_id': original_port['device_id']})
if delete_security_groups or has_security_groups:
if (delete_security_groups
or has_security_groups or pvd_sg_changed):
# Update security-groups,
# calculate differences and update vnic membership
# accordingly.