From 6fa360e804fd38e5fe7ee0aa4388c2d2f20c6b0b Mon Sep 17 00:00:00 2001 From: spzala Date: Wed, 29 Jul 2015 19:07:34 -0700 Subject: [PATCH] Update TOSCA artifacts type Update the naming of currently supported TOSCA artifacts Bash and Python per latest spec. Change-Id: I46bfc4b3f7cee9f9240d4abbfdd9dcf291770647 --- translator/toscalib/elements/TOSCA_definition_1_0.yaml | 4 ++-- translator/toscalib/tests/test_toscadef.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/translator/toscalib/elements/TOSCA_definition_1_0.yaml b/translator/toscalib/elements/TOSCA_definition_1_0.yaml index c21f0bc4..a402bab4 100644 --- a/translator/toscalib/elements/TOSCA_definition_1_0.yaml +++ b/translator/toscalib/elements/TOSCA_definition_1_0.yaml @@ -692,13 +692,13 @@ tosca.artifacts.Implementation: derived_from: tosca.artifacts.Root description: TOSCA base type for implementation artifacts -tosca.artifacts.impl.Bash: +tosca.artifacts.Implementation.Bash: derived_from: tosca.artifacts.Implementation description: Script artifact for the Unix Bash shell mime_type: application/x-sh file_ext: [ sh ] -tosca.artifacts.impl.Python: +tosca.artifacts.Implementation.Python: derived_from: tosca.artifacts.Implementation description: Artifact for the interpreted Python language mime_type: application/x-python diff --git a/translator/toscalib/tests/test_toscadef.py b/translator/toscalib/tests/test_toscadef.py index aca8e23c..7600ee64 100644 --- a/translator/toscalib/tests/test_toscadef.py +++ b/translator/toscalib/tests/test_toscadef.py @@ -24,8 +24,8 @@ webserver_type = NodeType('tosca.nodes.WebServer') database_type = NodeType('tosca.nodes.Database') artif_root_type = ArtifactTypeDef('tosca.artifacts.Root') artif_file_type = ArtifactTypeDef('tosca.artifacts.File') -artif_bash_type = ArtifactTypeDef('tosca.artifacts.impl.Bash') -artif_python_type = ArtifactTypeDef('tosca.artifacts.impl.Python') +artif_bash_type = ArtifactTypeDef('tosca.artifacts.Implementation.Bash') +artif_python_type = ArtifactTypeDef('tosca.artifacts.Implementation.Python') artif_container_docker_type = ArtifactTypeDef('tosca.artifacts.' 'Deployment.Image.' 'Container.Docker')