Deprecating old dot path locations for Folsom configs

In grizzly, we made a lot of structure changes. This deprecates the old
locations so the dot paths in old configs still work but give warnings
in the logs of what needs to be updated.

Fixes: bug #1168573
Change-Id: I7b1754b0e59a923afa623871fc3be07362bf1bdc
(cherry picked from commit c355d68a868e9232a80c2f22557ffe228fcb4f8f)

diff --git a/cinder/api/auth.py b/cinder/api/auth.py
new file mode 100644 (file)
index 0000000..ac673cf
--- /dev/null
+++ b/cinder/api/auth.py
@@ -0,0 +1,36 @@
+# Copyright (c) 2013 OpenStack, LLC.
+#
+# All Rights Reserved.
+#
+#    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.
+
+from cinder.api.middleware import auth
+from cinder.openstack.common import log as logging
+
+
+LOG = logging.getLogger(__name__)
+
+
+class CinderKeystoneContext(auth.CinderKeystoneContext):
+    def __init__(self, application):
+        LOG.warn(_('cinder.api.auth:CinderKeystoneContext is deprecated. '
+                   'Please use '
+                   'cinder.api.middleware.auth:CinderKeystoneContext '
+                   'instead.'))
+        super(CinderKeystoneContext, self).__init__(application)
+
+
+def pipeline_factory(loader, global_conf, **local_conf):
+    LOG.warn(_('cinder.api.auth:pipeline_factory is deprecated. Please use '
+             'cinder.api.middleware.auth:pipeline_factory instead.'))
+    auth.pipeline_factory(loader, global_conf, **local_conf)

diff --git a/cinder/api/openstack/__init__.py b/cinder/api/openstack/__init__.py
index 4a6702d9d33a05956062bc64a96510a967f52cde..a3b2e6da2ecad6227b19c7098fefb8d25db1e864 100644 (file)
--- a/cinder/api/openstack/__init__.py
+++ b/cinder/api/openstack/__init__.py
@@ -1,7 +1,5 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Copyright (c) 2013 OpenStack, LLC.
+#
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -22,6 +20,7 @@ WSGI middleware for OpenStack API controllers.
 
 import routes
 
+from cinder.api.middleware import fault
 from cinder.api.openstack import wsgi
 from cinder.openstack.common import log as logging
 from cinder import utils
@@ -122,3 +121,10 @@ class APIRouter(base_wsgi.Router):
 
     def _setup_routes(self, mapper, ext_mgr):
         raise NotImplementedError
+
+
+class FaultWrapper(fault.FaultWrapper):
+    def __init__(self, application):
+        LOG.warn(_('cinder.api.openstack:FaultWrapper is deprecated. Please '
+                   'use cinder.api.middleware.fault:FaultWrapper instead.'))
+        super(FaultWrapper, self).__init__(application)

diff --git a/cinder/api/openstack/urlmap.py b/cinder/api/openstack/urlmap.py
new file mode 100644 (file)
index 0000000..ab24070
--- /dev/null
+++ b/cinder/api/openstack/urlmap.py
@@ -0,0 +1,27 @@
+# Copyright (c) 2013 OpenStack, LLC.
+#
+# All Rights Reserved.
+#
+#    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.
+
+from cinder.api import urlmap
+from cinder.openstack.common import log as logging
+
+
+LOG = logging.getLogger(__name__)
+
+
+def urlmap_factory(loader, global_conf, **local_conf):
+    LOG.warn(_('cinder.api.openstack.urlmap:urlmap_factory is deprecated. '
+             'Please use cinder.api.urlmap:urlmap_factory instead.'))
+    urlmap.urlmap_factory(loader, global_conf, **local_conf)

diff --git a/cinder/api/openstack/volume/__init__.py b/cinder/api/openstack/volume/__init__.py
new file mode 100644 (file)
index 0000000..875db43
--- /dev/null
+++ b/cinder/api/openstack/volume/__init__.py
@@ -0,0 +1,27 @@
+# Copyright (c) 2013 OpenStack, LLC.
+#
+# All Rights Reserved.
+#
+#    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.
+
+from cinder.api.v1.router import APIRouter as v1_router
+from cinder.openstack.common import log as logging
+
+LOG = logging.getLogger(__name__)
+
+
+class APIRouter(v1_router):
+    def __init__(self, ext_mgr=None):
+        LOG.warn(_('cinder.api.openstack.volume:APIRouter is deprecated. '
+                 'Please use cinder.api.v1.router:APIRouter instead.'))
+        super(APIRouter, self).__init__(ext_mgr)

diff --git a/cinder/api/openstack/volume/versions.py b/cinder/api/openstack/volume/versions.py
new file mode 100644 (file)
index 0000000..857b769
--- /dev/null
+++ b/cinder/api/openstack/volume/versions.py
@@ -0,0 +1,29 @@
+# Copyright (c) 2013 OpenStack, LLC.
+#
+# All Rights Reserved.
+#
+#    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.
+
+from cinder.api import versions
+from cinder.openstack.common import log as logging
+
+
+LOG = logging.getLogger(__name__)
+
+
+class Versions(versions.Versions):
+    def __init__(self):
+        LOG.warn(_('cinder.api.openstack.volume.versions.Versions is '
+                   'deprecated. Please use cinder.api.versions.Versions '
+                   'instead.'))
+        super(Versions, self).__init__()

diff --git a/cinder/api/sizelimit.py b/cinder/api/sizelimit.py
new file mode 100644 (file)
index 0000000..70cd454
--- /dev/null
+++ b/cinder/api/sizelimit.py
@@ -0,0 +1,28 @@
+# Copyright (c) 2013 OpenStack, LLC.
+#
+# All Rights Reserved.
+#
+#    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.
+
+from cinder.api.middleware import sizelimit
+from cinder.openstack.common import log as logging
+
+LOG = logging.getLogger(__name__)
+
+
+class RequestBodySizeLimiter(sizelimit.RequestBodySizeLimiter):
+    def __init__(self, *args, **kwargs):
+        LOG.warn(_('cinder.api.sizelimit:RequestBodySizeLimiter is '
+                   'deprecated. Please use cinder.api.middleware.sizelimit:'
+                   'RequestBodySizeLimiter instead'))
+        super(RequestBodySizeLimiter, self).__init__(*args, **kwargs)