Changeset 72476 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 7, 2018 1:49:48 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

122961

Message:

Main/Appliance: Teach importing new tricks: importing to specific location (by settings file name or base folder) and also importing straight into a group. Lots of cleanup and minor fixing (bad code quality due to lots of copy/paste, and what's worse is that the original code was broken already, using the variables inconsistently), plus some smallish coding style cleaup. Much more needed. Also fixed the incomplete use of the VM name on expert (the one in the VBox XML was not changed, and it's the preferred name on import).
VBoxManage: small updates to reflect the new features (and actually offer setting the VM name on export, which is something the GUI could do for a long time).

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageAppliance.cpp (modified) (6 diffs)
• VBoxManageHelp.cpp (modified) (1 diff)

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

@@ -121 +121 @@
     { "--vmname",               'V', RTGETOPT_REQ_STRING },
     { "-vmname",                'V', RTGETOPT_REQ_STRING },     // deprecated
+    { "--settingsfile",         'S', RTGETOPT_REQ_STRING },
+    { "--basefolder",           'p', RTGETOPT_REQ_STRING },
+    { "--group",                'g', RTGETOPT_REQ_STRING },
     { "--memory",               'm', RTGETOPT_REQ_STRING },
     { "-memory",                'm', RTGETOPT_REQ_STRING },     // deprecated
@@ -193 +196 @@
                     return errorSyntax(USAGE_IMPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys argument.", GetState.pDef->pszLong);
                 mapArgsMapsPerVsys[ulCurVsys]["vmname"] = ValueUnion.psz;
+                break;
+
+            case 'S':   // --settingsfile
+                if (ulCurVsys == (uint32_t)-1)
+                    return errorSyntax(USAGE_IMPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys argument.", GetState.pDef->pszLong);
+                mapArgsMapsPerVsys[ulCurVsys]["settingsfile"] = ValueUnion.psz;
+                break;
+
+            case 'p':   // --basefolder
+                if (ulCurVsys == (uint32_t)-1)
+                    return errorSyntax(USAGE_IMPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys argument.", GetState.pDef->pszLong);
+                mapArgsMapsPerVsys[ulCurVsys]["basefolder"] = ValueUnion.psz;
+                break;
+
+            case 'g':   // --group
+                if (ulCurVsys == (uint32_t)-1)
+                    return errorSyntax(USAGE_IMPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys argument.", GetState.pDef->pszLong);
+                mapArgsMapsPerVsys[ulCurVsys]["group"] = ValueUnion.psz;
                 break;
 
@@ -851 +872 @@
 
                         case VirtualSystemDescriptionType_SettingsFile:
-                            /** @todo  VirtualSystemDescriptionType_SettingsFile? */
-                            break;
+                            if (findArgValue(strOverride, pmapArgs, "settingsfile"))
+                            {
+                                bstrFinalValue = strOverride;
+                                RTPrintf("%2u: VM settings file name specified with --settingsfile: \"%ls\"\n",
+                                        a, bstrFinalValue.raw());
+                            }
+                            else
+                                RTPrintf("%2u: Suggested VM settings file name \"%ls\""
+                                        "\n    (change with \"--vsys %u --settingsfile <filename>\")\n",
+                                        a, bstrFinalValue.raw(), i);
+                            break;
+
+                        case VirtualSystemDescriptionType_BaseFolder:
+                            if (findArgValue(strOverride, pmapArgs, "basefolder"))
+                            {
+                                bstrFinalValue = strOverride;
+                                RTPrintf("%2u: VM base folder specified with --basefolder: \"%ls\"\n",
+                                        a, bstrFinalValue.raw());
+                            }
+                            else
+                                RTPrintf("%2u: Suggested VM base folder \"%ls\""
+                                        "\n    (change with \"--vsys %u --basefolder <path>\")\n",
+                                        a, bstrFinalValue.raw(), i);
+                            break;
+
+                        case VirtualSystemDescriptionType_PrimaryGroup:
+                            if (findArgValue(strOverride, pmapArgs, "group"))
+                            {
+                                bstrFinalValue = strOverride;
+                                RTPrintf("%2u: VM group specified with --group: \"%ls\"\n",
+                                        a, bstrFinalValue.raw());
+                            }
+                            else
+                                RTPrintf("%2u: Suggested VM group \"%ls\""
+                                        "\n    (change with \"--vsys %u --group <group>\")\n",
+                                        a, bstrFinalValue.raw(), i);
+                            break;
+
                         case VirtualSystemDescriptionType_Miscellaneous:
                             /** @todo  VirtualSystemDescriptionType_Miscellaneous? */
@@ -947 +1004 @@
     { "--iso",                  'I', RTGETOPT_REQ_NOTHING },    // obsoleted by --options
     { "--vsys",                 's', RTGETOPT_REQ_UINT32 },
+    { "--vmname",               'V', RTGETOPT_REQ_STRING },
     { "--product",              'p', RTGETOPT_REQ_STRING },
     { "--producturl",           'P', RTGETOPT_REQ_STRING },
@@ -1020 +1078 @@
                 case 's':   // --vsys
                     ulCurVsys = ValueUnion.u32;
+                    break;
+
+                case 'V':   // --vmname
+                    if (ulCurVsys == (uint32_t)-1)
+                        return errorSyntax(USAGE_EXPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys argument.", GetState.pDef->pszLong);
+                    mapArgsMapsPerVsys[ulCurVsys]["vmname"] = ValueUnion.psz;
                     break;
 
@@ -1161 +1225 @@
                      ++itD)
                 {
-                    if (itD->first == "product")
+                    if (itD->first == "vmname")
+                        pVSD->AddDescription(VirtualSystemDescriptionType_Name,
+                                             Bstr(itD->second).raw(),
+                                             Bstr(itD->second).raw());
+                    else if (itD->first == "product")
                         pVSD->AddDescription(VirtualSystemDescriptionType_Product,
                                              Bstr(itD->second).raw(),

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

@@ -762 +762 @@
                      "                            [--options manifest|iso|nomacs|nomacsbutnat]\n"
                      "                            [--vsys <number of virtual system>]\n"
+                     "                                    [--vmname <name>]\n"
                      "                                    [--product <product name>]\n"
                      "                                    [--producturl <product url>]\n"