diff options
Diffstat (limited to 'tosca2heat/tosca-parser/toscaparser/extensions')
| -rw-r--r-- | tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml | 12 | ||||
| -rw-r--r-- | tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/test_tosca_vRNC.py | 6 |
2 files changed, 16 insertions, 2 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml index 21f79e2..7068c7a 100644 --- a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml +++ b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml @@ -71,6 +71,18 @@ topology_template: description: mm additional block storage size constraints: - in_range: [ 1, 200 ] + id: + type: string + description: ID of this VNF + default: UMTS + vendor: + type: string + description: name of the vendor who generate this VNF + default: ZTE + version: + type: version + description: version of the software for this VNF + default: 1.0 substitution_mappings: node_type: rnc.nodes.VNF diff --git a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/test_tosca_vRNC.py b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/test_tosca_vRNC.py index c839626..a0ffc21 100644 --- a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/test_tosca_vRNC.py +++ b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/test_tosca_vRNC.py @@ -29,8 +29,10 @@ class ToscaVRNCTemplateTest(TestCase): "tosca_simple_profile_for_nfv_1_0_0") def test_input(self): - first_input_name = "mm_storage_size" - self.assertEqual(self.tosca.inputs[0].name, first_input_name) + input_names = sorted(["mm_storage_size", "id", + "vendor", "version"]) + self.assertEqual(sorted([i.name for i in self.tosca.inputs]), + input_names) def test_nodetemplates(self): expected_node_list = sorted( |