heat API : move aws common files from api/v1 to api/aws

Move aws api common files to common directory
(so they can be more easily reused by cloudwatch)

Change-Id: I1a455ef11226dd960503bac5d79fa5c28607a1f6
Signed-off-by: Steven Hardy <shardy@redhat.com>

diff --git a/etc/heat-api-paste.ini b/etc/heat-api-paste.ini
index 7db8d88a56f9cf67f52de026f5f3278cdde56136..5ceeae06940f5d0877ce666062f18df1e5ea7688 100644 (file)
--- a/etc/heat-api-paste.ini
+++ b/etc/heat-api-paste.ini
@@ -63,7 +63,7 @@ heat.filter_factory = heat.api.middleware.cache_manage:CacheManageFilter
 paste.filter_factory = heat.common.context:ContextMiddleware_filter_factory
 
 [filter:ec2authtoken]
-paste.filter_factory = heat.api.v1.ec2token:EC2Token_filter_factory
+paste.filter_factory = heat.api.aws.ec2token:EC2Token_filter_factory
 auth_uri = http://127.0.0.1:5000/v2.0
 keystone_ec2_uri = http://localhost:5000/v2.0/ec2tokens
 

diff --git a/heat/api/aws/__init__.py b/heat/api/aws/__init__.py
new file mode 100644 (file)
index 0000000..e8e4035
--- /dev/null
+++ b/heat/api/aws/__init__.py
@@ -0,0 +1,14 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.

diff --git a/heat/api/v1/ec2token.py b/heat/api/aws/ec2token.py
similarity index 100%
rename from heat/api/v1/ec2token.py
rename to heat/api/aws/ec2token.py

diff --git a/heat/api/v1/exception.py b/heat/api/aws/exception.py
similarity index 100%
rename from heat/api/v1/exception.py
rename to heat/api/aws/exception.py

diff --git a/heat/api/v1/__init__.py b/heat/api/v1/__init__.py
index 8e6aa8187d5eea7723e92fd9f0e1c7f4cca7cc6d..9ea96535d25629926cd309fdb87cda2b3453151d 100644 (file)
--- a/heat/api/v1/__init__.py
+++ b/heat/api/v1/__init__.py
@@ -28,7 +28,7 @@ from webob import Request
 import webob
 from heat import utils
 from heat.common import context
-from heat.api.v1 import exception
+from heat.api.aws import exception
 
 from heat.openstack.common import log as logging
 

diff --git a/heat/api/v1/stacks.py b/heat/api/v1/stacks.py
index e21ed55a0572e1461a38ac481e4a3ce3d90fad9c..0b9ac175adcea4b0008d35d915a2d22b0fc1b4ea 100644 (file)
--- a/heat/api/v1/stacks.py
+++ b/heat/api/v1/stacks.py
@@ -24,7 +24,7 @@ import sys
 import re
 import urlparse
 import webob
-from heat.api.v1 import exception
+from heat.api.aws import exception
 from heat.common import wsgi
 from heat.common import config
 from heat.common import context

diff --git a/heat/tests/test_api_v1.py b/heat/tests/test_api_v1.py
index bf9bff480c08de86140342ca87265f6051e61de4..d725909359834df98a7665b1f25119f18d20ab4f 100644 (file)
--- a/heat/tests/test_api_v1.py
+++ b/heat/tests/test_api_v1.py
@@ -32,7 +32,7 @@ from heat.openstack.common import cfg
 from heat.openstack.common import rpc
 import heat.openstack.common.rpc.common as rpc_common
 from heat.common.wsgi import Request
-from heat.api.v1 import exception
+from heat.api.aws import exception
 import heat.api.v1.stacks as stacks