From e27b94287739207640b37ffd3e3a6b4176ef7cd3 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Thu, 8 Mar 2018 07:23:17 -0800 Subject: [PATCH] Pass user context to virt driver when detaching volume We need this in a later change to pull volume attachment information from cinder for the volume being detached so that we can do some attachment counting for multiattach volumes being detached from instances on the same host. (cherry-picked from commit d2941bfd165055348dd584b630d4e631ef05e328) Change-Id: If6e869b1c3516220b7deb0599d699caa2ed33889 Related-Bug: #1752115 --- compute_hyperv/nova/driver.py | 2 +- compute_hyperv/tests/unit/test_driver.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compute_hyperv/nova/driver.py b/compute_hyperv/nova/driver.py index 337ce29b..c97cc5ed 100644 --- a/compute_hyperv/nova/driver.py +++ b/compute_hyperv/nova/driver.py @@ -197,7 +197,7 @@ class HyperVDriver(driver.ComputeDriver): instance, update_device_metadata=True) - def detach_volume(self, connection_info, instance, mountpoint, + def detach_volume(self, context, connection_info, instance, mountpoint, encryption=None): context = nova_context.get_admin_context() # The nova compute manager only updates the device metadata in diff --git a/compute_hyperv/tests/unit/test_driver.py b/compute_hyperv/tests/unit/test_driver.py index f71b9869..962a0785 100644 --- a/compute_hyperv/tests/unit/test_driver.py +++ b/compute_hyperv/tests/unit/test_driver.py @@ -227,8 +227,8 @@ class HyperVDriverTestCase(test_base.HyperVBaseTestCase): def test_detach_volume(self): mock_instance = fake_instance.fake_instance_obj(self.context) self.driver.detach_volume( - mock.sentinel.connection_info, mock_instance, - mock.sentinel.mountpoint, mock.sentinel.encryption) + mock.sentinel.context, mock.sentinel.connection_info, + mock_instance, mock.sentinel.mountpoint, mock.sentinel.encryption) self.driver._volumeops.detach_volume.assert_called_once_with( mock.sentinel.admin_context,