Combine two Node unittests

[ganeti-local] / lib / ovf.py

diff --git a/lib/ovf.py b/lib/ovf.py
index eabc71a..ef87ae3 100644 (file)
--- a/lib/ovf.py
+++ b/lib/ovf.py
@@ -144,6 +144,17 @@ DISK_FORMAT = {
 }
 
 
+def CheckQemuImg():
+  """ Make sure that qemu-img is present before performing operations.
+
+  @raise errors.OpPrereqError: when qemu-img was not found in the system
+
+  """
+  if not constants.QEMUIMG_PATH:
+    raise errors.OpPrereqError("qemu-img not found at build time, unable"
+                               " to continue")
+
+
 def LinkFile(old_path, prefix=None, suffix=None, directory=None):
   """Create link with a given prefix and suffix.
 
@@ -916,6 +927,7 @@ class Converter(object):
     @raise errors.OpPrereqError: convertion of the disk failed
 
     """
+    CheckQemuImg()
     disk_file = os.path.basename(disk_path)
     (disk_name, disk_extension) = os.path.splitext(disk_file)
     if disk_extension != disk_format:
@@ -926,7 +938,7 @@ class Converter(object):
       prefix=disk_name, dir=self.output_dir)
     self.temp_file_manager.Add(new_disk_path)
     args = [
-      "qemu-img",
+      constants.QEMUIMG_PATH,
       "convert",
       "-O",
       disk_format,
@@ -953,7 +965,8 @@ class Converter(object):
     @raise errors.OpPrereqError: format information cannot be retrieved
 
     """
-    args = ["qemu-img", "info", disk_path]
+    CheckQemuImg()
+    args = [constants.QEMUIMG_PATH, "info", disk_path]
     run_result = utils.RunCmd(args, cwd=os.getcwd())
     if run_result.failed:
       raise errors.OpPrereqError("Gathering info about the disk using qemu-img"
@@ -1317,6 +1330,7 @@ class OVFImporter(Converter):
       information or size information is invalid or creation failed
 
     """
+    CheckQemuImg()
     assert self.options.disks
     results = {}
     for (disk_id, disk_desc) in self.options.disks:
@@ -1329,7 +1343,7 @@ class OVFImporter(Converter):
                                      (disk_id, disk_desc["size"]))
         new_path = utils.PathJoin(self.output_dir, str(disk_id))
         args = [
-          "qemu-img",
+          constants.QEMUIMG_PATH,
           "create",
           "-f",
           "raw",