Changeset 84618 in vbox for trunk/src/VBox/Main

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (3 diffs)
• include/ConsoleImpl.h (modified) (2 diffs)
• include/MachineImpl.h (modified) (3 diffs)
• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (4 diffs)
• src-server/MachineImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -571 +571 @@
         src-server/NATNetworkImpl.cpp \
         $(if $(VBOX_WITH_CLOUD_NET), \
-        src-server/CloudGateway.cpp \
         src-server/CloudNetworkImpl.cpp \
         ,) \
@@ -1017 +1016 @@
         $(VBOX_XML_SCHEMADEFS_CPP)
 
+# Experimental cloud support
+ifdef VBOX_WITH_CLOUD_NET
+ VBoxC_DEFS += VBOX_WITH_CLOUD_NET
+ VBoxC_SOURCES += src-client/CloudGateway.cpp
+endif
+
 # Audio bits.
 VBoxC_SOURCES += \

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

@@ -26733 +26733 @@
 
 
+  <interface name="ICloudNetworkEnvironmentInfo" extends="$unknown"
+             uuid="181dfb55-394d-44d3-9edb-af2c4472c40a"
+             wsmap="managed"
+             reservedAttributes="7">
+    <attribute name="tunnelNetworkId" type="wstring" readonly="yes"/>
+  </interface>
+
+
   <interface name="ICloudMachine" extends="$unknown"
              uuid="d8497a14-8fbf-11ea-aa85-2b4d110b053e"
@@ -26925 +26933 @@
   <interface
     name="ICloudClient" extends="$unknown"
-    uuid="5b047402-9648-11ea-9aa2-2f60bdea83dd"
+    uuid="5fa3a8db-1c4f-4cda-b8d4-7982ef60fefb"
     wsmap="managed" reservedMethods="16" reservedAttributes="8"
     >
@@ -27344 +27352 @@
       <param name="gatewayInfo" type="ICloudNetworkGatewayInfo" dir="out">
         <desc>Information about the started gateway.</desc>
+      </param>
+      <param name="progress" type="IProgress" dir="return">
+        <desc>Progress object to track the operation completion.</desc>
+      </param>
+    </method>
+
+    <method name="setupCloudNetworkEnvironment">
+      <param name="tunnelNetworkName" type="wstring" dir="in">
+        <desc>The name of tunnelling network to be created in the Cloud. If this parameter
+          is empty the default value "VirtualBox Tunneling Network" is assumed.</desc>
+      </param>
+      <param name="tunnelNetworkRange" type="wstring" dir="in">
+        <desc>The IP address range of tunnelling network to be created in the Cloud. If this
+          parameter is empty the default value "10.0.0.0/16" is assumed.</desc>
+      </param>
+      <param name="gatewayOsName" type="wstring" dir="in">
+        <desc>The name of the operating system to be used for cloud gateway instances.
+          The default value is "Oracle Linux".</desc>
+      </param>
+      <param name="gatewayOsVersion" type="wstring" dir="in">
+        <desc>The version of the operating system to be used for cloud gateway instances.
+          The default value is "7.8".</desc>
+      </param>
+      <param name="gatewayShape" type="wstring" dir="in">
+        <desc>The shape of cloud gateway instance. The default value is "VM.Standard2.1".</desc>
+      </param>
+      <param name="networkEnvironmentInfo" type="ICloudNetworkEnvironmentInfo" dir="out">
+        <desc>Information about the created network environment.</desc>
       </param>
       <param name="progress" type="IProgress" dir="return">

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -30 +30 @@
 # include "Recording.h"
 #endif
+#ifdef VBOX_WITH_CLOUD_NET
+#include "CloudGateway.h"
+#endif /* VBOX_WITH_CLOUD_NET */
 
 class Guest;
@@ -1092 +1095 @@
 #endif /* VBOX_WITH_RECORDING */
 
+#ifdef VBOX_WITH_CLOUD_NET
+    GatewayInfo mGateways;
+#endif /* VBOX_WITH_CLOUD_NET */
+
     friend class VMTask;
     friend class ConsoleVRDPServer;

