diff options
| -rw-r--r-- | tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py | 2 | ||||
| -rw-r--r-- | tosca2heat/heat-translator/translator/tests/data/vRNC/Definitions/rnc_definition.yaml | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py b/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py index b685d6a..9d6a459 100644 --- a/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py +++ b/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py @@ -255,7 +255,7 @@ class ToscaCompute(HotResource): images = IMAGES if translator.common.utils.check_for_env_variables(): resp = self._populate_image_dict() - if len(resp.keys()) > 0: + if resp and len(resp.keys()) > 0: images = resp match_all = images.keys() architecture = properties.get(self.ARCHITECTURE) diff --git a/tosca2heat/heat-translator/translator/tests/data/vRNC/Definitions/rnc_definition.yaml b/tosca2heat/heat-translator/translator/tests/data/vRNC/Definitions/rnc_definition.yaml index 62ed2ad..33883fb 100644 --- a/tosca2heat/heat-translator/translator/tests/data/vRNC/Definitions/rnc_definition.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/vRNC/Definitions/rnc_definition.yaml @@ -42,6 +42,22 @@ node_types: required: false constraints: - valid_values: [ TDS-CDMA, UMTS, CDMA ] + attributes: + private_ip_of_MM: + type: string + description: The private IP address of the MM. + + private_ip_of_CM: + type: string + description: The private IP address of the CM. + + private_ip_of_DM: + type: string + description: The private IP address of the DM. + + private_ip_of_LB: + type: string + description: The private IP address of the LB. requirements: - virtualLink_VNFM: capability: tosca.capabilities.nfv.VirtualLinkable |