From 5ef68bbc45fccc597679f3a05883947a44323c85 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Thu, 13 Dec 2012 11:20:33 +0100 Subject: [PATCH] Move the cfn client code to a subpackage This will make packaging easier. Change-Id: I8e0f0a3d85bdf073a3b3272f920ad60f27e929e3 Signed-off-by: Zane Bitter --- bin/heat-cfn | 6 +++--- bin/heat-watch | 4 ++-- heat/cfn_client/__init__.py | 0 heat/{ => cfn_client}/boto_client.py | 0 heat/{ => cfn_client}/boto_client_cloudwatch.py | 0 heat/{ => cfn_client}/client.py | 0 heat/{ => cfn_client}/utils.py | 0 heat/common/client.py | 2 +- heat/tests/functional/util.py | 4 ++-- 9 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 heat/cfn_client/__init__.py rename heat/{ => cfn_client}/boto_client.py (100%) rename heat/{ => cfn_client}/boto_client_cloudwatch.py (100%) rename heat/{ => cfn_client}/client.py (100%) rename heat/{ => cfn_client}/utils.py (100%) diff --git a/bin/heat-cfn b/bin/heat-cfn index 3c056cce..30deff66 100755 --- 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 2f5e113e..a5b185fa 100755 --- 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 index 00000000..e69de29b 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 d70aa8d5..f2499155 100644 --- 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 f5655222..76eb07f5 100644 --- 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' -- 2.45.2