x/vmware-nsx
Code Issues Proposed changes

Merge "AdminUtils NSX-v: Fix SG migration to policy"

Browse Source
This commit is contained in:
Zuul 2018-02-01 13:21:35 +00:00 committed by Gerrit Code Review
commit 9ab1f68179
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vmware_nsx/shell/admin/plugins/nsxv/resources/securitygroups.py
View File

@ -330,7 +330,8 @@ def fix_security_groups(resource, event, trigger, **kwargs):
neutron_sg.delete_security_group_backend_mapping(sg_id) neutron_sg.delete_security_group_backend_mapping(sg_id)
plugin._process_security_group_create_backend_resources(context_, plugin._process_security_group_create_backend_resources(context_,
secgroup) secgroup)
nsx_id = nsx_db.get_nsx_security_group_id(context_.session, sg_id) nsx_id = nsx_db.get_nsx_security_group_id(context_.session, sg_id,
moref=False)
for vnic_id in neutron_sg.get_vnics_in_security_group(sg_id): for vnic_id in neutron_sg.get_vnics_in_security_group(sg_id):
plugin._add_member_to_security_group(nsx_id, vnic_id) plugin._add_member_to_security_group(nsx_id, vnic_id)
@ -371,6 +372,13 @@ def migrate_sg_to_policy(resource, event, trigger, **kwargs):
LOG.error("NSX policy %s was not found", policy_id) LOG.error("NSX policy %s was not found", policy_id)
return return
# get the nsx id from the backend
nsx_sg_id = nsx_db.get_nsx_security_group_id(context_.session, sg_id,
moref=True)
if not nsx_sg_id:
LOG.error("Did not find security groups %s neutron ID", sg_id)
return
# Delete the rules from the security group # Delete the rules from the security group
LOG.info("Deleting the rules of security group: %s", sg_id) LOG.info("Deleting the rules of security group: %s", sg_id)
for rule in secgroup.get('security_group_rules', []): for rule in secgroup.get('security_group_rules', []):
@ -396,7 +404,6 @@ def migrate_sg_to_policy(resource, event, trigger, **kwargs):
# continue anyway # continue anyway
# bind this security group to the policy in the backend and DB # bind this security group to the policy in the backend and DB
nsx_sg_id = nsx_db.get_nsx_security_group_id(context_.session, sg_id)
LOG.info("Binding the NSX security group %(nsx)s to policy " LOG.info("Binding the NSX security group %(nsx)s to policy "
"%(pol)s", "%(pol)s",
{'nsx': nsx_sg_id, 'pol': policy_id}) {'nsx': nsx_sg_id, 'pol': policy_id})