Moving common api code into cinder.api

This is progress for beginning to have separate versions of the
cinder api. Common code that would be shared by v1, v2 etc will use
these modules, so we'll just move them to a common place. Test directory
structure has also been updated.

progress on blueprint apiv2

Change-Id: I99fd95fc3bb5d4f4fc3d9ef5b76b6372a1f6033d

cinder/api/common.py

@@ -22,7 +22,7 @@ import urlparse
 import webob
 
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 from cinder import flags
 from cinder.openstack.common import log as logging
 

cinder/api/extensions.py

@@ -23,7 +23,7 @@ import webob.exc
 
 import cinder.api.openstack
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import exception as common_exception

cinder/api/openstack/volume/__init__.py

@@ -25,8 +25,8 @@ from cinder.api.openstack.volume import extensions
 from cinder.api.openstack.volume import limits
 from cinder.api.openstack.volume import snapshots
 from cinder.api.openstack.volume import types
-from cinder.api.openstack.volume import versions
 from cinder.api.openstack.volume import volumes
+from cinder.api import versions
 from cinder.openstack.common import log as logging
 
 

cinder/api/openstack/volume/contrib/__init__.py

@@ -21,7 +21,7 @@ It can't be called 'extensions' because that causes namespacing problems.
 
 """
 
-from cinder.api.openstack import extensions
+from cinder.api import extensions
 from cinder import flags
 from cinder.openstack.common import log as logging
 

cinder/api/openstack/volume/contrib/admin_actions.py

@@ -15,7 +15,7 @@
 import webob
 from webob import exc
 
-from cinder.api.openstack import extensions
+from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder import db
 from cinder import exception

cinder/api/openstack/volume/contrib/extended_snapshot_attributes.py

@@ -16,9 +16,9 @@
 
 from webob import exc
 
-from cinder.api.openstack import extensions
+from cinder.api import extensions
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import log as logging

cinder/api/openstack/volume/contrib/image_create.py

@@ -19,7 +19,7 @@
 """The Create Volume from Image extension."""
 
 
-from cinder.api.openstack import extensions
+from cinder.api import extensions
 
 
 class Image_create(extensions.ExtensionDescriptor):

cinder/api/openstack/volume/contrib/quota_classes.py

@@ -15,9 +15,9 @@
 
 import webob
 
-from cinder.api.openstack import extensions
+from cinder.api import extensions
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
 from cinder import quota

cinder/api/openstack/volume/contrib/quotas.py

@@ -17,9 +17,9 @@
 
 import webob
 
-from cinder.api.openstack import extensions
+from cinder.api import extensions
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 from cinder import db
 from cinder.db.sqlalchemy import api as sqlalchemy_api
 from cinder import exception

cinder/api/openstack/volume/contrib/types_extra_specs.py

@@ -19,9 +19,9 @@
 
 import webob
 
-from cinder.api.openstack import extensions
+from cinder.api import extensions
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
 from cinder.volume import volume_types

cinder/api/openstack/volume/contrib/types_manage.py

@@ -19,10 +19,10 @@
 
 import webob
 
-from cinder.api.openstack import extensions
+from cinder.api import extensions
 from cinder.api.openstack.volume import types
-from cinder.api.openstack.volume.views import types as views_types
 from cinder.api.openstack import wsgi
+from cinder.api.views import types as views_types
 from cinder import exception
 from cinder.volume import volume_types
 

cinder/api/openstack/volume/contrib/volume_actions.py

@@ -15,9 +15,9 @@
 import webob
 from xml.dom import minidom
 
-from cinder.api.openstack import extensions
+from cinder.api import extensions
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import log as logging

cinder/api/openstack/volume/contrib/volume_host_attribute.py

@@ -12,9 +12,9 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-from cinder.api.openstack import extensions
+from cinder.api import extensions
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 from cinder.openstack.common import log as logging
 from cinder import volume
 

cinder/api/openstack/volume/contrib/volume_tenant_attribute.py

@@ -12,9 +12,9 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-from cinder.api.openstack import extensions
+from cinder.api import extensions
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 from cinder import volume
 
 

cinder/api/openstack/volume/extensions.py

@@ -15,7 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinder.api.openstack import extensions as base_extensions
+from cinder.api import extensions as base_extensions
 from cinder import flags
 from cinder.openstack.common import log as logging
 

cinder/api/openstack/volume/limits.py

@@ -27,9 +27,9 @@ import time
 import webob.dec
 import webob.exc
 
-from cinder.api.openstack.volume.views import limits as limits_views
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api.views import limits as limits_views
+from cinder.api import xmlutil
 from cinder.openstack.common import importutils
 from cinder.openstack.common import jsonutils
 from cinder import quota

cinder/api/openstack/volume/snapshots.py

@@ -18,10 +18,10 @@
 import webob
 from webob import exc
 
-from cinder.api.openstack import common
+from cinder.api import common
 from cinder.api.openstack.volume import volumes
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import log as logging

cinder/api/openstack/volume/types.py

@@ -19,9 +19,9 @@
 
 from webob import exc
 
-from cinder.api.openstack.volume.views import types as views_types
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api.views import types as views_types
+from cinder.api import xmlutil
 from cinder import exception
 from cinder.volume import volume_types
 

cinder/api/openstack/volume/volumes.py

@@ -19,9 +19,9 @@ import webob
 from webob import exc
 from xml.dom import minidom
 
-from cinder.api.openstack import common
+from cinder.api import common
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import log as logging

cinder/api/versions.py

@@ -16,12 +16,11 @@
 #    under the License.
 
 import datetime
-
 from lxml import etree
 
-from cinder.api.openstack.volume.views import versions as views_versions
 from cinder.api.openstack import wsgi
-from cinder.api.openstack import xmlutil
+from cinder.api.views import versions as views_versions
+from cinder.api import xmlutil
 
 
 VERSIONS = {

cinder/api/views/types.py

@@ -15,7 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinder.api.openstack import common
+from cinder.api import common
 
 
 class ViewBuilder(common.ViewBuilder):

cinder/api/xmlutil.py

@@ -32,9 +32,9 @@ XMLNS_VOLUME_V1 = 'http://docs.openstack.org/volume/api/v1'
 def validate_schema(xml, schema_name):
     if isinstance(xml, str):
         xml = etree.fromstring(xml)
-    base_path = 'cinder/api/openstack/volume/schemas/v1.1/'
+    base_path = 'cinder/api/schemas/v1.1/'
     if schema_name in ('atom', 'atom-link'):
-        base_path = 'cinder/api/openstack/volume/schemas/'
+        base_path = 'cinder/api/schemas/'
     schema_path = os.path.join(utils.cinderdir(),
                                '%s%s.rng' % (base_path, schema_name))
     schema_doc = etree.parse(schema_path)

cinder/tests/api/openstack/fakes.py

@@ -26,11 +26,11 @@ import webob.request
 from cinder.api import auth as api_auth
 from cinder.api import openstack as openstack_api
 from cinder.api.openstack import auth
-from cinder.api.openstack import urlmap
 from cinder.api.openstack import volume
 from cinder.api.openstack.volume import limits
-from cinder.api.openstack.volume import versions
 from cinder.api.openstack import wsgi as os_wsgi
+from cinder.api import urlmap
+from cinder.api import versions
 from cinder import context
 from cinder import exception as exc
 from cinder.openstack.common import timeutils

cinder/tests/api/openstack/test_faults.py

@@ -21,7 +21,7 @@ import webob
 import webob.dec
 import webob.exc
 
-from cinder.api.openstack import common
+from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder.openstack.common import jsonutils
 from cinder import test

cinder/tests/api/openstack/volume/extensions/foxinsocks.py

@@ -17,7 +17,7 @@
 
 import webob.exc
 
-from cinder.api.openstack import extensions
+from cinder.api import extensions
 from cinder.api.openstack import wsgi
 
 

cinder/tests/api/openstack/volume/test_extensions.py

@@ -21,7 +21,7 @@ from lxml import etree
 import webob
 
 from cinder.api.openstack import volume
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 from cinder import flags
 from cinder.openstack.common import jsonutils
 from cinder import test

cinder/tests/api/openstack/volume/test_limits.py

@@ -25,8 +25,8 @@ from lxml import etree
 import webob
 
 from cinder.api.openstack.volume import limits
-from cinder.api.openstack.volume import views
+from cinder.api import views
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 import cinder.context
 from cinder.openstack.common import jsonutils
 from cinder import test

cinder/tests/api/openstack/volume/test_router.py

@@ -16,9 +16,9 @@
 
 from cinder.api.openstack import volume
 from cinder.api.openstack.volume import snapshots
-from cinder.api.openstack.volume import versions
 from cinder.api.openstack.volume import volumes
 from cinder.api.openstack import wsgi
+from cinder.api import versions
 from cinder import flags
 from cinder.openstack.common import log as logging
 from cinder import test

cinder/tests/api/openstack/volume/test_types.py

@@ -17,7 +17,7 @@ from lxml import etree
 import webob
 
 from cinder.api.openstack.volume import types
-from cinder.api.openstack.volume.views import types as views_types
+from cinder.api.views import types as views_types
 from cinder import exception
 from cinder.openstack.common import timeutils
 from cinder import test

cinder/tests/api/test_common.py

@@ -22,7 +22,7 @@ Test suites for 'common' code used throughout the OpenStack HTTP API.
 import webob
 import webob.exc
 
-from cinder.api.openstack import common
+from cinder.api import common
 from cinder import test
 
 
@@ -32,7 +32,7 @@ ATOMNS = "{http://www.w3.org/2005/Atom}"
 
 class LimiterTest(test.TestCase):
     """
