Add vfc-catalog UUID non-null protection

For openo csars, there is no UUID, only has id, so when UUID is not null,
replace id with UUID.

Change-Id: I437dbb6dbb2291a223de2981ae830bab46316d37
Issue-ID: VFC-810
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/catalog/pub/utils/toscaparser/basemodel.py b/catalog/pub/utils/toscaparser/basemodel.py
index 7d2595a..205bdb4 100644 (file)
--- a/catalog/pub/utils/toscaparser/basemodel.py
+++ b/catalog/pub/utils/toscaparser/basemodel.py
@@ -161,7 +161,8 @@ class BaseInfoModel(object):
     def buidMetadata(self, tosca):
         if 'metadata' in tosca.tpl:
             self.metadata = copy.deepcopy(tosca.tpl['metadata'])
-            self.metadata['id'] = tosca.tpl['metadata']['UUID']
+            if tosca.tpl['metadata'].get('UUID', ''):
+                self.metadata['id'] = tosca.tpl['metadata']['UUID']
 
     def buildProperties(self, nodeTemplate, parsed_params):
         properties = {}