diff options
| author |   Denes Nemeth <denes.nemeth@nokia.com> | 2018-01-11 09:02:06 +0100 |
|---|---|---|
| committer | Denes Nemeth <denes.nemeth@nokia.com> | 2018-01-11 09:35:57 +0100 |
| commit | c9f09aec17c9f913b08a403eea8cfd34f19eae9d (patch) | |
| tree | a9f2f7454b7e49ab3765fe0be9228ce05e8041eb | |
| parent | cf7ecd570f0fd6b7f134cfaf0c2b17b2a0985ca3 (diff) | |
fix inconsistency with tosca def
Change-Id: I5bbf8f5bed49ecad393c46546588f977b66b0fed
Issue-ID: VFC-657
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | catalog/pub/utils/toscaparser/vnfdmodel.py | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -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) |