trunk/src/VBox/Main/include/MachineImpl.h

@@ -46 +46 @@
 # include "ThreadTask.h"
 #endif
-#ifdef VBOX_WITH_CLOUD_NET
-# include "CloudNetworkImpl.h"
-# include "CloudGateway.h"
-#endif /* VBOX_WITH_CLOUD_NET */
 
 // generated header
@@ -204 +200 @@
         // list of files to delete in Delete(); this list is filled by Unregister()
         std::list<Utf8Str>  llFilesToDelete;
-
-#ifdef VBOX_WITH_CLOUD_NET
-        GatewayInfo         mGatewayInfo;
-#endif /* VBOX_WITH_CLOUD_NET */
 };
 
@@ -764 +756 @@
     pm::CollectorGuest     *mCollectorGuest;
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
-
-#ifdef VBOX_WITH_CLOUD_NET
-HRESULT i_connectToCloudNetwork(ProgressProxy *aProgress);
-HRESULT i_disconnectFromCloudNetwork();
-HRESULT i_setMacAddress(int slot, const Utf8Str& strMac);
-#endif /* VBOX_WITH_CLOUD_NET */
 
     Machine * const         mPeer;

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -649 +649 @@
     }
 
+#ifdef VBOX_WITH_CLOUD_NET
+    {
+        ComPtr<IVirtualBox> pVirtualBox;
+        HRESULT rc = mMachine->COMGETTER(Parent)(pVirtualBox.asOutParam());
+        AssertComRC(rc);
+        if (SUCCEEDED(rc) && !pVirtualBox.isNull())
+            stopGateways(pVirtualBox, mGateways);
+    }
+#endif /* VBOX_WITH_CLOUD_NET */
     LogFlowThisFunc(("initFailed()=%d\n", autoUninitSpan.initFailed()));
     if (mVmListener)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -2630 +2630 @@
             Assert(!macAddr.isEmpty());
             Utf8Str macAddrUtf8 = macAddr;
+#ifdef VBOX_WITH_CLOUD_NET
+            NetworkAttachmentType_T eAttachmentType;
+            hrc = networkAdapter->COMGETTER(AttachmentType)(&eAttachmentType);                 H();
+            if (eAttachmentType == NetworkAttachmentType_Cloud)
+            {
+                mGateways.setLocalMacAddress(macAddrUtf8);
+                /* We'll insert cloud MAC later, when it becomes known. */
+            }
+            else
+            {
+#endif
             char *macStr = (char*)macAddrUtf8.c_str();
             Assert(strlen(macStr) == 12);
@@ -2646 +2657 @@
             }
             InsertConfigBytes(pCfg, "MAC", &Mac, sizeof(Mac));
-
+#ifdef VBOX_WITH_CLOUD_NET
+            }
+#endif
             /*
              * Check if the cable is supposed to be unplugged
@@ -4985 +4998 @@
         Bstr bstr;
 
+#ifdef VBOX_WITH_CLOUD_NET
+        /* We'll need device's pCfg for cloud attachments */
+        PCFGMNODE pDevCfg = pCfg;
+#endif /* VBOX_WITH_CLOUD_NET */
+
 #define H()         AssertLogRelMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_MAIN_CONFIG_CONSTRUCTOR_COM_ERROR)
 
