Moving contrib to cinder.api

This moves over all contrib to a common place for all api versions to
use. Test directory structure has been adjusted to match.

For compatibility with old cinder config settings, we ignore the old
contrib path and use the new location.

progress on blueprint apiv2

Change-Id: If1a24fd3c4d15db559674a021f6928613966e3a1

cinder/api/extensions.py

@@ -269,6 +269,20 @@ def _load_extensions(self):
 
         extensions = list(self.cls_list)
 
+        # NOTE(thingee): Until we update devstack to have the new location,
+        # we'll just set replace the old contrib path with the new and preserve
+        # any other extensions that need to be loaded
+        old_contrib_path = ('cinder.api.openstack.volume.contrib.'
+                            'standard_extensions')
+        new_contrib_path = 'cinder.api.contrib.standard_extensions'
+        if old_contrib_path in extensions:
+            LOG.warn(_('osapi_volume_extension is set to deprecated path: %s'),
+                     old_contrib_path)
+            LOG.warn(_('Please set your flag or cinder.conf settings for '
+                       'osapi_volume_extension to: %s'), new_contrib_path)
+            extensions = [e.replace(old_contrib_path, new_contrib_path)
+                          for e in extensions]
+
         for ext_factory in extensions:
             try:
                 self.load_extension(ext_factory)

cinder/flags.py

@@ -140,12 +140,15 @@ def _get_my_ip():
     cfg.ListOpt('osapi_volume_ext_list',
                 default=[],
                 help='Specify list of extensions to load when using osapi_'
-                     'volume_extension option with cinder.api.openstack.'
-                     'volume.contrib.select_extensions'),
+                     'volume_extension option with cinder.api.contrib.'
+                     'select_extensions'),
+    # NOTE(thingee): default contrib for old and new location for compatibility
     cfg.MultiStrOpt('osapi_volume_extension',
                     default=[
-                      'cinder.api.openstack.volume.contrib.standard_extensions'
-                      ],
+                        'cinder.api.openstack.volume.contrib.'
+                        'standard_extensions',
+                        'cinder.api.contrib.standard_extensions',
+                    ],
                     help='osapi volume extension to load'),
     cfg.StrOpt('osapi_compute_link_prefix',
                default=None,

cinder/tests/api/openstack/volume/contrib/test_extended_snapshot_attributes.py → cinder/tests/api/contrib/test_extended_snapshot_attributes.py

@@ -16,7 +16,7 @@
 from lxml import etree
 import webob
 
-from cinder.api.openstack.volume.contrib import extended_snapshot_attributes
+from cinder.api.contrib import extended_snapshot_attributes
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import jsonutils

cinder/tests/api/openstack/volume/contrib/test_types_extra_specs.py → cinder/tests/api/contrib/test_types_extra_specs.py

@@ -20,7 +20,7 @@
 from lxml import etree
 import webob
 
-from cinder.api.openstack.volume.contrib import types_extra_specs
+from cinder.api.contrib import types_extra_specs
 from cinder import test
 from cinder.tests.api.openstack import fakes
 import cinder.wsgi

cinder/tests/api/openstack/volume/contrib/test_types_manage.py → cinder/tests/api/contrib/test_types_manage.py

@@ -15,7 +15,7 @@
 
 import webob
 
-from cinder.api.openstack.volume.contrib import types_manage
+from cinder.api.contrib import types_manage
 from cinder import exception
 from cinder import test
 from cinder.tests.api.openstack import fakes

cinder/tests/api/openstack/volume/contrib/test_volume_actions.py → cinder/tests/api/contrib/test_volume_actions.py

@@ -18,7 +18,7 @@
 import uuid
 import webob
 
-from cinder.api.openstack.volume.contrib import volume_actions
+from cinder.api.contrib import volume_actions
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import jsonutils