Skip to content

Commit

Permalink
Merge "Don't invoke vnc_lib.service_instances_list() if there is no s…
Browse files Browse the repository at this point in the history
…ervice instance to read." into R3.0
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Aug 23, 2016
2 parents a95693b + 2072ac0 commit 94725ab
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py
Expand Up @@ -701,9 +701,12 @@ def _port_list(self, port_objs):
si_ids = [si_ref['uuid']
for vm_obj in vm_objs
for si_ref in vm_obj.get_service_instance_refs() or []]
si_objs = self._vnc_lib.service_instances_list(
obj_uuids=si_ids, fields=['logical_router_back_refs'], detail=True)
memo_req['service-instances'] = dict((si_obj.uuid, si_obj) for si_obj in si_objs)
if si_ids:
si_objs = self._vnc_lib.service_instances_list(
obj_uuids=si_ids, fields=['logical_router_back_refs'],
detail=True)
memo_req['service-instances'] = dict(
(si_obj.uuid, si_obj) for si_obj in si_objs)

# Convert port from contrail to neutron repr with the memo cache
for port_obj in port_objs:
Expand Down

0 comments on commit 94725ab

Please sign in to comment.