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

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).

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (4 diffs)

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);