From 2072ac0749fb111d99c5813fdd0268e030ddf3c3 Mon Sep 17 00:00:00 2001 From: Hampapur Ajay Date: Fri, 19 Aug 2016 16:28:55 -0700 Subject: [PATCH] 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 5b334acf9f7cbd57581a70023cec3e390b84b15b) --- .../vnc_openstack/vnc_openstack/neutron_plugin_db.py | 9 ++++++--- 1 file changed, 6 insertions(+), 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 index e2d623f54ec..fb58c0a9ee7 100644 --- 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: