From 43262f9ebe01b3f529e62ed250da27d059720a4c Mon Sep 17 00:00:00 2001 From: Richard Lee Date: Thu, 23 Jan 2014 12:40:57 -0600 Subject: [PATCH] Change Docker resource mapping name Removing the OS:: prefix since this is not an OpenStack-provided resource. Also remove hardcoded resource mapping name in test. Co-Authored-By: Anderson Mesquita Partial-Bug: #1271226 Change-Id: I5691a08df3700f896ca1fe6efec4487d44617d6d --- contrib/docker/resources/docker_container.py | 2 +- contrib/docker/tests/test_docker_container.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/docker/resources/docker_container.py b/contrib/docker/resources/docker_container.py index a081ad88d6..df977a9417 100644 --- a/contrib/docker/resources/docker_container.py +++ b/contrib/docker/resources/docker_container.py @@ -273,7 +273,7 @@ class DockerContainer(resource.Resource): def resource_mapping(): return { - 'OS::Docker::Container': DockerContainer, + 'DockerInc::Docker::Container': DockerContainer, } diff --git a/contrib/docker/tests/test_docker_container.py b/contrib/docker/tests/test_docker_container.py index 89c859a2de..40eb8c2dc8 100644 --- a/contrib/docker/tests/test_docker_container.py +++ b/contrib/docker/tests/test_docker_container.py @@ -33,7 +33,7 @@ template = ''' "Parameters": {}, "Resources": { "Blog": { - "Type": "OS::Docker::Container", + "Type": "DockerInc::Docker::Container", "Properties": { "image": "samalba/wordpress", "env": [ @@ -51,8 +51,8 @@ class DockerContainerTest(HeatTestCase): def setUp(self): super(DockerContainerTest, self).setUp() utils.setup_dummy_db() - resource._register_class('OS::Docker::Container', - docker_container.DockerContainer) + for res_name, res_class in docker_container.resource_mapping().items(): + resource._register_class(res_name, res_class) def create_container(self, resource_name): t = template_format.parse(template)