From 1872a1dcaee99abe76540ff8bbf83e75d056ff43 Mon Sep 17 00:00:00 2001
From: huangtianhua <huangtianhua@huawei.com>
Date: Thu, 4 Aug 2016 17:21:05 +0800
Subject: [PATCH] Rename swift.py to container.py for swift container resource

Change-Id: I9a40823a139d136641be5a06d753ba14acb726d0
---
 .../openstack/swift/{swift.py => container.py}    |  0
 .../swift/{test_swift.py => test_container.py}    | 15 ++++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename heat/engine/resources/openstack/swift/{swift.py => container.py} (100%)
 rename heat/tests/openstack/swift/{test_swift.py => test_container.py} (97%)

diff --git a/heat/engine/resources/openstack/swift/swift.py b/heat/engine/resources/openstack/swift/container.py
similarity index 100%
rename from heat/engine/resources/openstack/swift/swift.py
rename to heat/engine/resources/openstack/swift/container.py
diff --git a/heat/tests/openstack/swift/test_swift.py b/heat/tests/openstack/swift/test_container.py
similarity index 97%
rename from heat/tests/openstack/swift/test_swift.py
rename to heat/tests/openstack/swift/test_container.py
index d03e634cc3..f330443a28 100644
--- a/heat/tests/openstack/swift/test_swift.py
+++ b/heat/tests/openstack/swift/test_container.py
@@ -18,7 +18,7 @@ import swiftclient.client as sc
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine.resources.openstack.swift import swift
+from heat.engine.resources.openstack.swift import container as swift_c
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils
@@ -73,9 +73,9 @@ class SwiftTest(common.HeatTestCase):
 
     def _create_container(self, stack, definition_name='SwiftContainer'):
         resource_defns = stack.t.resource_definitions(stack)
-        container = swift.SwiftContainer('test_resource',
-                                         resource_defns[definition_name],
-                                         stack)
+        container = swift_c.SwiftContainer('test_resource',
+                                           resource_defns[definition_name],
+                                           stack)
         runner = scheduler.TaskRunner(container.create)
         runner()
         self.assertEqual((container.CREATE, container.COMPLETE),
@@ -102,11 +102,12 @@ class SwiftTest(common.HeatTestCase):
         headers = {'Web-Index': 'index.html', 'Web-Error': 'error.html'}
 
         # Test
-        self.assertEqual({}, swift.SwiftContainer._build_meta_headers(
+        self.assertEqual({}, swift_c.SwiftContainer._build_meta_headers(
             'container', {}))
-        self.assertEqual({}, swift.SwiftContainer._build_meta_headers(
+        self.assertEqual({}, swift_c.SwiftContainer._build_meta_headers(
             'container', None))
-        built = swift.SwiftContainer._build_meta_headers('container', headers)
+        built = swift_c.SwiftContainer._build_meta_headers(
+            'container', headers)
 
         # Verify
         expected = {