summaryrefslogtreecommitdiffstats
path: root/tosca2heat/tosca-parser
diff options
context:
space:
mode:
authorjulien zhang <zhang.jun3g@zte.com.cn>2017-09-01 07:11:47 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-01 07:11:47 +0000
commit6eac11f48f8b664af928620bf2661987aa318725 (patch)
tree039a964682e0d53556ab5d8323aaedc247db22fc /tosca2heat/tosca-parser
parent7407c6c4cb09a80ec35a48716d4436ff98aba23f (diff)
parent726292f65a8e7df9eb7faa4614d77a049218f665 (diff)
Merge "Add import file with suffix of yml testcases"
Diffstat (limited to 'tosca2heat/tosca-parser')
-rw-r--r--tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/wordpress.yml19
-rw-r--r--tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py4
-rw-r--r--tosca2heat/tosca-parser/toscaparser/tests/test_toscatplvalidation.py12
3 files changed, 35 insertions, 0 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/wordpress.yml b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/wordpress.yml
new file mode 100644
index 0000000..5899ed9
--- /dev/null
+++ b/tosca2heat/tosca-parser/toscaparser/tests/data/custom_types/wordpress.yml
@@ -0,0 +1,19 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+node_types:
+ tosca.nodes.WebApplication.WordPress:
+ derived_from: tosca.nodes.WebApplication
+ requirements:
+ - database_endpoint:
+ capability: tosca.capabilities.Endpoint.Database
+ node: tosca.nodes.Database
+ relationship: tosca.relationships.ConnectsTo
+ interfaces:
+ Standard:
+ inputs:
+ wp_db_name:
+ type: string
+ wp_db_user:
+ type: string
+ wp_db_password:
+ type: string
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py b/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py
index af35cfb..69dfb46 100644
--- a/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py
+++ b/tosca2heat/tosca-parser/toscaparser/tests/test_toscatpl.py
@@ -216,6 +216,10 @@ class ToscaTemplateTest(TestCase):
tosca_tpl = self._load_template('test_no_outputs_in_template.yaml')
self.assertEqual(0, len(tosca_tpl.outputs))
+ def test_template_file_with_suffix_yml(self):
+ tosca_tpl = self._load_template('custom_types/wordpress.yml')
+ self.assertIsNotNone(tosca_tpl)
+
def test_relationship_interface(self):
template = ToscaTemplate(self.tosca_elk_tpl)
for node_tpl in template.nodetemplates:
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/test_toscatplvalidation.py b/tosca2heat/tosca-parser/toscaparser/tests/test_toscatplvalidation.py
index f7c22ab..2048a83 100644
--- a/tosca2heat/tosca-parser/toscaparser/tests/test_toscatplvalidation.py
+++ b/tosca2heat/tosca-parser/toscaparser/tests/test_toscatplvalidation.py
@@ -446,6 +446,18 @@ heat-translator/master/translator/tests/data/custom_types/wordpress.yaml
self.assertTrue(custom_defs.get("mycompany.tosca.nodes."
"WebApplication.WordPress"))
+ def test_imports_file_with_suffix_yml(self):
+ tpl_snippet = '''
+ imports:
+ - custom_types/wordpress.yml
+ '''
+ path = 'toscaparser/tests/data/tosca_elk.yaml'
+ custom_defs = self._imports_content_test(tpl_snippet,
+ path,
+ "node_types")
+ self.assertTrue(custom_defs.get("tosca.nodes."
+ "WebApplication.WordPress"))
+
def test_import_error_file_uri(self):
tpl_snippet = '''
imports: