SAP: Use is_instance_storage_share instead of ssh

nova/compute/manager.py

@@ -522,6 +522,10 @@ def update_compute_provider_status(self, context, rp_uuid, enabled):
             self.reportclient.set_traits_for_provider(
                 context, rp_uuid, new_traits, generation=trait_info.generation)
 
+    def is_instance_storage_shared(self, context, instance, host=None):
+        return self._compute._is_instance_storage_shared(context, instance,
+                                                         host=host)
+
 
 class ComputeManager(manager.Manager):
     """Manages the running instances from creation to destruction."""
@@ -5629,7 +5633,7 @@ def _resize_instance(
             timeout, retry_interval = self._get_power_off_values(
                 instance, clean_shutdown)
             disk_info = self.driver.migrate_disk_and_power_off(
-                context, instance, migration.dest_host,
+                context, instance, migration,
                 flavor, network_info,
                 block_device_info,
                 timeout, retry_interval)

nova/tests/unit/compute/test_virtapi.py

@@ -56,6 +56,12 @@ def test_update_compute_provider_status(self):
                             nova_context.get_admin_context(), uuids.rp_uuid,
                             enabled=False)
 
+    def test_is_instance_storage_shared(self):
+        self.assertExpected('is_instance_storage_shared',
+                            nova_context.get_admin_context(),
+                            mock.sentinel.instance,
+                            mock.sentinel.host)
+
 
 class FakeVirtAPITest(VirtAPIBaseTest):
 
@@ -74,6 +80,8 @@ def assertExpected(self, method, *args, **kwargs):
             self.virtapi.exit_wait_early(*args, **kwargs)
         elif method == 'update_compute_provider_status':
             self.virtapi.update_compute_provider_status(*args, **kwargs)
+        elif method == 'is_instance_storage_shared':
+            self.virtapi.is_instance_storage_shared(*args, **kwargs)
         else:
             self.fail("Unhandled FakeVirtAPI method: %s" % method)
 
@@ -116,6 +124,9 @@ def _prepare_for_instance_event(self, instance, name, tag):
         self._events.append(m)
         return m
 
+    def _is_instance_storage_shared(self, context, instance, host):
+        return
+
 
 class ComputeVirtAPITest(VirtAPIBaseTest):
 
@@ -230,3 +241,15 @@ def test_update_compute_provider_status(self):
         self.virtapi.update_compute_provider_status(
             ctxt, uuids.rp_uuid, enabled=True)
         self.assertEqual(set(), self.compute.provider_traits[uuids.rp_uuid])
+
+    def test_is_instance_storage_shared(self):
+        ctxt = nova_context.get_admin_context()
+
+        with mock.patch.object(self.compute,
+                                '_is_instance_storage_shared') as mock_shared:
+            self.virtapi.is_instance_storage_shared(ctxt,
+                                                    mock.sentinel.instance,
+                                                    host=mock.sentinel.host)
+            mock_shared.assert_called_once_with(ctxt,
+                                                mock.sentinel.instance,
+                                                host=mock.sentinel.host)

nova/tests/unit/virt/hyperv/test_driver.py

@@ -24,6 +24,7 @@
 from os_win import exceptions as os_win_exc
 
 from nova import exception
+from nova import objects
 from nova import safe_utils
 from nova.tests.unit import fake_instance
 from nova.tests.unit.virt.hyperv import test_base
@@ -387,15 +388,17 @@ def test_unplug_vifs(self):
             mock.sentinel.instance, mock.sentinel.network_info)
 
     def test_migrate_disk_and_power_off(self):
+        migration = objects.Migration(dest_host='10.0.0.1',
+                                      dest_compute='mock-compute')
         self.driver.migrate_disk_and_power_off(
-            mock.sentinel.context, mock.sentinel.instance, mock.sentinel.dest,
+            mock.sentinel.context, mock.sentinel.instance, migration,
             mock.sentinel.flavor, mock.sentinel.network_info,
             mock.sentinel.block_device_info, mock.sentinel.timeout,
             mock.sentinel.retry_interval)
 
         migr_power_off = self.driver._migrationops.migrate_disk_and_power_off
         migr_power_off.assert_called_once_with(
-            mock.sentinel.context, mock.sentinel.instance, mock.sentinel.dest,
+            mock.sentinel.context, mock.sentinel.instance, migration.dest_host,
             mock.sentinel.flavor, mock.sentinel.network_info,
             mock.sentinel.block_device_info, mock.sentinel.timeout,
             mock.sentinel.retry_interval)