openstack
/
compute-hyperv
Code Issues Proposed changes

Fixes wrong method call in volumeops 

planned_vm_exists method exists in migrationutils, not in vmutils.

Change-Id: I9af57254b90ef787b4633fcb367a77857a018ff4
This commit is contained in:
Claudiu Belu 2017-08-29 13:06:08 +03:00
parent 37977e19f6
commit 90b372ea42
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compute_hyperv/nova/volumeops.py
View File

@ -329,6 +329,7 @@ class BaseVolumeDriver(object):
self._conn = None
self._diskutils = utilsfactory.get_diskutils()
self._vmutils = utilsfactory.get_vmutils()
self._migrutils = utilsfactory.get_migrationutils()
@property
def _connector(self):
@ -401,7 +402,7 @@ class BaseVolumeDriver(object):
slot)
def detach_volume(self, connection_info, instance_name):
if self._vmutils.planned_vm_exists(instance_name):
if self._migrutils.planned_vm_exists(instance_name):
LOG.warning("Instance %s is a Planned VM, cannot detach "
"volumes from it.", instance_name)
return

4
compute_hyperv/tests/unit/test_volumeops.py
View File

@ -456,8 +456,10 @@ class BaseVolumeDriverTestCase(test_base.HyperVBaseTestCase):
self._base_vol_driver._diskutils = mock.Mock()
self._base_vol_driver._vmutils = mock.Mock()
self._base_vol_driver._migrutils = mock.Mock()
self._base_vol_driver._conn = mock.Mock()
self._vmutils = self._base_vol_driver._vmutils
self._migrutils = self._base_vol_driver._migrutils
self._diskutils = self._base_vol_driver._diskutils
self._conn = self._base_vol_driver._conn
@ -622,7 +624,7 @@ class BaseVolumeDriverTestCase(test_base.HyperVBaseTestCase):
@mock.patch.object(volumeops.BaseVolumeDriver,
'get_disk_resource_path')
def test_detach_volume(self, is_block_dev, mock_get_disk_resource_path):
self._vmutils.planned_vm_exists.return_value = False
self._migrutils.planned_vm_exists.return_value = False
connection_info = get_fake_connection_info()
self._base_vol_driver._is_block_dev = is_block_dev