fix inconsistency with tosca def

Change-Id: I5bbf8f5bed49ecad393c46546588f977b66b0fed
Issue-ID: VFC-657
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>

diff --git a/.gitignore b/.gitignore
index 67c551b..6e7f02b 100644 (file)
--- 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 80722f7..7b66241 100644 (file)
--- 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)