-    Unit tests for the `cinder.api.openstack.common.limited` method which takes
+    Unit tests for the `cinder.api.common.limited` method which takes
     in a list of items and, depending on the 'offset' and 'limit' GET params,
     returns a subset or complete set of the given items.
     """
@@ -156,7 +156,7 @@ class LimiterTest(test.TestCase):
 
 class PaginationParamsTest(test.TestCase):
     """
-    Unit tests for the `cinder.api.openstack.common.get_pagination_params`
+    Unit tests for the `cinder.api.common.get_pagination_params`
     method which takes in a request object and returns 'marker' and 'limit'
     GET params.
     """

cinder/tests/api/test_xmlutil.py

@@ -17,7 +17,7 @@
 
 from lxml import etree
 
-from cinder.api.openstack import xmlutil
+from cinder.api import xmlutil
 from cinder import test
 
 

cinder/tests/integrated/test_xml.py

@@ -17,7 +17,7 @@
 
 from lxml import etree
 
-from cinder.api.openstack import common
+from cinder.api import common
 from cinder.openstack.common import log as logging
 from cinder.tests.integrated import integrated_helpers
 

etc/cinder/api-paste.ini

@@ -3,7 +3,7 @@
 #############
 
 [composite:osapi_volume]
-use = call:cinder.api.openstack.urlmap:urlmap_factory
+use = call:cinder.api.urlmap:urlmap_factory
 /: osvolumeversions
 /v1: openstack_volume_api_v1
 
@@ -29,7 +29,7 @@ paste.app_factory = cinder.api.openstack.volume:APIRouter.factory
 pipeline = faultwrap osvolumeversionapp
 
 [app:osvolumeversionapp]
-paste.app_factory = cinder.api.openstack.volume.versions:Versions.factory
+paste.app_factory = cinder.api.versions:Versions.factory
 
 ##########
 # Shared #