diff options
Diffstat (limited to 'nova/virt/libvirt')
| -rw-r--r-- | nova/virt/libvirt/driver.py | 4 | ||||
| -rw-r--r-- | nova/virt/libvirt/storage/lvm.py | 5 | ||||
| -rw-r--r-- | nova/virt/libvirt/utils.py | 20 |
3 files changed, 5 insertions, 24 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 7d89d29768..e5c55f0774 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -2760,13 +2760,13 @@ class LibvirtDriver(driver.ComputeDriver): virt_dom = guest._domain self._destroy(instance) self._create_domain(xml, virt_dom) - libvirt_utils.file_delete(unrescue_xml_path) + os.unlink(unrescue_xml_path) rescue_files = os.path.join(instance_dir, "*.rescue") for rescue_file in glob.iglob(rescue_files): if os.path.isdir(rescue_file): shutil.rmtree(rescue_file) else: - libvirt_utils.file_delete(rescue_file) + os.unlink(rescue_file) # cleanup rescue volume lvm.remove_volumes([lvmdisk for lvmdisk in self._lvm_disks(instance) if lvmdisk.endswith('.rescue')]) diff --git a/nova/virt/libvirt/storage/lvm.py b/nova/virt/libvirt/storage/lvm.py index 35d6463978..014aac6d06 100644 --- a/nova/virt/libvirt/storage/lvm.py +++ b/nova/virt/libvirt/storage/lvm.py @@ -19,6 +19,8 @@ # under the License. # +import os + from oslo_concurrency import processutils from oslo_log import log as logging from oslo_utils import units @@ -28,7 +30,6 @@ import nova.conf from nova import exception from nova.i18n import _ from nova import utils -from nova.virt.libvirt import utils as libvirt_utils CONF = nova.conf.CONF LOG = logging.getLogger(__name__) @@ -157,7 +158,7 @@ def get_volume_size(path): out, _err = utils.execute('blockdev', '--getsize64', path, run_as_root=True) except processutils.ProcessExecutionError: - if not libvirt_utils.path_exists(path): + if not os.path.exists(path): raise exception.VolumeBDMPathNotFound(path=path) else: raise diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py index b334be3439..3865fa0f57 100644 --- a/nova/virt/libvirt/utils.py +++ b/nova/virt/libvirt/utils.py @@ -318,26 +318,6 @@ def file_open(*args, **kwargs): return open(*args, **kwargs) -def file_delete(path): - """Delete (unlink) file - - Note: The reason this is kept in a separate module is to easily - be able to provide a stub module that doesn't alter system - state at all (for unit tests) - """ - return os.unlink(path) - - -def path_exists(path): - """Returns if path exists - - Note: The reason this is kept in a separate module is to easily - be able to provide a stub module that doesn't alter system - state at all (for unit tests) - """ - return os.path.exists(path) - - def find_disk(guest): """Find root device path for instance |