Merge "Do not return no-rule SG to neutron" into R2.21.x

Juniper · Jul 7, 2016 · b26375e · b26375e
2 parents cf7ac32 + 89142db
commit b26375e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py b/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py
@@ -2006,10 +2006,9 @@ def _port_vnc_to_neutron(self, port_obj, port_req_memo=None):
 
                 port_q_dict['fixed_ips'].append(ip_q_dict)
 
-        port_q_dict['security_groups'] = []
-        sg_refs = port_obj.get_security_group_refs()
-        for sg_ref in sg_refs or []:
-            port_q_dict['security_groups'].append(sg_ref['uuid'])
+        sg_refs = port_obj.get_security_group_refs() or []
+        port_q_dict['security_groups'] = [ref['uuid'] for ref in sg_refs
+                                          if ref['to'] != SG_NO_RULE_FQ_NAME]
 
         port_q_dict['admin_state_up'] = port_obj.get_id_perms().enable