Skip to content

Commit

Permalink
[Config]: Fix VNC openstack
Browse files Browse the repository at this point in the history
Change-Id: Id519f13a37d2252255b7c2baa0fe103eeefe8ed4
Closes-Bug: 1685954
Closes-Bug: 1685040
  • Loading branch information
sahilsabharwal committed May 1, 2017
1 parent a9609b9 commit 654c0ea
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -1257,6 +1257,7 @@ def _network_vnc_to_neutron(self, net_obj, net_repr='SHOW'):

extra_dict['contrail:fq_name'] = net_obj.get_fq_name()
net_q_dict['tenant_id'] = net_obj.parent_uuid.replace('-', '')
net_q_dict['project_id'] = net_obj.parent_uuid.replace('-', '')
net_q_dict['admin_state_up'] = id_perms.enable
if net_obj.is_shared:
net_q_dict['shared'] = True
Expand Down Expand Up @@ -1880,9 +1881,9 @@ def _port_neutron_to_vnc(self, port_q, net_obj, oper):
if port_sg_refs:
if 'security_groups' in port_q and not port_q['security_groups']:
# reset all SG on the port
port_obj.set_security_groups_list([])
port_obj.set_security_group_list([])
elif len(port_sg_refs) == 1 and port_sg_refs[0]['to'] == SG_NO_RULE_FQ_NAME:
port_obj.set_security_groups_list([])
port_obj.set_security_group_list([])
else:
self._raise_contrail_exception('PortSecurityPortHasSecurityGroup', port_id=port_obj.uuid)

Expand Down

0 comments on commit 654c0ea

Please sign in to comment.