From 258beef2649d79c24ddafaf2064e94557c316bde Mon Sep 17 00:00:00 2001 From: Vipin Balachandran Date: Thu, 30 Aug 2018 14:38:16 -0700 Subject: [PATCH] VMware: Fix revert-to-snapshot Commit 46b8da35d79121df34ec9befd353c8c428be846b modified the method we use to query the backend volumes. But, revert-to-snapshot implementation which was in-progress when the above commit was merged missed that change. Fixing it by updating the query method call in revert_to_snapshot. Change-Id: I34cbd4420b43f52cd8d23833658f6386cb3e6437 Closes-bug: #1790008 --- cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py | 4 ++-- cinder/volume/drivers/vmware/vmdk.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py b/cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py index 19be00f132b..6c4f4763d7b 100644 --- a/cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py +++ b/cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py @@ -3232,7 +3232,7 @@ class VMwareVcVmdkDriverTestCase(test.TestCase): self._driver.revert_to_snapshot( mock.sentinel.context, volume, snapshot) - vops.get_backing.assert_called_once_with(volume.name) + vops.get_backing.assert_called_once_with(volume.name, volume.id) vops.revert_to_snapshot.assert_not_called() @mock.patch.object(VMDK_DRIVER, 'volumeops') @@ -3260,7 +3260,7 @@ class VMwareVcVmdkDriverTestCase(test.TestCase): self._driver.revert_to_snapshot( mock.sentinel.context, volume, snapshot) - vops.get_backing.assert_called_once_with(volume.name) + vops.get_backing.assert_called_once_with(volume.name, volume.id) vops.revert_to_snapshot.assert_called_once_with(backing, snapshot.name) diff --git a/cinder/volume/drivers/vmware/vmdk.py b/cinder/volume/drivers/vmware/vmdk.py index 78c1c80356e..99895c35b36 100644 --- a/cinder/volume/drivers/vmware/vmdk.py +++ b/cinder/volume/drivers/vmware/vmdk.py @@ -2226,7 +2226,7 @@ class VMwareVcVmdkDriver(driver.VolumeDriver): raise exception.InvalidSnapshot("Cannot revert to template " "based snapshot") - backing = self.volumeops.get_backing(volume.name) + backing = self.volumeops.get_backing(volume.name, volume.id) if not backing: LOG.debug("Backing does not exist for volume.", resource=volume) else: