From: Denes Nemeth Date: Thu, 11 Jan 2018 08:02:06 +0000 (+0100) Subject: fix inconsistency with tosca def X-Git-Tag: v1.1.0~25^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F27937%2F1;p=vfc%2Fnfvo%2Fcatalog.git fix inconsistency with tosca def Change-Id: I5bbf8f5bed49ecad393c46546588f977b66b0fed Issue-ID: VFC-657 Signed-off-by: Denes Nemeth --- diff --git a/.gitignore b/.gitignore index 67c551bb..6e7f02b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ logs/*.log *.pyc -.idea \ No newline at end of file +.idea +.tox +target diff --git a/catalog/pub/utils/toscaparser/vnfdmodel.py b/catalog/pub/utils/toscaparser/vnfdmodel.py index 80722f7f..7b662410 100644 --- a/catalog/pub/utils/toscaparser/vnfdmodel.py +++ b/catalog/pub/utils/toscaparser/vnfdmodel.py @@ -175,9 +175,9 @@ class EtsiVnfdInfoModel(EtsiNsdInfoModel): ret['volume_storages'] = map(functools.partial(self._trans_volume_storage), volume_storages) ret['dependencies'] = map(lambda x: self.get_requirement_node_name(x), self.getNodeDependencys(node)) - nfv_compute = self.getCapabilityByName(node, 'nfv_compute') - if nfv_compute is not None and 'properties' in nfv_compute: - ret['nfv_compute'] = nfv_compute['properties'] + virtual_compute = self.getCapabilityByName(node, 'virtual_compute') + if virtual_compute is not None and 'properties' in virtual_compute: + ret['virtual_compute'] = virtual_compute['properties'] ret['vls'] = self.get_linked_vl_ids(node, nodeTemplates)