Changeset 80707 in vbox

Timestamp:

Sep 10, 2019 4:32:44 PM (5 years ago)

Author:

vboxsync

Message:

OCI: Add --cloudlaunchmode and --cloudprivateip options to export --cloud

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

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

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

@@ -1184 +1184 @@
     { "--cloudkeepobject",      'K', RTGETOPT_REQ_STRING },
     { "--cloudlaunchinstance",  'L', RTGETOPT_REQ_STRING },
+    { "--cloudlaunchmode",      'M', RTGETOPT_REQ_STRING },
+    { "--cloudprivateip",       'i', RTGETOPT_REQ_STRING },
 };
 
@@ -1379 +1381 @@
                     break;
 
+                case 'i': /* --cloudprivateip */
+                    if (actionType != CLOUD)
+                        return errorSyntax(USAGE_EXPORTAPPLIANCE, "Option \"%s\" requires preceding --cloud argument.",
+                                           GetState.pDef->pszLong);
+                    mapArgsMapsPerVsys[ulCurVsys]["cloudprivateip"] = ValueUnion.psz;
+                    break;
+
                 case 'F':   // --cloudprofile
                     if (actionType != CLOUD)
@@ -1405 +1414 @@
                                            GetState.pDef->pszLong);
                     mapArgsMapsPerVsys[ulCurVsys]["cloudlaunchinstance"] = ValueUnion.psz;
+                    break;
+
+                case 'M': /* --cloudlaunchmode */
+                    if (actionType != CLOUD)
+                        return errorSyntax(USAGE_EXPORTAPPLIANCE, "Option \"%s\" requires preceding --cloud argument.",
+                                           GetState.pDef->pszLong);
+                    mapArgsMapsPerVsys[ulCurVsys]["cloudlaunchmode"] = ValueUnion.psz;
                     break;
 
@@ -1584 +1600 @@
                                              Bstr(itD->second).raw(),
                                              Bstr(itD->second).raw());
+                    else if (itD->first == "cloudprivateip")
+                        pVSD->AddDescription(VirtualSystemDescriptionType_CloudPrivateIP,
+                                             Bstr(itD->second).raw(), NULL);
                     else if (itD->first == "cloudprofile")
                         pVSD->AddDescription(VirtualSystemDescriptionType_CloudProfileName,
@@ -1596 +1615 @@
                                              Bstr(itD->second).raw(),
                                              Bstr(itD->second).raw());
+                    else if (itD->first == "cloudlaunchmode")
+                        pVSD->AddDescription(VirtualSystemDescriptionType_CloudOCILaunchMode,
+                                             Bstr(itD->second).raw(), NULL);
                     else if (itD->first == "cloudlaunchinstance")
                         pVSD->AddDescription(VirtualSystemDescriptionType_CloudLaunchInstance,

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

@@ -798 +798 @@
                      "                                    [--cloudocisubnet <OCI subnet id>]\n"
                      "                                    [--cloudkeepobject <true/false>]\n"
+                     "                                    [--cloudlaunchmode EMULATED|PARAVIRTUALIZED]\n"
                      "                                    [--cloudlaunchinstance <true/false>]\n"
                      "                                    [--cloudpublicip <true/false>]\n"
+                     "                                    [--cloudprivateip <ip>]\n"
                      "\n", SEP);