openstack
/
nova
Code Issues Proposed changes

Merge "Remove final users of utils.execute() in libvirt."

This commit is contained in:
Zuul 2018-12-15 03:59:50 +00:00 committed by Gerrit Code Review
parent f05daa7905 fd4fb2ec0d
commit 16dac85186
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -695,7 +695,8 @@ class CacheConcurrencyTestCase(test.NoDBTestCase):
return False
self.stub_out('os.path.exists', fake_exists)
self.stub_out('nova.utils.execute', lambda *a, **kw: None)
self.stub_out('oslo_concurrency.processutils.execute',
lambda *a, **kw: None)
self.stub_out('nova.virt.disk.api.extend',
lambda image, size, use_cow=False: None)
self.useFixture(fixtures.MonkeyPatch(
@ -18315,7 +18316,8 @@ class LibvirtDriverTestCase(test.NoDBTestCase, TraitsComparisonMixin):
'_is_storage_shared_with'), return_value=False)
@mock.patch('os.rename')
@mock.patch('os.path.exists', return_value=True)
@mock.patch('nova.utils.execute', side_effect=test.TestingException)
@mock.patch('oslo_concurrency.processutils.execute',
side_effect=test.TestingException)
def test_migrate_disk_and_power_off_exception(
self, mock_execute, mock_exists, mock_rename, mock_is_shared,
mock_get_host_ip, mock_destroy, mock_get_disk_info):
@ -18542,7 +18544,7 @@ class LibvirtDriverTestCase(test.NoDBTestCase, TraitsComparisonMixin):
mock_is_shared):
def fake_execute(*args, **kwargs):
raise processutils.ProcessExecutionError()
self.stub_out('nova.utils.execute', fake_execute)
self.stub_out('oslo_concurrency.processutils.execute', fake_execute)
expected_exc = exception.InstanceFaultRollback
self._test_migrate_disk_and_power_off_resize_check(expected_exc)
@ -18659,7 +18661,7 @@ class LibvirtDriverTestCase(test.NoDBTestCase, TraitsComparisonMixin):
self._test_migrate_disk_and_power_off(self.context, flavor_obj)
@mock.patch('os.rename')
@mock.patch('nova.utils.execute')
@mock.patch('oslo_concurrency.processutils.execute')
@mock.patch('nova.virt.libvirt.utils.copy_image')
@mock.patch('nova.virt.libvirt.driver.LibvirtDriver._destroy')
@mock.patch('nova.virt.libvirt.utils.get_instance_path')
@ -18728,7 +18730,7 @@ class LibvirtDriverTestCase(test.NoDBTestCase, TraitsComparisonMixin):
'uuid': 'other_uuid'})
@mock.patch.object(compute_utils, 'disk_ops_semaphore')
@mock.patch('nova.utils.execute')
@mock.patch('oslo_concurrency.processutils.execute')
@mock.patch('os.rename')
def test_disk_raw_to_qcow2(self, mock_rename, mock_execute,
mock_disk_op_sema):
@ -18895,7 +18897,7 @@ class LibvirtDriverTestCase(test.NoDBTestCase, TraitsComparisonMixin):
fake_to_xml)
self.stub_out('nova.virt.libvirt.driver.LibvirtDriver.plug_vifs',
fake_plug_vifs)
self.stub_out('nova.utils.execute', fake_execute)
self.stub_out('oslo_concurrency.processutils.execute', fake_execute)
fw = base_firewall.NoopFirewallDriver()
self.stub_out('nova.virt.libvirt.driver.LibvirtDriver.firewall_driver',
fw)
@ -21661,7 +21663,7 @@ class LibvirtVolumeSnapshotTestCase(test.NoDBTestCase):
mock.Mock(return_value=False))
@mock.patch('nova.virt.images.qemu_img_info',
return_value=mock.Mock(file_format="fake_fmt"))
@mock.patch('nova.utils.execute')
@mock.patch('oslo_concurrency.processutils.execute')
def test_volume_snapshot_delete_when_dom_not_running(self, mock_execute,
mock_qemu_img_info,
mock_disk_op_sema):
@ -21693,7 +21695,7 @@ class LibvirtVolumeSnapshotTestCase(test.NoDBTestCase):
mock.Mock(return_value=False))
@mock.patch('nova.virt.images.qemu_img_info',
return_value=mock.Mock(file_format="fake_fmt"))
@mock.patch('nova.utils.execute')
@mock.patch('oslo_concurrency.processutils.execute')
def test_volume_snapshot_delete_when_dom_not_running_and_no_rebase_base(
self, mock_execute, mock_qemu_img_info, mock_disk_op_sema):
"""Deleting newest snapshot of a file-based image when the domain is

10
nova/virt/libvirt/driver.py
View File

@ -2429,8 +2429,8 @@ class LibvirtDriver(driver.ComputeDriver):
qemu_img_extra_arg.append(active_disk_object.source_path)
# execute operation with disk concurrency semaphore
with compute_utils.disk_ops_semaphore:
utils.execute("qemu-img", "rebase", "-b", backing_file,
*qemu_img_extra_arg)
processutils.execute("qemu-img", "rebase", "-b", backing_file,
*qemu_img_extra_arg)
def _volume_snapshot_delete(self, context, instance, volume_id,
snapshot_id, delete_info=None):
@ -8232,7 +8232,7 @@ class LibvirtDriver(driver.ComputeDriver):
def get_host_uptime(self):
"""Returns the result of calling "uptime"."""
out, err = utils.execute('env', 'LANG=C', 'uptime')
out, err = processutils.execute('env', 'LANG=C', 'uptime')
return out
def manage_image_cache(self, context, all_instances):
@ -8401,8 +8401,8 @@ class LibvirtDriver(driver.ComputeDriver):
path_qcow = path + '_qcow'
# execute operation with disk concurrency semaphore
with compute_utils.disk_ops_semaphore:
utils.execute('qemu-img', 'convert', '-f', 'raw',
'-O', 'qcow2', path, path_qcow)
processutils.execute('qemu-img', 'convert', '-f', 'raw',
'-O', 'qcow2', path, path_qcow)
os.rename(path_qcow, path)
def finish_migration(self, context, migration, instance, disk_info,