Merge "Convert fq-name-to-uuid in case of 'uuid' key specified but No…

…ne." into R3.2
Juniper · Oct 31, 2016 · e96dfb2 · e96dfb2
2 parents 048b4cd + 68c8d10
commit e96dfb2
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/config/api-server/vnc_cfg_types.py b/src/config/api-server/vnc_cfg_types.py
@@ -974,9 +974,8 @@ def _check_ipam_network_subnets(cls, obj_dict, db_conn, vn_uuid,
         ipam_subnets_list = []
         for ipam in ipam_refs:
             ipam_fq_name = ipam['to']
-            if 'uuid' in ipam:
-                ipam_uuid = ipam['uuid']
-            else:
+            ipam_uuid = ipam.get('uuid')
+            if not ipam_uuid:
                 ipam_uuid = db_conn.fq_name_to_uuid('network_ipam',
                                                     ipam_fq_name)