Changeset 87278 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jan 15, 2021 2:48:38 PM (4 years ago)

Author:

vboxsync

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

142237

Message:

bugref:9907. Added support for cloud-init script.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageAppliance.cpp (modified) (6 diffs)
• VBoxManageCloud.cpp (modified) (4 diffs)

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

@@ -1113 +1113 @@
                         case VirtualSystemDescriptionType_CloudPublicSSHKey:
                         case VirtualSystemDescriptionType_BootingFirmware:
+                        case VirtualSystemDescriptionType_CloudInitScriptPath:
                             /** @todo  VirtualSystemDescriptionType_Miscellaneous? */
                             break;
@@ -1208 +1209 @@
     { "--opc10",                'c', RTGETOPT_REQ_NOTHING },
     { "--manifest",             'm', RTGETOPT_REQ_NOTHING },    // obsoleted by --options
-    { "--iso",                  'I', RTGETOPT_REQ_NOTHING },    // obsoleted by --options
     { "--vsys",                 's', RTGETOPT_REQ_UINT32 },
     { "--vmname",               'V', RTGETOPT_REQ_STRING },
@@ -1233 +1233 @@
     { "--cloudlaunchmode",      'M', RTGETOPT_REQ_STRING },
     { "--cloudprivateip",       'i', RTGETOPT_REQ_STRING },
+    { "--cloudinitscriptpath",  'I', RTGETOPT_REQ_STRING },
 };
 
@@ -1289 +1290 @@
                     break;
 
-                case 'I':   // --iso
-                    fExportISOImages = true;
-                    break;
+//              case 'I':   // --iso
+//                  fExportISOImages = true;
+//                  break;
 
                 case 'm':   // --manifest
@@ -1468 +1469 @@
                                            GetState.pDef->pszLong);
                     mapArgsMapsPerVsys[ulCurVsys]["cloudlaunchmode"] = ValueUnion.psz;
+                    break;
+
+                case 'I':   // --cloudinitscriptpath
+                    if (actionType != CLOUD)
+                        return errorSyntax(USAGE_EXPORTAPPLIANCE, "Option \"%s\" requires preceding --cloud argument.",
+                                           GetState.pDef->pszLong);
+                    mapArgsMapsPerVsys[ulCurVsys]["cloudinitscriptpath"] = ValueUnion.psz;
                     break;
 
@@ -1662 +1670 @@
                         pVSD->AddDescription(VirtualSystemDescriptionType_CloudLaunchInstance,
                                              Bstr(itD->second).raw(), NULL);
+                    else if (itD->first == "cloudinitscriptpath")
+                        pVSD->AddDescription(VirtualSystemDescriptionType_CloudInitScriptPath,
+                                             Bstr(itD->second).raw(), NULL);
+
                 }
             }

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

@@ -505 +505 @@
         { "--launch",         'l', RTGETOPT_REQ_STRING },
         { "--public-ssh-key", 'k', RTGETOPT_REQ_STRING },
+        { "--cloud-init-script-path", 'c', RTGETOPT_REQ_STRING },
         { "help",             1001, RTGETOPT_REQ_NOTHING },
         { "--help",           1002, RTGETOPT_REQ_NOTHING }
@@ -592 +593 @@
                                      Bstr(ValueUnion.psz).raw(), NULL);
                 break;
+            case 'c':
+                pVSD->AddDescription(VirtualSystemDescriptionType_CloudInitScriptPath,
+                                     Bstr(ValueUnion.psz).raw(), NULL);
+                break;
             case 1001:
             case 1002:
@@ -775 +780 @@
     };
 
-    const size_t vsdHReadableArraySize = 12;//the number of items in the vsdHReadableArray
+    const size_t vsdHReadableArraySize = 13;//the number of items in the vsdHReadableArray
     vsdHReadable vsdHReadableArray[vsdHReadableArraySize] = {
         {VirtualSystemDescriptionType_CloudDomain, "Availability domain = %ls\n", "Availability domain wasn't found\n"},
@@ -790 +795 @@
         {VirtualSystemDescriptionType_CPU, "CPUs = %ls\n", "Numbers of CPUs weren't found\n"},
         {VirtualSystemDescriptionType_CloudPublicIP, "Instance public IP = %ls\n", "Public IP wasn't found\n"},
-        {VirtualSystemDescriptionType_Miscellaneous, "%ls\n", "Free-form tags or metadata weren't found\n"}
+        {VirtualSystemDescriptionType_Miscellaneous, "%ls\n", "Free-form tags or metadata weren't found\n"},
+        {VirtualSystemDescriptionType_CloudInitScriptPath, "%ls\n", "Cloud-init script wasn't found\n"}
     };