From 11b868ee612861bbd0d0ded3b3c2dd43cee5dacc Mon Sep 17 00:00:00 2001 From: shangxdy Date: Thu, 13 Jul 2017 19:01:08 +0800 Subject: Add more test for nested import list Currently the test about nested import list is not enough, the patch enhance the test. Change-Id: Ica25345062d316b9a32f4efb8c5c2a98b8bda497 JIRA: PARSER-127 Signed-off-by: shangxdy --- .../toscaparser/tests/data/custom_types/nested_test_kibana.yaml | 3 +++ .../toscaparser/tests/data/test_instance_nested_imports.yaml | 4 ++++ tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/nested_test_kibana.yaml (limited to 'tosca2heat') diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/nested_test_kibana.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/nested_test_kibana.yaml new file mode 100644 index 0000000..c8675c6 --- /dev/null +++ b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/nested_test_kibana.yaml @@ -0,0 +1,3 @@ +tosca_definitions_version: tosca_simple_yaml_1_0 +imports: + - custom_types/kibana.yaml diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/test_instance_nested_imports.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/test_instance_nested_imports.yaml index 6aa9307..a130e49 100644 --- a/tosca2heat/tosca-parser/toscaparser/tests/data/test_instance_nested_imports.yaml +++ b/tosca2heat/tosca-parser/toscaparser/tests/data/test_instance_nested_imports.yaml @@ -5,6 +5,7 @@ description: > imports: - wordpress: custom_types/nested_test_wordpress.yaml + - custom_types/nested_test_kibana.yaml topology_template: @@ -20,3 +21,6 @@ topology_template: logstash: type: tosca.nodes.SoftwareComponent.Logstash + + kibana: + type: tosca.nodes.SoftwareComponent.Kibana diff --git a/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py b/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py index 77232df..c89f867 100644 --- a/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py +++ b/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py @@ -510,7 +510,8 @@ class ToscaTemplateTest(TestCase): os.path.dirname(os.path.abspath(__file__)), "data/test_instance_nested_imports.yaml") tosca = ToscaTemplate(tosca_tpl) - expected_custom_types = ['tosca.nodes.WebApplication.WordPress', + expected_custom_types = ['tosca.nodes.SoftwareComponent.Kibana', + 'tosca.nodes.WebApplication.WordPress', 'test_namespace_prefix.Rsyslog', 'Test2ndRsyslogType', 'test_2nd_namespace_prefix.Rsyslog', -- cgit 1.2.3-korg