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 <doug.hellmann@dreamhost.com>

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
 

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:

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.v1 import blueprint as v1_blueprint
-from ceilometer.api import app
+from ceilometer.api.v1 import app as v1_app
-from ceilometer.openstack.common import cfg
 
 
 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 = v1_app.make_app(enable_acl=False, attach_storage=False)
-        self.app.register_blueprint(v1.blueprint)
+        self.app.register_blueprint(v1_blueprint.blueprint)
         self.test_app = self.app.test_client()
 
         @self.app.before_request

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),