diff options
| author |   maopeng zhang <zhang.maopeng1@zte.com.cn> | 2018-03-29 08:59:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-29 08:59:59 +0000 |
| commit | 3b427abcdecf661bdff722d986748e3da414e342 (patch) | |
| tree | 4a5fc740ead45168ba11d65cc9b2182c4ace48d7 | |
| parent | 30462829e436cb0c030cfb252d1faca50664481e (diff) | |
| parent | c9f09aec17c9f913b08a403eea8cfd34f19eae9d (diff) | |
Merge "fix inconsistency with tosca def"
| -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) |