diff options
| author |   Shang Xiaodong <shang.xiaodong@zte.com.cn> | 2018-11-29 01:18:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-11-29 01:18:40 +0000 |
| commit | 3ba8f3a9d7a51b0864f22ef6b2be046fd6466b7d (patch) | |
| tree | 44a58bc4bdfb162c1b93083baf41a2a2e45a26a1 /tosca2heat/tosca-parser/toscaparser/tests | |
| parent | b89bfac8c2980ac9c68598da19fbe97596e772a8 (diff) | |
| parent | fa91717ecc519f5ca5b26456a7f7ab3c77c253ce (diff) | |
Merge "toscaparser: Avoid exception when creating our own"1.1.1
Diffstat (limited to 'tosca2heat/tosca-parser/toscaparser/tests')
3 files changed, 30 insertions, 0 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/invalid_type.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/invalid_type.yaml new file mode 100644 index 0000000..4d3a0b0 --- /dev/null +++ b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/invalid_type.yaml @@ -0,0 +1,8 @@ +tosca_definitions_version: tosca_simple_yaml_1_1 + +annotation_types: + org.openecomp.annotations.Source: + description: Indicates the origin source of an input + properties: + source_type: + type: string diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/test_import_invalid_type.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/test_import_invalid_type.yaml new file mode 100644 index 0000000..f2c1876 --- /dev/null +++ b/tosca2heat/tosca-parser/toscaparser/tests/data/test_import_invalid_type.yaml @@ -0,0 +1,11 @@ +tosca_definitions_version: tosca_simple_yaml_1_1 + +imports: + - invalid: custom_types/invalid_type.yaml + +description: Test to import a template with an invalid type. + +topology_template: + node_templates: + test: + type: tosca.nodes.Root diff --git a/tosca2heat/tosca-parser/toscaparser/tests/test_toscatplvalidation.py b/tosca2heat/tosca-parser/toscaparser/tests/test_toscatplvalidation.py index a8b1590..ea27bcb 100644 --- a/tosca2heat/tosca-parser/toscaparser/tests/test_toscatplvalidation.py +++ b/tosca2heat/tosca-parser/toscaparser/tests/test_toscatplvalidation.py @@ -1442,6 +1442,17 @@ heat-translator/master/translator/tests/data/custom_types/wordpress.yaml (_('The template version "tosca_xyz" is invalid. Valid versions ' 'are "%s".') % valid_versions)) + def test_import_invalid_type(self): + tosca_tpl = os.path.join( + os.path.dirname(os.path.abspath(__file__)), + "data/test_import_invalid_type.yaml") + self.assertRaises(exception.ValidationError, ToscaTemplate, tosca_tpl) + exception.ExceptionCollector.assertExceptionMessage( + exception.UnknownFieldError, + (_("Template {'invalid': 'custom_types/invalid_type.yaml'} " + 'contains unknown field "annotation_types". Refer to the ' + 'definition to verify valid values.'))) + def test_node_template_capabilities_properties(self): # validating capability property values tpl_snippet = ''' |