Changeset 75766 in vbox for trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp

Timestamp:

Nov 27, 2018 11:00:10 AM (6 years ago)

Author:

vboxsync

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

126968

Message:

bugref:9152. Replaced the word "oci" by "cloud" in the names in the Appliance code.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (modified) (15 diffs)

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

@@ -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;
@@ -666 +659 @@
      * the error straight from the API call but a tiny bit later through the
      * Progress object. */
-    if (m->locInfo.storageType == VFSType_OCI)//(isCloudDestination(aPath))
+    if (m->locInfo.storageType == VFSType_Cloud)//(isCloudDestination(aPath))
     {
         rc = S_OK;
@@ -672 +665 @@
         try
         {
-            switch (m->locInfo.storageType)
-            {
-                case VFSType_OCI:
-                    rc = i_writeOCIImpl(m->locInfo, progress);
-                    break;
-//              case VFSType_GCP:
-//                  rc = i_writeGCPImpl(m->locInfo, progress);
-//                  break;
-//              case VFSType_Amazon:
-//                  rc = i_writeAmazonImpl(m->locInfo, progress);
-//                  break;
-//              case VFSType_Azure:
-//                  rc = i_writeAzureImpl(m->locInfo, progress);
-//                  break;
-                default:
-                    break;
-            }
-
+            rc = i_writeCloudImpl(m->locInfo, progress);
         }
         catch (HRESULT aRC)
@@ -859 +835 @@
 
 
-HRESULT Appliance::i_writeOCIImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress)
+HRESULT Appliance::i_writeCloudImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress)
 {
     HRESULT rc;
@@ -901 +877 @@
             {
                 throw rc = setError(VBOX_E_OBJECT_NOT_FOUND,
-                                    tr("Strange, but nothing to export to OCI after preparation steps"));
+                                    tr("There are no images to export to Cloud after preparation steps"));
             }
 
@@ -910 +886 @@
                 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()));
+                throw setError(VBOX_E_FILE_ERROR, tr("Cloud: VM name wasn't found"));
+            m->m_CloudExportData.strDisplayMachineName = machineName.front()->strVBoxCurrent;
+            LogRel(("Exported machine name: %s\n", m->m_CloudExportData.strDisplayMachineName.c_str()));
+
+            m->m_CloudExportData.strBootImageName = strBootLocation;
+            LogRel(("Exported image: %s\n", m->m_CloudExportData.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()));
+                                    tr("Cloud: Cloud user profile wasn't found"));
+
+            m->m_CloudExportData.strProfileName = aLocInfo.strPath;
+            LogRel(("profile name: %s\n", m->m_CloudExportData.strProfileName.c_str()));
 
             Utf8Str strInstanceShapeId;
@@ -929 +905 @@
             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()));
+                                    tr("Cloud: Shape of instance wasn't found"));
+
+            m->m_CloudExportData.strInstanceShapeId = shapeId.front()->strVBoxCurrent;
+            LogRel(("Shape: %s\n", m->m_CloudExportData.strInstanceShapeId.c_str()));
 
             std::list<VirtualSystemDescriptionEntry*> domainName =
@@ -938 +914 @@
             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()));
+                                    tr("Cloud: Available domain wasn't found"));
+
+            m->m_CloudExportData.strDomainName = domainName.front()->strVBoxCurrent;
+            LogRel(("Available domain name: %s\n", m->m_CloudExportData.strDomainName.c_str()));
 
             std::list<VirtualSystemDescriptionEntry*> bootDiskSize =
@@ -947 +923 @@
             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()));
+                                    tr("Cloud: Boot disk size wasn't found"));
+
+            m->m_CloudExportData.strBootDiskSize = bootDiskSize.front()->strVBoxCurrent;
+            LogRel(("Boot disk size: %s\n", m->m_CloudExportData.strBootDiskSize.c_str()));
 
             std::list<VirtualSystemDescriptionEntry*> bucketId =
@@ -956 +932 @@
             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()));
+                                    tr("Cloud: Bucket wasn't found"));
+
+            m->m_CloudExportData.strBucketId = bucketId.front()->strVBoxCurrent;
+            LogRel(("bucket name: %s\n", m->m_CloudExportData.strBucketId.c_str()));
 
             std::list<VirtualSystemDescriptionEntry*> subnet =
