]> xenbits.xensource.com Git - xenrt-citrix/xenrt.git/commitdiff
Display a clearer error if VM file is unavailable
authorAlex Brett <alex.brett@citrix.com>
Wed, 14 Oct 2015 10:14:02 +0000 (11:14 +0100)
committerAlex Brett <alex.brett@citrix.com>
Wed, 14 Oct 2015 10:14:26 +0000 (11:14 +0100)
exec/xenrt/lib/xenserver/guest.py

index 5957ef32c7e5b2463ed2650de52f8ac22d9714ec..61b3afba8ee42ffad02bd20de58920507b749155 100755 (executable)
@@ -4598,7 +4598,10 @@ def createVMFromFile(host,
             guest.importVM(host, "%s/%s" % (d, os.path.basename(filename)), imageIsOnHost=True, sr=sr, vifs=vifs)
             host.execdom0("umount %s" % d)
         else:
-            guest.importVM(host, xenrt.TEC().getFile(filename), vifs=vifs, sr=sr)
+            vmfile = xenrt.TEC().getFile(filename)
+            if not vmfile:
+                raise xenrt.XRTError("Cannot find %s to import" % filename)
+            guest.importVM(host, vmfile, vifs=vifs, sr=sr)
     guest.paramSet("is-a-template", "false")
     guest.reparseVIFs()
     guest.vifs.sort()