Fix cinder tests for refactoring effort

We are refactoring the glance cinder store[1] to support the
extend in-use feature[2] due to which cinder store tests on
glance side are failing[3] as they aren't able to locate the
files in their new location.
This patch fixes the issue to import from new path while keeping
backward compatibility to import from old path to pass gate until
the new changes have merged.

[1] https://review.opendev.org/c/openstack/glance_store/+/843103
[2] https://review.opendev.org/c/openstack/glance_store/+/868742
[3] https://zuul.opendev.org/t/openstack/build/41a1abf9c749476bb10a56600ca07f0e

Change-Id: Ib9f7160fdbac74fc419faa6b3ab8acb17400d392

Author: rajathere

glance/tests/functional/v2/test_legacy_update_cinder_store.py

@@ -19,14 +19,23 @@
 
 from cinderclient.v3 import client as cinderclient
 import glance_store
-from glance_store._drivers import cinder
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import strutils
 
 from glance.common import wsgi
 from glance.tests import functional
 
+# Keeping backward compatibility to support importing from old
+# path
+try:
+    from glance_store._drivers.cinder import base
+    from glance_store._drivers.cinder import store as cinder
+except ImportError:
+    from glance_store._drivers import cinder
+    base = mock.Mock()
+
+
 LOG = logging.getLogger(__name__)
 
 CONF = cfg.CONF
@@ -135,6 +144,7 @@ def _mock_wait_volume_status(self, volume, status_transition,
         volume.status = status_expected
         return volume
 
+    @mock.patch.object(base, 'connector')
     @mock.patch.object(cinderclient, 'Client')
     @mock.patch.object(cinder.Store, 'temporary_chown')
     @mock.patch.object(cinder, 'connector')
@@ -143,7 +153,8 @@ def _mock_wait_volume_status(self, volume, status_transition,
     @mock.patch.object(strutils, 'mask_dict_password')
     @mock.patch.object(socket, 'getaddrinfo')
     def test_create_image(self, mock_host_addr, mock_mask_pass, mock_wait,
-                          mock_open, mock_connector, mock_chown, mocked_cc):
+                          mock_open, mock_connector, mock_chown, mocked_cc,
+                          mock_base):
         # setup multiple cinder stores
         self.setup_multiple_stores()
         self.start_server()
@@ -165,6 +176,7 @@ def test_create_image(self, mock_host_addr, mock_mask_pass, mock_wait,
         mock_chown.assert_called()
         mock_connector.get_connector_properties.assert_called()
 
+    @mock.patch.object(base, 'connector')
     @mock.patch.object(cinderclient, 'Client')
     @mock.patch.object(cinder.Store, 'temporary_chown')
     @mock.patch.object(cinder, 'connector')
@@ -174,7 +186,7 @@ def test_create_image(self, mock_host_addr, mock_mask_pass, mock_wait,
     @mock.patch.object(socket, 'getaddrinfo')
     def test_migrate_image_after_upgrade(self, mock_host_addr, mock_mask_pass,
                                          mock_wait, mock_open, mock_connector,
-                                         mock_chown, mocked_cc):
+                                         mock_chown, mocked_cc, mock_base):
         """Test to check if an image is successfully migrated when we
 
         upgrade from a single cinder store to multiple cinder stores.
@@ -213,6 +225,7 @@ def test_migrate_image_after_upgrade(self, mock_host_addr, mock_mask_pass,
         mock_chown.assert_called()
         mock_connector.get_connector_properties.assert_called()
 
+    @mock.patch.object(base, 'connector')
     @mock.patch.object(cinderclient, 'Client')
     @mock.patch.object(cinder.Store, 'temporary_chown')
     @mock.patch.object(cinder, 'connector')
@@ -224,7 +237,8 @@ def test_migrate_image_after_upgrade_not_owner(self, mock_host_addr,
                                                    mock_mask_pass,
                                                    mock_wait, mock_open,
                                                    mock_connector,
-                                                   mock_chown, mocked_cc):
+                                                   mock_chown, mocked_cc,
+                                                   mock_base):
         """Test to check if an image is successfully migrated when we upgrade
         from a single cinder store to multiple cinder stores, and that
         GETs from non-owners in the meantime are not interrupted.