From d59e1503cc9d3fa524f2209fdc645459f98e181a Mon Sep 17 00:00:00 2001 From: sahdev zala Date: Wed, 30 Nov 2016 12:14:00 -0500 Subject: [PATCH] Fix TOSCA type for Docker container Use Docker specific type instead of generic application type. Change-Id: I8bab0d50156cccb000b680cf4174ac6245c1ff42 --- ...iner_docker_my_sql.yaml => test_container_docker_mysql.yaml} | 2 +- toscaparser/tests/test_toscatpl.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename toscaparser/tests/data/containers/{test_container_docker_my_sql.yaml => test_container_docker_mysql.yaml} (95%) diff --git a/toscaparser/tests/data/containers/test_container_docker_my_sql.yaml b/toscaparser/tests/data/containers/test_container_docker_mysql.yaml similarity index 95% rename from toscaparser/tests/data/containers/test_container_docker_my_sql.yaml rename to toscaparser/tests/data/containers/test_container_docker_mysql.yaml index ba1cc16..3fd4466 100644 --- a/toscaparser/tests/data/containers/test_container_docker_my_sql.yaml +++ b/toscaparser/tests/data/containers/test_container_docker_mysql.yaml @@ -17,7 +17,7 @@ topology_template: node_templates: # The MYSQL container based on official MySQL image in Docker hub mysql_container: - type: tosca.nodes.Container.Application + type: tosca.nodes.Container.Application.Docker requirements: - host: mysql_runtime artifacts: diff --git a/toscaparser/tests/test_toscatpl.py b/toscaparser/tests/test_toscatpl.py index 197a63f..538e358 100644 --- a/toscaparser/tests/test_toscatpl.py +++ b/toscaparser/tests/test_toscatpl.py @@ -824,7 +824,7 @@ class ToscaTemplateTest(TestCase): def test_containers(self): tosca_tpl = os.path.join( os.path.dirname(os.path.abspath(__file__)), - "data/containers/test_container_docker_my_sql.yaml") + "data/containers/test_container_docker_mysql.yaml") ToscaTemplate(tosca_tpl, parsed_params={"mysql_root_pwd": "12345678"}) def test_endpoint_on_compute(self):