Changeset 81084 in vbox

Timestamp:

Sep 30, 2019 3:55:04 PM (5 years ago)

Author:

vboxsync

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

133690

Message:

bugref:9555. Added ability to create an instance from a boot volume.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (5 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)

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

@@ -470 +470 @@
     {
         { "--image-id",       'i', RTGETOPT_REQ_STRING },
+        { "--boot-volume-id", 'v', RTGETOPT_REQ_STRING },
         { "--display-name",   'n', RTGETOPT_REQ_STRING },
         { "--launch-mode",    'm', RTGETOPT_REQ_STRING },
@@ -495 +496 @@
     ComPtr<IVirtualSystemDescription> pVSD = virtualSystemDescriptions[0];
 
-    Utf8Str strDisplayName, strImageId;
+    Utf8Str strDisplayName, strImageId, strBootVolumeId;
     int c;
     while ((c = RTGetOpt(&GetState, &ValueUnion)) != 0)
@@ -504 +505 @@
                 strImageId = ValueUnion.psz;
                 pVSD->AddDescription(VirtualSystemDescriptionType_CloudImageId,
+                                     Bstr(ValueUnion.psz).raw(),
+                                     Bstr(ValueUnion.psz).raw());
+                break;
+
+            case 'v':
+                strBootVolumeId = ValueUnion.psz;
+                pVSD->AddDescription(VirtualSystemDescriptionType_CloudBootVolumeId,
                                      Bstr(ValueUnion.psz).raw(),
                                      Bstr(ValueUnion.psz).raw());
@@ -564 +572 @@
     }
 
-    if (strImageId.isEmpty())
-        return errorArgument("Missing parameter --image-id.");
+    if (strImageId.isNotEmpty() && strBootVolumeId.isNotEmpty())
+        return errorArgument("Parameters --image-id and --boot-volume-id are mutually exclusive. "
+                             "Only one of them must be presented.");
+
+    if (strImageId.isEmpty() && strBootVolumeId.isEmpty())
+        return errorArgument("Missing parameter --image-id or --boot-volume-id. One of them must be presented.");
 
     ComPtr<ICloudProfile> pCloudProfile = pCommonOpts->profile.pCloudProfile;
@@ -600 +612 @@
 #endif
 
-    RTPrintf("Creating cloud instance with name \'%s\' from the image \'%s\'...\n",
-             strDisplayName.c_str(), strImageId.c_str());
-
+    if (strImageId.isNotEmpty())
+        RTPrintf("Creating cloud instance with name \'%s\' from the image \'%s\'...\n",
+                 strDisplayName.c_str(), strImageId.c_str());
+    else
+        RTPrintf("Creating cloud instance with name \'%s\' from the boot volume \'%s\'...\n",
+                 strDisplayName.c_str(), strBootVolumeId.c_str());
 
     CHECK_ERROR2_RET(hrc, oCloudClient, LaunchVM(pVSD, pProgress.asOutParam()), RTEXITCODE_FAILURE);

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4035 +4035 @@
   <enum
     name="VirtualSystemDescriptionType"
-    uuid="6d85a5f8-d305-11e9-986e-f3fb16e309d4"
+    uuid="eca6989c-1de0-456b-8c4f-49c609791156"
     >
     <desc>Used with <link to="IVirtualSystemDescription" /> to describe the type of
@@ -4098 +4098 @@
     <const name="CloudOCILaunchMode" value="43" />
     <const name="CloudPrivateIP" value="44" />
+    <const name="CloudBootVolumeId" value="45" />
   </enum>