Changeset 80739 in vbox

Timestamp:

Sep 11, 2019 11:05:01 PM (5 years ago)

Author:

vboxsync

Message:

VBoxManage: image export - add --display-name and --launch-mode options.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageCloud.cpp

@@ -957 +957 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
+        { "--id",             'i', RTGETOPT_REQ_STRING },
         { "--bucket-name",    'b', RTGETOPT_REQ_STRING },
         { "--object-name",    'o', RTGETOPT_REQ_STRING },
-        { "--id",             'i', RTGETOPT_REQ_STRING }
+        { "--display-name",   'd', RTGETOPT_REQ_STRING },
+        { "--launch-mode",    'm', RTGETOPT_REQ_STRING },
     };
     RTGETOPTSTATE GetState;
@@ -966 +968 @@
     AssertRCReturn(vrc, RTEXITCODE_FAILURE);
 
+    Utf8Str strImageId;   /* XXX: this is vbox "image", i.e. medium */
     Utf8Str strBucketName;
     Utf8Str strObjectName;
-    Utf8Str strImageId;
+    Utf8Str strDisplayName;
+    Utf8Str strLaunchMode;
     com::SafeArray<BSTR> parameters;
 
@@ -976 +980 @@
         switch (c)
         {
-            case 'b':
+            case 'b': /* --bucket-name */
             {
                 if (strBucketName.isNotEmpty())
@@ -988 +992 @@
             }
 
-            case 'o':
+            case 'o': /* --object-name */
             {
                 if (strObjectName.isNotEmpty())
@@ -1000 +1004 @@
             }
 
-            case 'i':
+            case 'i': /* --id */
             {
                 if (strImageId.isNotEmpty())
@@ -1012 +1016 @@
             }
 
+            case 'd': /* --display-name */
+            {
+                if (strDisplayName.isNotEmpty())
+                    return errorArgument("Duplicate parameter: --display-name");
+
+                strDisplayName = ValueUnion.psz;
+                if (strDisplayName.isEmpty())
+                    return errorArgument("Empty parameter: --display-name");
+
+                break;
+            }
+
+            case 'm': /* --launch-mode */
+            {
+                if (strLaunchMode.isNotEmpty())
+                    return errorArgument("Duplicate parameter: --launch-mode");
+
+                strLaunchMode = ValueUnion.psz;
+                if (strLaunchMode.isEmpty())
+                    return errorArgument("Empty parameter: --launch-mode");
+
+                break;
+            }
+
             case VINF_GETOPT_NOT_OPTION:
                 return errorUnknownSubcommand(ValueUnion.psz);
@@ -1019 +1047 @@
         }
     }
+
+    if (strImageId.isNotEmpty())
+        BstrFmt("image-id=%s", strImageId.c_str()).detachTo(parameters.appendedRaw());
+    else
+        return errorArgument("Missing parameter: --id");
 
     if (strBucketName.isNotEmpty())
@@ -1025 +1058 @@
         return errorArgument("Missing parameter: --bucket-name");
 
-    /* API will use display name as object name if not specified */
     if (strObjectName.isNotEmpty())
         BstrFmt("object-name=%s", strObjectName.c_str()).detachTo(parameters.appendedRaw());
 
-    if (strImageId.isNotEmpty())
-        BstrFmt("image-id=%s", strImageId.c_str()).detachTo(parameters.appendedRaw());
-    else
-        return errorArgument("Missing parameter: --id");
+    if (strDisplayName.isNotEmpty())
+        BstrFmt("display-name=%s", strDisplayName.c_str()).detachTo(parameters.appendedRaw());
+
+    if (strLaunchMode.isNotEmpty())
+        BstrFmt("launch-mode=%s", strLaunchMode.c_str()).detachTo(parameters.appendedRaw());