From 42f1f020778fdfde4e8b97c6df887dd2d02c2074 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Fri, 30 Nov 2012 16:35:47 -0500 Subject: [PATCH] Move v1 API files into a subdirectory Move all of the files for the v1 API together into a single directory to make room for the v2 files. blueprint api-server-pecan-wsme Change-Id: Ic794581c677a0277924459ad8a34fd7daf2bc365 Signed-off-by: Doug Hellmann --- bin/ceilometer-api | 2 +- ceilometer/api/v1/__init__.py | 0 ceilometer/api/{ => v1}/app.py | 4 ++-- ceilometer/api/{v1.py => v1/blueprint.py} | 0 ceilometer/api/{ => v1}/static/LICENSE.d3.v2.min.js | 0 ceilometer/api/{ => v1}/static/LICENSE.rickshaw | 0 .../static/bootstrap/css/bootstrap-responsive.css | 0 .../api/{ => v1}/static/bootstrap/css/bootstrap.css | 0 .../bootstrap/img/glyphicons-halflings-white.png | Bin .../static/bootstrap/img/glyphicons-halflings.png | Bin .../api/{ => v1}/static/bootstrap/js/bootstrap.js | 0 ceilometer/api/{ => v1}/static/d3.v2.js | 0 ceilometer/api/{ => v1}/static/jquery-1.8.3.js | 0 ceilometer/api/{ => v1}/static/rickshaw.css | 0 ceilometer/api/{ => v1}/static/rickshaw.js | 0 ceilometer/api/{ => v1}/templates/list_event.html | 0 ceilometer/tests/api.py | 9 ++++----- tests/api/v1/test_get_query_ts.py | 10 +++++----- 18 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 ceilometer/api/v1/__init__.py rename ceilometer/api/{ => v1}/app.py (93%) rename ceilometer/api/{v1.py => v1/blueprint.py} (100%) rename ceilometer/api/{ => v1}/static/LICENSE.d3.v2.min.js (100%) rename ceilometer/api/{ => v1}/static/LICENSE.rickshaw (100%) rename ceilometer/api/{ => v1}/static/bootstrap/css/bootstrap-responsive.css (100%) rename ceilometer/api/{ => v1}/static/bootstrap/css/bootstrap.css (100%) rename ceilometer/api/{ => v1}/static/bootstrap/img/glyphicons-halflings-white.png (100%) rename ceilometer/api/{ => v1}/static/bootstrap/img/glyphicons-halflings.png (100%) rename ceilometer/api/{ => v1}/static/bootstrap/js/bootstrap.js (100%) rename ceilometer/api/{ => v1}/static/d3.v2.js (100%) rename ceilometer/api/{ => v1}/static/jquery-1.8.3.js (100%) rename ceilometer/api/{ => v1}/static/rickshaw.css (100%) rename ceilometer/api/{ => v1}/static/rickshaw.js (100%) rename ceilometer/api/{ => v1}/templates/list_event.html (100%) diff --git a/bin/ceilometer-api b/bin/ceilometer-api index a4c8a6c87..462bbde97 100755 --- a/bin/ceilometer-api +++ b/bin/ceilometer-api @@ -21,7 +21,7 @@ import sys from ceilometer.api import acl -from ceilometer.api import app +from ceilometer.api.v1 import app from ceilometer.openstack.common import cfg from ceilometer.openstack.common import log as logging diff --git a/ceilometer/api/v1/__init__.py b/ceilometer/api/v1/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/ceilometer/api/app.py b/ceilometer/api/v1/app.py similarity index 93% rename from ceilometer/api/app.py rename to ceilometer/api/v1/app.py index 983e92ce2..c64895c59 100644 --- a/ceilometer/api/app.py +++ b/ceilometer/api/v1/app.py @@ -23,7 +23,7 @@ import flask from ceilometer.openstack.common import cfg from ceilometer.openstack.common import jsonutils from ceilometer import storage -from ceilometer.api import v1 +from ceilometer.api.v1 import blueprint as v1_blueprint from ceilometer.api import acl @@ -32,7 +32,7 @@ storage.register_opts(cfg.CONF) def make_app(enable_acl=True, attach_storage=True): app = flask.Flask('ceilometer.api') - app.register_blueprint(v1.blueprint, url_prefix='/v1') + app.register_blueprint(v1_blueprint.blueprint, url_prefix='/v1') try: with open("sources.json", "r") as f: diff --git a/ceilometer/api/v1.py b/ceilometer/api/v1/blueprint.py similarity index 100% rename from ceilometer/api/v1.py rename to ceilometer/api/v1/blueprint.py diff --git a/ceilometer/api/static/LICENSE.d3.v2.min.js b/ceilometer/api/v1/static/LICENSE.d3.v2.min.js similarity index 100% rename from ceilometer/api/static/LICENSE.d3.v2.min.js rename to ceilometer/api/v1/static/LICENSE.d3.v2.min.js diff --git a/ceilometer/api/static/LICENSE.rickshaw b/ceilometer/api/v1/static/LICENSE.rickshaw similarity index 100% rename from ceilometer/api/static/LICENSE.rickshaw rename to ceilometer/api/v1/static/LICENSE.rickshaw diff --git a/ceilometer/api/static/bootstrap/css/bootstrap-responsive.css b/ceilometer/api/v1/static/bootstrap/css/bootstrap-responsive.css similarity index 100% rename from ceilometer/api/static/bootstrap/css/bootstrap-responsive.css rename to ceilometer/api/v1/static/bootstrap/css/bootstrap-responsive.css diff --git a/ceilometer/api/static/bootstrap/css/bootstrap.css b/ceilometer/api/v1/static/bootstrap/css/bootstrap.css similarity index 100% rename from ceilometer/api/static/bootstrap/css/bootstrap.css rename to ceilometer/api/v1/static/bootstrap/css/bootstrap.css diff --git a/ceilometer/api/static/bootstrap/img/glyphicons-halflings-white.png b/ceilometer/api/v1/static/bootstrap/img/glyphicons-halflings-white.png similarity index 100% rename from ceilometer/api/static/bootstrap/img/glyphicons-halflings-white.png rename to ceilometer/api/v1/static/bootstrap/img/glyphicons-halflings-white.png diff --git a/ceilometer/api/static/bootstrap/img/glyphicons-halflings.png b/ceilometer/api/v1/static/bootstrap/img/glyphicons-halflings.png similarity index 100% rename from ceilometer/api/static/bootstrap/img/glyphicons-halflings.png rename to ceilometer/api/v1/static/bootstrap/img/glyphicons-halflings.png diff --git a/ceilometer/api/static/bootstrap/js/bootstrap.js b/ceilometer/api/v1/static/bootstrap/js/bootstrap.js similarity index 100% rename from ceilometer/api/static/bootstrap/js/bootstrap.js rename to ceilometer/api/v1/static/bootstrap/js/bootstrap.js diff --git a/ceilometer/api/static/d3.v2.js b/ceilometer/api/v1/static/d3.v2.js similarity index 100% rename from ceilometer/api/static/d3.v2.js rename to ceilometer/api/v1/static/d3.v2.js diff --git a/ceilometer/api/static/jquery-1.8.3.js b/ceilometer/api/v1/static/jquery-1.8.3.js similarity index 100% rename from ceilometer/api/static/jquery-1.8.3.js rename to ceilometer/api/v1/static/jquery-1.8.3.js diff --git a/ceilometer/api/static/rickshaw.css b/ceilometer/api/v1/static/rickshaw.css similarity index 100% rename from ceilometer/api/static/rickshaw.css rename to ceilometer/api/v1/static/rickshaw.css diff --git a/ceilometer/api/static/rickshaw.js b/ceilometer/api/v1/static/rickshaw.js similarity index 100% rename from ceilometer/api/static/rickshaw.js rename to ceilometer/api/v1/static/rickshaw.js diff --git a/ceilometer/api/templates/list_event.html b/ceilometer/api/v1/templates/list_event.html similarity index 100% rename from ceilometer/api/templates/list_event.html rename to ceilometer/api/v1/templates/list_event.html diff --git a/ceilometer/tests/api.py b/ceilometer/tests/api.py index d5c707d35..83f442ab5 100644 --- a/ceilometer/tests/api.py +++ b/ceilometer/tests/api.py @@ -24,17 +24,16 @@ import urllib import flask from ceilometer.tests import db as db_test_base -from ceilometer.api import v1 -from ceilometer.api import app -from ceilometer.openstack.common import cfg +from ceilometer.api.v1 import blueprint as v1_blueprint +from ceilometer.api.v1 import app as v1_app class TestBase(db_test_base.TestBase): def setUp(self): super(TestBase, self).setUp() - self.app = app.make_app(enable_acl=False, attach_storage=False) - self.app.register_blueprint(v1.blueprint) + self.app = v1_app.make_app(enable_acl=False, attach_storage=False) + self.app.register_blueprint(v1_blueprint.blueprint) self.test_app = self.app.test_client() @self.app.before_request diff --git a/tests/api/v1/test_get_query_ts.py b/tests/api/v1/test_get_query_ts.py index c97dd70d7..1e72d598f 100644 --- a/tests/api/v1/test_get_query_ts.py +++ b/tests/api/v1/test_get_query_ts.py @@ -20,11 +20,11 @@ import datetime -from ceilometer.api import v1 +from ceilometer.api.v1 import blueprint def test_get_query_timestamps_none_specified(): - result = v1._get_query_timestamps() + result = blueprint._get_query_timestamps() expected = {'start_timestamp': None, 'end_timestamp': None, 'query_start': None, @@ -37,7 +37,7 @@ def test_get_query_timestamps_none_specified(): def test_get_query_timestamps_start(): args = {'start_timestamp': '2012-09-20T12:13:14'} - result = v1._get_query_timestamps(args) + result = blueprint._get_query_timestamps(args) expected = {'start_timestamp': datetime.datetime(2012, 9, 20, 12, 13, 14), 'end_timestamp': None, 'query_start': datetime.datetime(2012, 9, 20, 12, 13, 14), @@ -50,7 +50,7 @@ def test_get_query_timestamps_start(): def test_get_query_timestamps_end(): args = {'end_timestamp': '2012-09-20T12:13:14'} - result = v1._get_query_timestamps(args) + result = blueprint._get_query_timestamps(args) expected = {'end_timestamp': datetime.datetime(2012, 9, 20, 12, 13, 14), 'start_timestamp': None, 'query_end': datetime.datetime(2012, 9, 20, 12, 13, 14), @@ -66,7 +66,7 @@ def test_get_query_timestamps_with_offset(): 'end_timestamp': '2012-09-20T13:24:25', 'search_offset': '20', } - result = v1._get_query_timestamps(args) + result = blueprint._get_query_timestamps(args) expected = {'query_end': datetime.datetime(2012, 9, 20, 13, 44, 25), 'query_start': datetime.datetime(2012, 9, 20, 11, 53, 14), 'end_timestamp': datetime.datetime(2012, 9, 20, 13, 24, 25),