From 4190622915e943319e7705e5021eb7a11c97e5b0 Mon Sep 17 00:00:00 2001 From: Sachin Bansal Date: Tue, 19 May 2015 15:04:20 -0700 Subject: [PATCH] If default-network-ipam is not found in the project, use global default ipam Change-Id: I4566e663eb48bb670377fc914b9da59a60f37208 Closes-Bug: 1456541 --- src/config/svc-monitor/svc_monitor/instance_manager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/svc-monitor/svc_monitor/instance_manager.py b/src/config/svc-monitor/svc_monitor/instance_manager.py index 0b2353c317d..4940fe9a5f2 100644 --- a/src/config/svc-monitor/svc_monitor/instance_manager.py +++ b/src/config/svc-monitor/svc_monitor/instance_manager.py @@ -164,7 +164,10 @@ def create_service_vn(self, vn_name, vn_subnet, vn_obj.set_id_perms(id_perms) domain_name, project_name = proj_obj.get_fq_name() ipam_fq_name = [domain_name, project_name, 'default-network-ipam'] - ipam_obj = self._vnc_lib.network_ipam_read(fq_name=ipam_fq_name) + try: + ipam_obj = self._vnc_lib.network_ipam_read(fq_name=ipam_fq_name) + except NoIdError: + ipam_obj = NetworkIpam() cidr = vn_subnet.split('/') pfx = cidr[0] pfx_len = int(cidr[1])