Changeset 73929 in vbox

Timestamp:

Aug 28, 2018 6:00:59 PM (6 years ago)

Author:

vboxsync

Message:

OCI: commit OCI code as-is. Doesn't yet compile in extpack but should
not break the normal build.

Location:

trunk

Files:

• include/iprt/err.h (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (5 diffs)
• src/VBox/Main/include/ApplianceImplPrivate.h (modified) (1 diff)
• src/VBox/Main/src-server/ApplianceImplExport.cpp (modified) (5 diffs)

trunk/include/iprt/err.h

@@ -1837 +1837 @@
 /** @name HTTP status codes
  * @{ */
+/** HTTP Internal Server Error. */
+#define VERR_HTTP_STATUS_SERVER_ERROR           (-884)
 /** HTTP initialization failed. */
 #define VERR_HTTP_INIT_FAILED                   (-885)

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

@@ -917 +917 @@
                         case VirtualSystemDescriptionType_CloudOCIVCN:
                         case VirtualSystemDescriptionType_CloudOCIPublicIP:
+                        case VirtualSystemDescriptionType_CloudOCIProfilePath:
+                        case VirtualSystemDescriptionType_CloudOCISubnet:
                         case VirtualSystemDescriptionType_Miscellaneous:
                             /** @todo  VirtualSystemDescriptionType_Miscellaneous? */

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

@@ -3536 +3536 @@
   <enum
     name="VirtualSystemDescriptionType"
-    uuid="e43225cb-09fc-4e70-a56c-6dad3bcb48a6"
+    uuid="99870ce5-c613-4a49-8ac8-bdad54565c54"
     >
     <desc>Used with <link to="IVirtualSystemDescription" /> to describe the type of
@@ -3587 +3587 @@
     <const name="CloudOCIVCN" value="31" />
     <const name="CloudOCIPublicIP" value="32" />
+    <const name="CloudOCIProfilePath" value="33" />
+    <const name="CloudOCISubnet" value="34" />
   </enum>
 
@@ -24875 +24877 @@
 
   <enum
+    name="CloudProviderId"
+    uuid="c3856743-aa5d-404d-847d-14b6cf523677"
+    >
+    <const name="Unknown" value="0"/>
+    <const name="OCI" value="1"/>
+    <const name="GCP" value="2"/>
+    <const name="AWS" value="3"/>
+    <const name="MicrosoftAzure" value="4"/>
+    <const name="IBMCloud" value="5"/>
+    <const name="DigitalOcean" value="6"/>
+  </enum>
+
+  <enum
     name="CloudCommand"
     uuid="1c5cfa19-7754-4071-bf3e-6d21ad432655"
@@ -24884 +24899 @@
     <const name="stopInstance" value="0x4"/>
     <const name="deleteInstance" value="0x5"/>
-    <const name="getInstanceProperties" value="0x6"/>
+    <const name="getInstance" value="0x6"/>
     <const name="listInstances" value="0x7"/>
-    <const name="importImage" value="0x8"/>
-
-    <const name="uploadFile" value="0x10"/>
-    <const name="downloadObject" value="0x11"/>
-    <const name="deleteObject" value="0x12"/>
-    <const name="getObjectProperties" value="0x13"/>
-    <const name="listObjects" value="0x14"/>
-    <const name="listBuckets" value="0x15"/>
-    <const name="listNetworks" value="0x16"/>
-    <const name="listShapes" value="0x17"/>
-    <const name="listRegions" value="0x18"/>
-    <const name="listAvailabilityDomains" value="0x19"/>
-    <const name="listCompartments" value="0x20"/>
-    <const name="getNamespace" value="0x21"/>
+
+    <const name="createImage" value="0x10"/>
+    <const name="getImage" value="0x11"/>
+    <const name="importImage" value="0x12"/>
+    <const name="exportImage" value="0x13"/>
+    <const name="deleteImage" value="0x14"/>
+    <const name="updateImage" value="0x15"/>
+    <const name="listImages" value="0x16"/>
+
+    <const name="listNetworks" value="0x20"/>
+    <const name="getNetwork" value="0x21"/>
+    <const name="createNetwork" value="0x22"/>
+    <const name="deleteNetwork" value="0x23"/>
+    <const name="upateNetwork" value="0x24"/>
+
+    <const name="getNetworkCard" value="0x30"/>
+    <const name="updateNetworkCard" value="0x31"/>
+
+    <const name="listNetworkCardAttachements" value="0x32"/>
+    <const name="getNetworkCardAttachement" value="0x33"/>
+    <const name="detachNetworkCard" value="0x34"/>
+    <const name="attachNetworkCard" value="0x35"/>
+
+    <const name="listSubnets" value="0x40"/>
+    <const name="getSubnet" value="0x41"/>
+    <const name="createSubnet" value="0x42"/>
+    <const name="deleteSubnet" value="0x43"/>
+    <const name="updateSubnet" value="0x44"/>
+
+    <const name="listInternetGateways" value="0x50"/>
+    <const name="getInternetGateway" value="0x51"/>
+    <const name="createInternetGateway" value="0x52"/>
+    <const name="deleteInternetGateway" value="0x53"/>
+    <const name="updateInternetGateway" value="0x54"/>
+
+    <const name="listRouteTables" value="0x60"/>
+    <const name="getRouteTable" value="0x61"/>
+    <const name="createRouteTable" value="0x62"/>
+    <const name="deleteRouteTable" value="0x63"/>
+    <const name="updateRouteTable" value="0x64"/>
+
+    <const name="listShapes" value="0x70"/>
+
+    <const name="uploadFile" value="0x100"/>
+    <const name="downloadObject" value="0x101"/>
+    <const name="deleteObject" value="0x102"/>
+    <const name="getObject" value="0x103"/>
+    <const name="listObjects" value="0x104"/>
+
+    <const name="listBuckets" value="0x110"/>
+
+    <const name="getNamespace" value="0x120"/>
+
+    <const name="listRegions" value="0x200"/>
+    <const name="listAvailabilityDomains" value="0x210"/>
+    <const name="listCompartments" value="0x220"/>
+
   </enum>
 
@@ -24961 +25019 @@
       </param>
       <param name="result" type="CloudCommandResult" dir="return">
+      </param>
+    </method>
+
+    <method name="runSeveralCommands">
+      <desc>
+        Runs a set of prepared cloud operations by their ids
+      </desc>
+      <param name="commandIdList" type="wstring" safearray="yes" dir="in">
+        <desc>
+          The list of UUID of the operations.
+        </desc>
+      </param>
+      <param name="parameterNames" type="wstring" safearray="yes" dir="in">
+        <desc>Initial set of parameter names.</desc>
+      </param>
+      <param name="parameterValues" type="wstring" safearray="yes" dir="in">
+        <desc>Initial set of parameter values.</desc>
       </param>
     </method>

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

@@ -230 +230 @@
     /** Number of passwords provided. */
     uint32_t                  m_cPwProvided;
+
+    struct OciExportData_T {
+        Utf8Str strDisplayMachineName;
+        Utf8Str strProfileFilePath;
+        Utf8Str strProfileName;
+        Utf8Str strInstanceShapeId;
+        Utf8Str strDomainName;
+        Utf8Str strBootDiskSize;
+        Utf8Str strBucketId;
+        Utf8Str strVCN;
+        bool    fPublicIP;
+        Utf8Str strUserId;
+        Utf8Str strBootImageName;
+    };
+
+    OciExportData_T m_OciExportData;
 };
 

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

