Don't invoke vnc_lib.service_instances_list() if there is no

service instance to read. Change-Id: I271ea17fa36b16e0d68af2b73cd6977a9093bc51 Closes-Bug: 1615159 (cherry picked from commit 5b334ac)
Juniper · Aug 23, 2016 · 2072ac0 · 2072ac0
1 parent 700fbe9
commit 2072ac0
Showing 1 changed file with 6 additions and 3 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
@@ -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: