From b8f06778a798b23fe175bbcb69af84cf0feee50b Mon Sep 17 00:00:00 2001 From: "ying.yunlong" Date: Wed, 14 Mar 2018 09:10:38 +0800 Subject: 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 --- catalog/pub/utils/toscaparser/basemodel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalog/pub/utils/toscaparser/basemodel.py b/catalog/pub/utils/toscaparser/basemodel.py index 7d2595ad..205bdb4e 100644 --- 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 = {} -- cgit 1.2.3-korg