Changeset 86153 in vbox for trunk/src

Timestamp:

Sep 17, 2020 12:35:47 PM (4 years ago)

Author:

vboxsync

Message:

OCI: (bugref:9693) Fixed VBoxManage cloud network backslash issue on Unix platforms. Added --compartment-id parameter.

File:

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

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

@@ -2188 +2188 @@
 }
 
+static HRESULT localGatewayImagePath(const Bstr &aDefaultMachineFolder, Bstr &aLgwImage)
+{
+    com::Utf8Str strPath(aDefaultMachineFolder);
+    int rc = RTPathAppendCxx(strPath, "gateways");
+    if (RT_SUCCESS(rc))
+        rc = RTPathAppendCxx(strPath, "lgw.vdi");
+    if (RT_SUCCESS(rc))
+        aLgwImage = strPath;
+
+    return rc;
+}
+
 static HRESULT createLocalGatewayImage(ComPtr<IVirtualBox> virtualBox, const Bstr& aGatewayIso, const Bstr& aGuestAdditionsIso, const Bstr& aProxy)
 {
@@ -2259 +2271 @@
         guestAdditionsISO = aGuestAdditionsIso;
 
-    BstrFmt strGatewayImage("%ls\\gateways\\lgw.vdi", defaultMachineFolder.raw());
+    Bstr strGatewayImage;
+    int rc = localGatewayImagePath(defaultMachineFolder, strGatewayImage);
+    if (RT_FAILURE(rc))
+    {
+        RTStrmPrintf(g_pStdErr, "Failed to compose a path to the local gateway image (%Rrc)", rc);
+        RTStrmFlush(g_pStdErr);
+        return E_FAIL;
+    }
     hrc = virtualBox->OpenMedium(strGatewayImage.raw(), DeviceType_HardDisk, AccessMode_ReadWrite, FALSE, hd.asOutParam());
     /* If the image is already in place, there is nothing for us to do. */
@@ -2565 +2584 @@
         { "--guest-additions-iso",  'a', RTGETOPT_REQ_STRING },
         { "--local-gateway-iso",    'l', RTGETOPT_REQ_STRING },
-        { "--proxy",                'p', RTGETOPT_REQ_STRING }
+        { "--proxy",                'p', RTGETOPT_REQ_STRING },
+        { "--compartment-id",       'c', RTGETOPT_REQ_STRING }
     };
     RTGETOPTSTATE GetState;
@@ -2580 +2600 @@
     Bstr strGuestAdditionsIso;
     Bstr strProxy;
+    Bstr strCompartmentId;
 
     int c;
@@ -2609 +2630 @@
             case 'p':
                 strProxy=ValueUnion.psz;
+                break;
+            case 'c':
+                strCompartmentId=ValueUnion.psz;
                 break;
             case VINF_GETOPT_NOT_OPTION:
@@ -2634 +2658 @@
 
     ComPtr<ICloudProfile> pCloudProfile = pCommonOpts->profile.pCloudProfile;
+
+    /* Use user-specified profile instead of default one. */
+    if (strCompartmentId.isNotEmpty())
+    {
+        CHECK_ERROR2_RET(hrc, pCloudProfile,
+                         SetProperty(Bstr("compartment").raw(), Bstr(strCompartmentId).raw()),
+                         RTEXITCODE_FAILURE);
+    }
 
     ComObjPtr<ICloudClient> oCloudClient;