@@ -31 +31 @@
 #include "MachineImpl.h"
 #include "MediumImpl.h"
+#include "Global.h"
 #include "MediumFormatImpl.h"
-#include "Global.h"
 #include "SystemPropertiesImpl.h"
 
@@ -39 +39 @@
 
 #include "ApplianceImplPrivate.h"
+
+//#include "OCIProvider.h"
+//#include "CloudClientImpl.h"
+//#include "OCIProfile.h"
+//#include "CloudAPI.h"
+//#include "VBoxOCIApi.h"
+//#include "VBoxOCIRest.h"
 
 using namespace std;
@@ -867 +874 @@
             skipped = vsdescThis->i_findByType(VirtualSystemDescriptionType_HardDiskImage);
             itSkipped = skipped.begin();
+
+            ComObjPtr<Medium> ptrSourceDisk;
             while (itSkipped != skipped.end())
             {
@@ -872 +881 @@
                 // Locate the Medium object for this entry (by location/path).
                 Log(("Finding source disk \"%s\"\n", path.c_str()));
-                ComObjPtr<Medium> ptrSourceDisk;
                 rc = mVirtualBox->i_findHardDiskByLocation(path, true , &ptrSourceDisk);
+                if (SUCCEEDED(rc))
+                    break;
+                else
+                    ++itSkipped;
+            }
+
+            ComPtr<IMedium> pBootableBaseMedium;
+            // returns pBootableMedium if there are no diff images
+            rc = ptrSourceDisk->COMGETTER(Base)(pBootableBaseMedium.asOutParam());
+            if (FAILED(rc)) 
+                throw rc;
+
+            //Get base bootable disk location
+            Bstr bstrBootLocation;
+            rc = pBootableBaseMedium->COMGETTER(Location)(bstrBootLocation.asOutParam());
+            if (FAILED(rc)) throw rc;
+            Utf8Str strBootLocation = bstrBootLocation;
+
+            skipped = vsdescThis->i_findByType(VirtualSystemDescriptionType_HardDiskImage);
+            itSkipped = skipped.begin();
+            while (itSkipped != skipped.end())
+            {
+                Utf8Str path = (*itSkipped)->strVBoxCurrent;
+                // Locate the Medium object for this entry (by location/path).
+                Log(("Finding disk \"%s\"\n", path.c_str()));
+                rc = mVirtualBox->i_findHardDiskByLocation(path, true , &ptrSourceDisk);
+                if (FAILED(rc)) 
+                    throw rc;
+
+                if (!path.equalsIgnoreCase(strBootLocation))
+                    (*itSkipped)->skipIt = true;
+
                 ++itSkipped;
             }