@@ -5823 +5841 @@
             case NetworkAttachmentType_Cloud:
             {
-                hrc = aNetworkAdapter->COMGETTER(CloudNetwork)(bstr.asOutParam());       H();
+                ComPtr<ICloudNetwork> network;
+                hrc = aNetworkAdapter->COMGETTER(CloudNetwork)(bstr.asOutParam());            H();
+                hrc = pMachine->COMGETTER(Name)(mGateways.mTargetVM.asOutParam());            H();
+                hrc = virtualBox->FindCloudNetworkByName(bstr.raw(), network.asOutParam());   H();
+                hrc = startGateways(virtualBox, network, mGateways);                          H();
+                InsertConfigBytes(pDevCfg, "MAC", &mGateways.mCloudMacAddress, sizeof(mGateways.mCloudMacAddress));
                 if (!bstr.isEmpty())
                 {

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -50 +50 @@
 #include "ExtPackManagerImpl.h"
 #include "MachineLaunchVMCommonWorker.h"
-#ifdef VBOX_WITH_CLOUD_NET
-#include "ApplianceImpl.h"
-#include "CloudGateway.h"
-#endif /* VBOX_WITH_CLOUD_NET */
 
 // generated header
@@ -3335 +3331 @@
         if (SUCCEEDED(rc))
         {
-#ifdef VBOX_WITH_CLOUD_NET
-            i_connectToCloudNetwork(progress);
-#endif /* VBOX_WITH_CLOUD_NET */
-
             rc = i_launchVMProcess(control, strFrontend, aEnvironmentChanges, progress);
             if (SUCCEEDED(rc))
@@ -7308 +7300 @@
     return (mUSBControllers->size() > 0);
 }
-
-#ifdef VBOX_WITH_CLOUD_NET
-HRESULT Machine::i_setMacAddress(int slot, const Utf8Str& strMac)
-{
-    Bstr macAddress = strMac;
-    ComPtr<ISession> session;
-    HRESULT hrc = session.createInprocObject(CLSID_Session);
-    if (FAILED(hrc))
-        LogRel(("OCI-NET: Failed to create a session. hrc=%x\n", hrc));
-
-    hrc = lockMachine(session, LockType_Write);
-    if (FAILED(hrc))
-    {
-        LogRel(("OCI-NET: Failed to lock target VM for modifications. hrc=%x\n", hrc));
-        return hrc;
-    }
-
-    ComPtr<IMachine> sessionMachine;
-    hrc = session->COMGETTER(Machine)(sessionMachine.asOutParam());
-    if (FAILED(hrc))
-    {
-        LogRel(("OCI-NET: Failed to obtain a mutable machine. hrc=%x\n", hrc));
-        return hrc;
-    }
-
-    ComPtr<INetworkAdapter> networkAdapter;
-    hrc = sessionMachine->GetNetworkAdapter(slot, networkAdapter.asOutParam());
-    if (FAILED(hrc))
-    {
-        LogRel(("OCI-NET: Failed to locate the second network adapter. hrc=%x\n", hrc));
-        return hrc;
-    }
-
-    hrc = networkAdapter->COMSETTER(MACAddress)(macAddress.raw());
-    if (FAILED(hrc))
-    {
-        LogRel(("OCI-NET: Failed to set network name for the second network adapter. hrc=%x\n", hrc));
-        return hrc;
-    }
-
-    hrc = sessionMachine->SaveSettings();
-    if (FAILED(hrc))
-        LogRel(("OCI-NET: Failed to save 'lgw' settings. hrc=%x\n", hrc));
-
-    session->UnlockMachine();
-
-    return hrc;
-}
-
-
-HRESULT Machine::i_connectToCloudNetwork(ProgressProxy *aProgress)
-{
-    LogFlowThisFuncEnter();
-    AssertReturn(aProgress, E_FAIL);
-
-    HRESULT hrc = E_FAIL;
-    Bstr name;
-    int iSlot = -1;
-
-    LogFlowThisFunc(("Checking if cloud network needs to be connected\n"));
-    for (int slot = 0; (unsigned)slot < mNetworkAdapters.size(); ++slot)
-    {
-        BOOL enabled;
-        hrc = mNetworkAdapters[slot]->COMGETTER(Enabled)(&enabled);
-        if (   FAILED(hrc)
-            || !enabled)
-            continue;
-
-        NetworkAttachmentType_T type;
-        hrc = mNetworkAdapters[slot]->COMGETTER(AttachmentType)(&type);
-        if (   SUCCEEDED(hrc)
-            && type == NetworkAttachmentType_Cloud)
-        {
-            if (name.isNotEmpty())
-            {
-                LogRel(("OCI-NET: VM '%s' uses multiple cloud network attachments. '%ls' will be ignored.\n",
-                        mUserData->s.strName.c_str(), name.raw()));
-                continue;
-            }
-            hrc = mNetworkAdapters[slot]->COMGETTER(CloudNetwork)(name.asOutParam());
-            if (SUCCEEDED(hrc))
-            {
-                LogRel(("OCI-NET: VM '%s' uses cloud network '%ls'\n",
-                        mUserData->s.strName.c_str(), name.raw()));
-                iSlot = slot;
-            }
-        }
-    }
-    if (name.isNotEmpty())
-    {
-        LogFlowThisFunc(("Connecting to cloud network '%ls'...\n", name.raw()));
-        ComObjPtr<CloudNetwork> network;
-        hrc = mParent->i_findCloudNetworkByName(name, &network);
-        if (FAILED(hrc))
-        {
-            LogRel(("OCI-NET: Could not find cloud network '%ls'.\n", name.raw()));
-            return hrc;
-        }
-        Bstr MacAddress;
-        Utf8Str strMacAddress;
-        GatewayInfo gateways;
-        gateways.mTargetVM = mUserData->s.strName;
-        gateways.mAdapterSlot = iSlot;
-        hrc = mNetworkAdapters[iSlot]->COMGETTER(MACAddress)(MacAddress.asOutParam());
-        if (FAILED(hrc))
-        {
-            Host::i_generateMACAddress(strMacAddress);
-            LogRel(("OCI-NET: Failed to get MAC address of adapter connected to cloud network '%ls'.\n"
-                    "OCI-NET: Will use auto-generated '%s'.\n", name.raw(), strMacAddress.c_str()));
-        }
-        else
-            strMacAddress = MacAddress;
-        hrc = gateways.setLocalMacAddress(strMacAddress);
-        if (FAILED(hrc))
-        {
-            LogRel(("OCI-NET: Failed to obtain valid MAC address (%s) from cloud gateway '%ls'.\n",
-                    strMacAddress.c_str(), name.raw()));
-            return hrc;
-        }
-        hrc = startGateways(mParent, network, gateways);
-        /* We copy gateways structure unconditionally in order to be able to undo partially failed gateway setup. */
-        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-        mData->mGatewayInfo = gateways;
-        alock.release();
-        if (SUCCEEDED(hrc))
-        {
-            if (iSlot == -1)
-                LogRel(("OCI-NET: No slot information available for cloud network attachment!\n"));
-            else
-            {
-                hrc = i_setMacAddress(iSlot, gateways.getCloudMacAddressWithoutColons());
-                if (SUCCEEDED(hrc))
-                    LogRel(("OCI-NET: Updated MAC address for '%s' to %RTmac\n",
-                            mUserData->s.strName.c_str(), &gateways.mCloudMacAddress));
-                else
-                    LogRel(("OCI-NET: Failed to update MAC address for '%s' to %RTmac\n",
-                            mUserData->s.strName.c_str(), &gateways.mCloudMacAddress));
-            }
-        }
-    }
-    else
-        LogFlowThisFunc(("VM '%s' has no cloud network attachments.\n", mUserData->s.strName.c_str()));
-
-    LogFlowThisFuncLeave();
-    return hrc;
-}
-
-HRESULT Machine::i_disconnectFromCloudNetwork()
-{
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    GatewayInfo gateways(mData->mGatewayInfo);
-    mData->mGatewayInfo.setNull();
-    alock.release();
-
-    HRESULT hrc = stopGateways(mParent, gateways);
-    /// @todo Restore original MAC address. I'd hate to wait here for Machine to power off though.
-    // i_setMacAddress(gateways.mAdapterSlot, gateways.getLocalMacAddressWithoutColons());
-    return hrc;
-}
-#endif /* VBOX_WITH_CLOUD_NET */
 
 
@@ -13264 +13096 @@
     LogFlowThisFuncEnter();
 
-#ifdef VBOX_WITH_CLOUD_NET
-    mPeer->i_disconnectFromCloudNetwork();
-#endif /* VBOX_WITH_CLOUD_NET */
-
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);