Move the cfn client code to a subpackage

This will make packaging easier.

Change-Id: I8e0f0a3d85bdf073a3b3272f920ad60f27e929e3
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/bin/heat-cfn b/bin/heat-cfn
index 3c056cceaed2c719dfbab5b5c69d6dabb55450d4..30deff66609e2cb2b08d186fd3865e42e8b8f769 100755 (executable)
--- a/bin/heat-cfn
+++ b/bin/heat-cfn
@@ -44,13 +44,13 @@ scriptname = os.path.basename(sys.argv[0])
 gettext.install('heat', unicode=1)
 
 if scriptname == 'heat-boto':
-    from heat import boto_client as heat_client
+    from heat.cfn_client import boto_client as heat_client
 else:
-    from heat import client as heat_client
+    from heat.cfn_client import client as heat_client
 from heat.version import version_info as version
 from heat.common import config
 from heat.common import exception
-from heat import utils
+from heat.cfn_client import utils
 from keystoneclient.v2_0 import client
 
 

diff --git a/bin/heat-watch b/bin/heat-watch
index 2f5e113e1c9d934dda9c1248926b5671e2bd8933..a5b185fa5a5e8e6b8ede5ac4aa796c825f7c941e 100755 (executable)
--- a/bin/heat-watch
+++ b/bin/heat-watch
@@ -42,11 +42,11 @@ scriptname = os.path.basename(sys.argv[0])
 
 gettext.install('heat', unicode=1)
 
-from heat import  boto_client_cloudwatch as heat_client
+from heat.cfn_client import boto_client_cloudwatch as heat_client
 from heat.version import version_info as version
 from heat.common import config
 from heat.common import exception
-from heat import utils
+from heat.cfn_client import utils
 
 DEFAULT_PORT=8003
 

diff --git a/heat/cfn_client/__init__.py b/heat/cfn_client/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/heat/boto_client.py b/heat/cfn_client/boto_client.py
similarity index 100%
rename from heat/boto_client.py
rename to heat/cfn_client/boto_client.py

diff --git a/heat/boto_client_cloudwatch.py b/heat/cfn_client/boto_client_cloudwatch.py
similarity index 100%
rename from heat/boto_client_cloudwatch.py
rename to heat/cfn_client/boto_client_cloudwatch.py

diff --git a/heat/client.py b/heat/cfn_client/client.py
similarity index 100%
rename from heat/client.py
rename to heat/cfn_client/client.py

diff --git a/heat/utils.py b/heat/cfn_client/utils.py
similarity index 100%
rename from heat/utils.py
rename to heat/cfn_client/utils.py

diff --git a/heat/common/client.py b/heat/common/client.py
index d70aa8d5c0ca595301cab9bb0fc4a01234cbcdc4..f24991557b38afc558e479dcae8b0c1cfc8199d4 100644 (file)
--- a/heat/common/client.py
+++ b/heat/common/client.py
@@ -84,7 +84,7 @@ class ImageBodyIterator(object):
     """
     A class that acts as an iterator over an image file's
     chunks of data.  This is returned as part of the result
-    tuple from `heat.client.Client.get_image`
+    tuple from `heat.cfn_client.client.Client.get_image`
     """
 
     def __init__(self, source):

diff --git a/heat/tests/functional/util.py b/heat/tests/functional/util.py
index f5655222d1bc43d46ee799ec1b62a6db95ef2e6a..76eb07f5d40408303ed0c0df19d2e5db29eb7a3a 100644 (file)
--- a/heat/tests/functional/util.py
+++ b/heat/tests/functional/util.py
@@ -42,8 +42,8 @@ from novaclient.v1_1 import client as nova_client
 import heat
 from heat.common import template_format
 from heat.engine import parser
-from heat import client as heat_client
-from heat import boto_client as heat_client_boto
+from heat.cfn_client import client as heat_client
+from heat.cfn_client import boto_client as heat_client_boto
 from keystoneclient.v2_0 import client
 
 DEFAULT_STACKNAME = 'teststack'