Implements blueprint separate-nova-volumeapi

 * Moves openstack/v2 directory to compute and fixes tests accordingly
 * Moves some code from api/openstack/compute to shared location, for use by volume api
 * Implements basic volume functionality for types, volumes, and snapshots
 * Changes service name from osapi to osapi_compute (and adds osapi_volume)
 * Renames nova-api-os to nova-api-os-compute, adds nove-api-os-volume
 * Separate extension mechanism for compute and volume
 ** Removes flag osapi_extension and replaces with osapi_compute_extension and osapi_volume_extension
 * Updates the paste config
 * Fixes setup.py to include nova-os-api-compute and nova-os-api-volume
 * Fix bug in volume version code that occurred as result of trunk merge
 * Update integrated/test_volumes.py to use new endpoint

Change-Id: I4c2e57c3cafd4e1a9e2ff3ce201c8cf28326afcd

1 files changed, 41 insertions, 21 deletions

diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini
index 145044df7..c2de4b484 100644
--- a/etc/nova/api-paste.ini
+++ b/etc/nova/api-paste.ini
@@ -78,40 +78,60 @@ paste.app_factory = nova.api.ec2:Executor.factory
 # Openstack #
 #############
 
-[composite:osapi]
-use = call:nova.api.openstack.v2.urlmap:urlmap_factory
-/: osversions
-/v1.1: openstack_api_v2
-/v2: openstack_api_v2
-
-[pipeline:openstack_api_v2]
-pipeline = faultwrap noauth ratelimit serialize extensions osapi_app_v2
+[composite:osapi_compute]
+use = call:nova.api.openstack.urlmap:urlmap_factory
+/: oscomputeversions
+/v1.1: openstack_compute_api_v2
+/v2: openstack_compute_api_v2
+
+[composite:osapi_volume]
+use = call:nova.api.openstack.urlmap:urlmap_factory
+/: osvolumeversions
+/v1: openstack_volume_api_v1
+
+[pipeline:openstack_compute_api_v2]
+pipeline = faultwrap noauth ratelimit serialize compute_extensions osapi_compute_app_v2
 # NOTE(vish): use the following pipeline for deprecated auth
-# pipeline = faultwrap auth ratelimit serialize extensions osapi_app_v2
+# pipeline = faultwrap auth ratelimit serialize extensions osapi_compute_app_v2
+
+[pipeline:openstack_volume_api_v1]
+pipeline = faultwrap noauth ratelimit serialize volume_extensions osapi_volume_app_v1
 
 [filter:faultwrap]
-paste.filter_factory = nova.api.openstack.v2:FaultWrapper.factory
+paste.filter_factory = nova.api.openstack:FaultWrapper.factory
 
 [filter:auth]
-paste.filter_factory = nova.api.openstack.v2.auth:AuthMiddleware.factory
+paste.filter_factory = nova.api.openstack.auth:AuthMiddleware.factory
 
 [filter:noauth]
-paste.filter_factory = nova.api.openstack.v2.auth:NoAuthMiddleware.factory
+paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory
 
 [filter:ratelimit]
-paste.filter_factory = nova.api.openstack.v2.limits:RateLimitingMiddleware.factory
+paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory
 
 [filter:serialize]
 paste.filter_factory = nova.api.openstack.wsgi:LazySerializationMiddleware.factory
 
-[filter:extensions]
-paste.filter_factory = nova.api.openstack.v2.extensions:ExtensionMiddleware.factory
+[filter:compute_extensions]
+paste.filter_factory = nova.api.openstack.compute.extensions:ExtensionMiddleware.factory
+
+[filter:volume_extensions]
+paste.filter_factory = nova.api.openstack.volume.extensions:ExtensionMiddleware.factory
+
+[app:osapi_compute_app_v2]
+paste.app_factory = nova.api.openstack.compute:APIRouter.factory
+
+[pipeline:oscomputeversions]
+pipeline = faultwrap oscomputeversionapp
+
+[app:osapi_volume_app_v1]
+paste.app_factory = nova.api.openstack.volume:APIRouter.factory
 
-[app:osapi_app_v2]
-paste.app_factory = nova.api.openstack.v2:APIRouter.factory
+[app:oscomputeversionapp]
+paste.app_factory = nova.api.openstack.compute.versions:Versions.factory
 
-[pipeline:osversions]
-pipeline = faultwrap osversionapp
+[pipeline:osvolumeversions]
+pipeline = faultwrap osvolumeversionapp
 
-[app:osversionapp]
-paste.app_factory = nova.api.openstack.v2.versions:Versions.factory
+[app:osvolumeversionapp]
+paste.app_factory = nova.api.openstack.volume.versions:Versions.factory