Changeset 78428 in vbox for trunk/src/VBox/Main/include

Timestamp:

May 7, 2019 11:03:49 AM (6 years ago)

Author:

vboxsync

Message:

bugref:9416. The part of OCI import logic. New functions - OciRestClient::exportImage, createImageFromInstance; new API functions - ICloudClient::importInstance, getInstanceInfo; new helper classes - HandleRestBinaryResponse, DownloadSession; changes in the Appliance import and export parts.

Location:

trunk/src/VBox/Main/include

Files:

• ApplianceImpl.h (modified) (7 diffs)
• ApplianceImplPrivate.h (modified) (3 diffs)

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

@@ -102 +102 @@
     HRESULT createVFSExplorer(const com::Utf8Str &aURI,
                               ComPtr<IVFSExplorer> &aExplorer);
-    HRESULT createVirtualSystemDescriptions(ULONG aRequested, ULONG *aCreated);
     HRESULT write(const com::Utf8Str &aFormat,
                   const std::vector<ExportOptions_T> &aOptions,
@@ -112 +111 @@
     HRESULT addPasswords(const std::vector<com::Utf8Str> &aIdentifiers,
                          const std::vector<com::Utf8Str> &aPasswords);
-
+    HRESULT createVirtualSystemDescriptions(ULONG aRequested, ULONG *aCreated);
     /** weak VirtualBox parent */
     VirtualBox* const mVirtualBox;
@@ -124 +123 @@
     Data *m;
 
-    enum SetUpProgressMode { ImportFile, ImportS3, WriteFile, WriteS3, ExportCloud };
+    enum SetUpProgressMode { ImportFile, ImportS3, WriteFile, WriteS3, ExportCloud, ImportCloud };
 
     /** @name General stuff
@@ -143 +142 @@
     static void i_importOrExportThreadTask(TaskOVF *pTask);
     static void i_exportOPCThreadTask(TaskOPC *pTask);
-    static void i_exportCloudThreadTask(TaskCloud *pTask);
+    static void i_importOrExportCloudThreadTask(TaskCloud *pTask);
 
     HRESULT i_initBackendNames();
@@ -171 +170 @@
     HRESULT i_readSignatureFile(TaskOVF *pTask, RTVFSIOSTREAM hIosCert, const char *pszSubFileNm);
     HRESULT i_readTailProcessing(TaskOVF *pTask);
+    HRESULT i_gettingCloudData(TaskCloud *pTask);
+
     /** @}  */
 
@@ -215 +216 @@
     void    i_importDecompressFile(ImportStack &stack, Utf8Str const &rstrSrcPath, Utf8Str const &rstrDstPath,
                                    const char *pszManifestEntry);
+    HRESULT i_importCloudImpl(TaskCloud *pTask);
     /** @} */
 
@@ -228 +230 @@
     HRESULT i_writeFSOVA(TaskOVF *pTask, AutoWriteLockBase& writeLock);
     HRESULT i_writeFSOPC(TaskOPC *pTask);
-    HRESULT i_writeFSCloud(TaskCloud *pTask);
+    HRESULT i_exportCloudImpl(TaskCloud *pTask);
     HRESULT i_writeFSImpl(TaskOVF *pTask, AutoWriteLockBase &writeLock, RTVFSFSSTREAM hVfsFssDst);
     HRESULT i_writeBufferToFile(RTVFSFSSTREAM hVfsFssDst, const char *pszFilename, const void *pvContent, size_t cbContent);

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

@@ -339 +339 @@
     enum TaskType
     {
-        Export
+        Export,
+        Import,
+        ReadData
     };
 
@@ -353 +355 @@
         rc(S_OK)
     {
-        m_strTaskName = "CloudExpt";
+        switch (taskType)
+        {
+            case TaskCloud::Export:    m_strTaskName = "CloudExpt"; break;
+            case TaskCloud::Import:    m_strTaskName = "CloudImpt"; break;
+            case TaskCloud::ReadData:  m_strTaskName = "CloudRead"; break;
+            default:                   m_strTaskName = "CloudTask"; break;
+        }
     }
 
@@ -371 +379 @@
     void handler()
     {
-        Appliance::i_exportCloudThreadTask(this);
+        Appliance::i_importOrExportCloudThreadTask(this);
     }
 };