x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V: serialize rule removal"

Browse Source
This commit is contained in:
Jenkins 2017-09-10 06:10:18 +00:00 committed by Gerrit Code Review
commit 25211bdd3e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4223,8 +4223,10 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
with excutils.save_and_reraise_exception():
for nsx_rule_id in [p['nsx_id'] for p in rule_pairs
if p['neutron_id'] in ruleids]:
self.nsx_v.vcns.remove_rule_from_section(
section_uri, nsx_rule_id)
with locking.LockManager.get_lock('rule-update-%s' %
sg_id):
self.nsx_v.vcns.remove_rule_from_section(
section_uri, nsx_rule_id)
LOG.exception("Failed to create security group rule")
return new_rule_list
@ -4240,8 +4242,10 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
context.session, security_group_id)
try:
if nsx_rule_id and section_uri:
self.nsx_v.vcns.remove_rule_from_section(
section_uri, nsx_rule_id)
with locking.LockManager.get_lock('rule-update-%s' %
security_group_id):
self.nsx_v.vcns.remove_rule_from_section(
section_uri, nsx_rule_id)
except vsh_exc.ResourceNotFound:
LOG.debug("Security group rule %(id)s deleted, backend "
"nsx-rule %(nsx_rule_id)s doesn't exist.",