+
+            //just in case
+            if (vsdescThis->i_findByType(VirtualSystemDescriptionType_HardDiskImage).empty())
+            {
+                throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, 
+                                    tr("Strange, but nothing to export to OCI after preparation steps"));
+            }
+
+            /*
+             * Fills out the OCI settings
+            */
+            std::list<VirtualSystemDescriptionEntry*> machineName =
+                vsdescThis->i_findByType(VirtualSystemDescriptionType_Name);
+            if (machineName.empty())
+                throw setError(VBOX_E_FILE_ERROR, tr("OCI: VM name wasn't found"));
+            m->m_OciExportData.strDisplayMachineName = machineName.front()->strVBoxCurrent;
+            LogRel(("Exported machine name: %s\n", m->m_OciExportData.strDisplayMachineName.c_str()));
+
+            m->m_OciExportData.strBootImageName = strBootLocation;
+            LogRel(("Exported image: %s\n", m->m_OciExportData.strBootImageName.c_str()));
+
+            if (aLocInfo.strPath.isEmpty())
+                throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, 
+                                    tr("OCI: Cloud user profile wasn't found"));
+
+            m->m_OciExportData.strProfileName = aLocInfo.strPath;
+            LogRel(("OCI profile name: %s\n", m->m_OciExportData.strProfileName.c_str()));
+
+            Utf8Str strInstanceShapeId;
+            std::list<VirtualSystemDescriptionEntry*> shapeId =
+                vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCIInstanceShape);
+            if (shapeId.empty())
+                throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, 
+                                    tr("OCI: Shape of instance wasn't found"));
+
+            m->m_OciExportData.strInstanceShapeId = shapeId.front()->strVBoxCurrent;
+            LogRel(("OCI shape: %s\n", m->m_OciExportData.strInstanceShapeId.c_str()));
+
+            std::list<VirtualSystemDescriptionEntry*> domainName =
+                vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCIDomain);
+            if (domainName.empty())
+                throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, 
+                                    tr("OCI: Available domain wasn't found"));
+
+            m->m_OciExportData.strDomainName = domainName.front()->strVBoxCurrent;
+            LogRel(("OCI available domain name: %s\n", m->m_OciExportData.strDomainName.c_str()));
+
+            std::list<VirtualSystemDescriptionEntry*> bootDiskSize =
+                vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCIBootDiskSize);
+            if (bootDiskSize.empty())
+                throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, 
+                                    tr("OCI: Boot disk size wasn't found"));
+
+            m->m_OciExportData.strBootDiskSize = bootDiskSize.front()->strVBoxCurrent;
+            LogRel(("OCI boot disk size: %s\n", m->m_OciExportData.strBootDiskSize.c_str()));
+
+            std::list<VirtualSystemDescriptionEntry*> bucketId =
+                vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCIBucket);
+            if (bucketId.empty())
+                throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, 
+                                    tr("OCI: Bucket wasn't found"));
+
+            m->m_OciExportData.strBucketId = bucketId.front()->strVBoxCurrent;
+            LogRel(("OCI bucket name: %s\n", m->m_OciExportData.strBucketId.c_str()));
+
+            std::list<VirtualSystemDescriptionEntry*> vcn =
+                vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCIVCN);
+            if (vcn.empty())
+                throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, 
+                                    tr("OCI: VCN wasn't found"));
+
+            m->m_OciExportData.strVCN = vcn.front()->strVBoxCurrent;
+            LogRel(("OCI VCN name: %s\n", m->m_OciExportData.strVCN.c_str()));
+
+            std::list<VirtualSystemDescriptionEntry*> publicIP =
+                vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCIPublicIP);
+            if (publicIP.empty())
+                throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, 
+                                    tr("OCI: Public IP setting wasn't found"));
+
+            m->m_OciExportData.fPublicIP = (publicIP.front()->strVBoxCurrent == "true") ? true : false;
+            LogRel(("OCI public IP: %s\n", m->m_OciExportData.fPublicIP ? "yes" : "no"));
         }
 
