virt-install: --disk: make path= optional

Author: crobinso

man/en/virt-install.pod.in

@@ -377,7 +377,11 @@ general format of a disk string is
 
     --disk opt1=val1,opt2=val2,...
 
-To specify media, one of the following options is required:
+To specify media, the command can either be:
+
+    --disk /some/storage/path,opt1=val1
+
+or explicitly specify one of the following arguments:
 
 =over 4
 
@@ -726,7 +730,7 @@ the rest of the options.
   # virt-install \
        --name demo
        --ram 512
-       --disk path=/home/user/VMs/mydisk.img
+       --disk /home/user/VMs/mydisk.img
        --import
 
 =head1 AUTHORS

tests/clitest.py

@@ -146,6 +146,10 @@
         "--disk path=%(ROIMG)s,perms=ro",
         # Using RO path with cdrom dev
         "--disk path=%(ROIMG)s,device=cdrom",
+        # Not specifying path=
+        "--disk %(EXISTIMG1)s",
+        # Not specifying path= but creating storage
+        "--disk %(NEWIMG1)s,format=raw,size=.0000001",
       ],
 
       "invalid": [
@@ -175,6 +179,8 @@
         "--disk path=%(MANAGEDNEW1)s,format=frob,size=.0000001",
         # Managed disk using any format
         "--disk path=%(MANAGEDDISKNEW1)s,format=raw,size=.0000001",
+        # Not specifying path= and non existent storage w/ no size
+        "--disk %(NEWIMG1)s",
       ]
      }, # category "storage"
 

virt-install

@@ -161,15 +161,19 @@ def parse_disk_option(guest, path, size):
 
     # Strip media type
     path, ignore, optstr = partition(path, ",")
+    path_type = None
     if path.startswith("path="):
         path_type = "path="
     elif path.startswith("vol="):
         path_type = "vol="
     elif path.startswith("pool="):
         path_type = "pool="
+
+    if path_type:
+        path = path[len(path_type):]
     else:
-        fail(_("--disk path must start with path=, pool=, or vol=."))
-    path = path[len(path_type):]
+        # Allow a default fallback mode --disk /some/path,foo,rah
+        path_type = "path="
 
     # Parse out comma separated options
     opts = cli.parse_optstr(optstr)
@@ -209,6 +213,7 @@ def parse_disk_option(guest, path, size):
         abspath = os.path.abspath(path)
         if os.path.dirname(abspath) == DEFAULT_POOL_PATH:
             build_default_pool(guest)
+
     elif path_type == "pool=":
         if not size:
             raise ValueError(_("Size must be specified with all 'pool='"))