@@ -965 +941 @@
             if (subnet.empty())
                 throw rc = setError(VBOX_E_OBJECT_NOT_FOUND,
-                                    tr("OCI: Subnet wasn't found"));
-
-            m->m_OciExportData.strSubnet = subnet.front()->strVBoxCurrent;
-            LogRel(("OCI Subnet name: %s\n", m->m_OciExportData.strSubnet.c_str()));
+                                    tr("Cloud: Subnet wasn't found"));
+
+            m->m_CloudExportData.strSubnet = subnet.front()->strVBoxCurrent;
+            LogRel(("Subnet name: %s\n", m->m_CloudExportData.strSubnet.c_str()));
 
             std::list<VirtualSystemDescriptionEntry*> publicIP =
@@ -974 +950 @@
             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"));
+                                    tr("Cloud: Public IP setting wasn't found"));
+
+            m->m_CloudExportData.fPublicIP = (publicIP.front()->strVBoxCurrent == "true") ? true : false;
+            LogRel(("public IP: %s\n", m->m_CloudExportData.fPublicIP ? "yes" : "no"));
         }
 
@@ -984 +960 @@
 
         // Initialize our worker task
-        TaskOCI* task = NULL;
+        TaskCloud* task = NULL;
         try
         {
-            task = new Appliance::TaskOCI(this, TaskOCI::Export, aLocInfo, aProgress);
+            task = new Appliance::TaskCloud(this, TaskCloud::Export, aLocInfo, aProgress);
         }
         catch(...)
         {
             throw rc = setError(VBOX_E_OBJECT_NOT_FOUND,
-                                tr("Could not create TaskOCI object for exporting to OCI"));
+                                tr("Could not create TaskCloud object for exporting to Cloud"));
         }
 
@@ -2343 +2319 @@
  * instance with this image in the OCI Compute service.
  */
-HRESULT Appliance::i_writeFSOCI(TaskOCI *pTask)
+HRESULT Appliance::i_writeFSCloud(TaskCloud *pTask)
 {
-    LogRel(("Appliance::i_writeFSOCI\n"));
     LogFlowFuncEnter();
 
@@ -2352 +2327 @@
     hrc = mVirtualBox->COMGETTER(CloudProviderManager)(cpm.asOutParam());
     Utf8Str strProviderName("OCI");
-    ComPtr<ICloudProvider> ociProvider;
-    hrc = cpm->GetProviderByShortName(Bstr(strProviderName.c_str()).raw(), ociProvider.asOutParam());
-    ComPtr<ICloudProfile> ociProfile;
-    hrc = ociProvider->GetProfileByName(Bstr(m->m_OciExportData.strProfileName.c_str()).raw(), ociProfile.asOutParam());
+    ComPtr<ICloudProvider> cloudProvider;
+    hrc = cpm->GetProviderByShortName(Bstr(strProviderName.c_str()).raw(), cloudProvider.asOutParam());
+    ComPtr<ICloudProfile> cloudProfile;
+    hrc = cloudProvider->GetProfileByName(Bstr(m->m_CloudExportData.strProfileName.c_str()).raw(), cloudProfile.asOutParam());
     ComObjPtr<ICloudClient> cloudClient;
-    hrc = ociProfile->CreateCloudClient(cloudClient.asOutParam());
+    hrc = cloudProfile->CreateCloudClient(cloudClient.asOutParam());
 
     if (SUCCEEDED(hrc))
     {
-        LogRel(("Appliance::i_writeFSOCI(): calling OCICloudClient::exportVM\n"));
-
-        /// @todo that's to be moved to ExpTack, but we need to have that method
-        /// exposed in .xidl
+        LogRel(("Appliance::i_writeFSCloud(): calling CloudClient::ExportLaunchVM\n"));
+
         if (m->virtualSystemDescriptions.size() == 1) {
             ComPtr<IVirtualBox> VBox(mVirtualBox);
 
             pTask->pProgress->init(mVirtualBox, static_cast<IAppliance*>(this),
-                         Bstr("Exporting VM to OCI...").raw(),
+                         Bstr("Exporting VM to Cloud...").raw(),
                          TRUE /* aCancelable */,
                          5, // ULONG cOperations,
                          1000, // ULONG ulTotalOperationsWeight,
-                         Bstr("Exporting VM to OCI...").raw(), // aFirstOperationDescription
+                         Bstr("Exporting VM to Cloud...").raw(), // aFirstOperationDescription
                          10); // ULONG ulFirstOperationWeight,