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

Timestamp:

May 29, 2020 6:43:11 PM (5 years ago)

Author:

vboxsync

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

138352

Message:

OCI: (bugref:9469) cloud network integration code moved from Machine to Console, cloud network environment setup (cloud part).

File:

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

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

@@ -2084 +2084 @@
 
 
+static RTEXITCODE setupCloudNetworkEnv(HandlerArg *a, int iFirst, PCLOUDCOMMONOPT pCommonOpts)
+{
+    RT_NOREF(pCommonOpts);
+    HRESULT hrc = S_OK;
+    static const RTGETOPTDEF s_aOptions[] =
+    {
+        { "--gateway-os-name",      'n', RTGETOPT_REQ_STRING },
+        { "--gateway-os-version",   'v', RTGETOPT_REQ_STRING },
+        { "--gateway-shape",        's', RTGETOPT_REQ_STRING },
+        { "--tunnel-network-name",  't', RTGETOPT_REQ_STRING },
+        { "--tunnel-network-range", 'r', RTGETOPT_REQ_STRING },
+    };
+    RTGETOPTSTATE GetState;
+    RTGETOPTUNION ValueUnion;
+    int vrc = RTGetOptInit(&GetState, a->argc, a->argv, s_aOptions, RT_ELEMENTS(s_aOptions), iFirst, 0);
+    AssertRCReturn(vrc, RTEXITCODE_FAILURE);
+
+    Bstr strGatewayOsName;
+    Bstr strGatewayOsVersion;
+    Bstr strGatewayShape;
+    Bstr strTunnelNetworkName;
+    Bstr strTunnelNetworkRange;
+
+    int c;
+    while ((c = RTGetOpt(&GetState, &ValueUnion)) != 0)
+    {
+        switch (c)
+        {
+            case 'n':
+                strGatewayOsName=ValueUnion.psz;
+                break;
+            case 'v':
+                strGatewayOsVersion=ValueUnion.psz;
+                break;
+            case 's':
+                strGatewayShape=ValueUnion.psz;
+                break;
+            case 't':
+                strTunnelNetworkName=ValueUnion.psz;
+                break;
+            case 'r':
+                strTunnelNetworkRange=ValueUnion.psz;
+                break;
+            case VINF_GETOPT_NOT_OPTION:
+                return errorUnknownSubcommand(ValueUnion.psz);
+            default:
+                return errorGetOpt(c, &ValueUnion);
+        }
+    }
+
+    /* Delayed check. It allows us to print help information.*/
+    hrc = checkAndSetCommonOptions(a, pCommonOpts);
+    if (FAILED(hrc))
+        return RTEXITCODE_FAILURE;
+
+    // if (strGatewayOsName.isEmpty())
+    //     return errorArgument("Missing --gateway-os-name parameter");
+    // if (strGatewayOsVersion.isEmpty())
+    //     return errorArgument("Missing --gateway-os-version parameter");
+    // if (strGatewayShape.isEmpty())
+    //     return errorArgument("Missing --gateway-shape parameter");
+    // if (strTunnelNetworkName.isEmpty())
+    //     strTunnelNetworkName = "VirtualBox Tunneling Network";
+
+    ComPtr<ICloudProfile> pCloudProfile = pCommonOpts->profile.pCloudProfile;
+
+    ComObjPtr<ICloudClient> oCloudClient;
+    CHECK_ERROR2_RET(hrc, pCloudProfile,
+                     CreateCloudClient(oCloudClient.asOutParam()),
+                     RTEXITCODE_FAILURE);
+
+    ComPtr<IVirtualBox> pVirtualBox = a->virtualBox;
+    ComPtr<ICloudNetworkEnvironmentInfo> cloudNetworkEnv;
+    ComPtr<IProgress> progress;
+    CHECK_ERROR2_RET(hrc, oCloudClient,
+                     SetupCloudNetworkEnvironment(strTunnelNetworkName.raw(), strTunnelNetworkRange.raw(),
+                                                  strGatewayOsName.raw(), strGatewayOsVersion.raw(), strGatewayShape.raw(),
+                                                  cloudNetworkEnv.asOutParam(), progress.asOutParam()),
+                     RTEXITCODE_FAILURE);
+
+    hrc = showProgress(progress);
+    CHECK_PROGRESS_ERROR_RET(progress, ("Setting up cloud network environment failed"), RTEXITCODE_FAILURE);
+
+    Bstr tunnelNetworkId;
+    hrc = cloudNetworkEnv->COMGETTER(TunnelNetworkId)(tunnelNetworkId.asOutParam());
+    RTPrintf("Cloud network environment was set up successfully. Tunnel network id is: %ls\n", tunnelNetworkId.raw());
+
+    return SUCCEEDED(hrc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
+}
+
+
 static RTEXITCODE handleCloudNetwork(HandlerArg *a, int iFirst, PCLOUDCOMMONOPT pCommonOpts)
 {
@@ -2094 +2185 @@
         { "info",           1001, RTGETOPT_REQ_NOTHING },
         { "update",         1002, RTGETOPT_REQ_NOTHING },
-        { "delete",         1003, RTGETOPT_REQ_NOTHING }
+        { "delete",         1003, RTGETOPT_REQ_NOTHING },
+        { "setup",          1004, RTGETOPT_REQ_NOTHING }
     };
 
@@ -2116 +2208 @@
             case 1003:
                 return deleteCloudNetwork(a, GetState.iNext, pCommonOpts);
+            case 1004:
+                return setupCloudNetworkEnv(a, GetState.iNext, pCommonOpts);
             case VINF_GETOPT_NOT_OPTION:
                 return errorUnknownSubcommand(ValueUnion.psz);