@@ -2248 +2370 @@
 HRESULT Appliance::i_writeFSOCI(TaskOCI *pTask)
 {
+    RT_NOREF(pTask); // XXX
     LogFlowFuncEnter();
-    RT_NOREF(pTask);
     HRESULT hrc = S_OK;
-
+    //int vrc = VINF_SUCCESS;
+    ComPtr<ICloudProviderManager> cpm;
+    hrc = mVirtualBox->COMGETTER(CloudProviderManager)(cpm.asOutParam());
+
+    Utf8Str strProviderName("OCI");
+    ComPtr<ICloudProvider> ociProfile;
+    hrc = cpm->GetProviderByShortName(Bstr(strProviderName.c_str()).raw(), ociProfile.asOutParam());
+//  initNew(VirtualBox *aVirtualBox,
+//                          OCIProvider *aParent,
+//                          const com::Utf8Str &aProfileName,
+//                          const std::vector<com::Utf8Str> &aNames,
+//                          const std::vector<com::Utf8Str> &aValues)
+
+//  hrc = cpm.i_getProfilesByProvider("OCI", ociProfiles);
+//  if (FAILED(hrc) || ociProfiles.isNull())
+//      return hrc;
+
+    //fills by values from m->m_OciExportData
+    //mostly all names(keys) come from official OCI API documentation (see LaunchInstance description)
+    std::map<Utf8Str, Utf8Str> paramNameValueMap;
+    paramNameValueMap.insert(make_pair("displayName", m->m_OciExportData.strDisplayMachineName));
+    paramNameValueMap.insert(make_pair("objectName", m->m_OciExportData.strBootImageName));
+    paramNameValueMap.insert(make_pair("vcnId", m->m_OciExportData.strVCN));
+    paramNameValueMap.insert(make_pair("bucketName", m->m_OciExportData.strBucketId));
+    paramNameValueMap.insert(make_pair("bootVolumeSizeInGBs", m->m_OciExportData.strBootDiskSize));
+    paramNameValueMap.insert(make_pair("availabilityDomain", m->m_OciExportData.strDomainName));
+    paramNameValueMap.insert(make_pair("shape", m->m_OciExportData.strInstanceShapeId));
+    paramNameValueMap.insert(make_pair("profileName", m->m_OciExportData.strProfileName));
+    paramNameValueMap.insert(make_pair("assignPublicIp", (m->m_OciExportData.fPublicIP == true) ? "true" : "false"));
+
+    com::SafeArray<CloudCommand_T> commandList;
+/*
+    ComObjPtr<ICloudClient> aCloudClient;
+    hrc = ociProfiles->CreateCloudClient(Bstr(m->m_OciExportData.strProfileName).raw(), aCloudClient.asOutParam());
+
+    if (SUCCEEDED(hrc))
+    {
+        try
+        {
+            CloudClient *client = static_cast<CloudClient*>(aCloudClient.operator->());
+
+            hrc = aCloudClient->GetCommandsForOperation(CloudOperation_exportVM, false,
+                                                        ComSafeArrayAsOutParam(commandList));
+            if (SUCCEEDED(hrc))
+            {
+                std::vector<com::Guid> commandIdList;
+
+                for (ULONG i = 0; i < commandList.size(); i++)
+                {
+                    CloudCommand_T cmd = commandList[i];
+                    Bstr bStrId;
+                    hrc = aCloudClient->CreateCommand(cmd, bStrId.asOutParam());
+
+                    if (SUCCEEDED(hrc))
+                    {
+                        com::Guid cId(bStrId);
+                        //set conditions
+                        {
+                            CloudCommandCl *cc = NULL;
+                            vrc = client->i_getCommandById(cId, &cc);
+                            if (RT_SUCCESS(vrc))
+                            {
+                                switch(cmd)
+                                {
+                                    case CloudCommand_getImage:
+                                    case CloudCommand_getSubnet:
+                                        vrc = cc->setCondition(new oci::LifecycleStateCondition(Utf8Str("AVAILABLE")));
+                                        break;
+                                    case CloudCommand_getInstance:
+                                        vrc = cc->setCondition(new oci::LifecycleStateCondition(Utf8Str("RUNNING")));
+                                        break;
+                                    default:
+                                        break;
+                                }
+                                if (RT_FAILURE(vrc))
+                                {
+                                    hrc = E_FAIL;
+                                    break;
+                                }
+
+                            }
+                            else
+                            {
+                                hrc = E_FAIL;
+                                break;
+                            }
+                        }
+
+                        commandIdList.push_back(cId);//fills the Id list
+                    }
+                }
+
+                if (SUCCEEDED(hrc))
+                    vrc = client->i_runSeveralCommands(commandIdList, paramNameValueMap);
+            }
+        }
+        catch (HRESULT arc)
+        {
+            hrc = arc;
+        }
+        catch (...)
+        {
+            LogRel(("Appliance::i_writeFSOCI(): get cought unknown exception\n"));
+        }
+
+        aCloudClient.setNull();
+    }
+    */
+    LogFlowFuncLeave();
     return hrc;
 }