Changeset 74186 in vbox

Timestamp:

Sep 11, 2018 6:13:54 AM (6 years ago)

Author:

vboxsync

Message:

bugref:9152. Added Progress for the second part of OCI export.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/src-server/ApplianceImpl.cpp (modified) (1 diff)
• Main/src-server/ApplianceImplExport.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp

@@ -67 +67 @@
                         ("Can't create Cloud Client object!"));
 
+#ifndef VBOX_WITH_CLOUD_PROVIDERS_NO_COMMANDS
     /* Read Cloud Client parameters for Export VM operation: */
-#ifndef VBOX_WITH_CLOUD_PROVIDERS_NO_COMMANDS
-    const QString strJSON = comCloudClient.GetOperationParameters(KCloudOperation_exportVM);
+    QString strJSON = comCloudClient.GetOperationParameters(KCloudOperation_exportVM);
 #else
-    const QString strJSON = comCloudClient.GetExportParameters();
+    QString strJSON = comCloudClient.GetExportParameters();
 #endif
 

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

@@ -25043 +25043 @@
         <desc>Initial set of parameter values.</desc>
       </param>
+      <param name="progress" type="IProgress" dir="in">
+        <desc>Progress object to track the operation completion.</desc>
+      </param>
     </method>
 

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

@@ -1036 +1036 @@
         }
         case ExportOCI:
+            cOperations = 1 + 7;
+            m->ulWeightForXmlOperation = 1;
+            ulTotalOperationsWeight = 100;
             break;
     }

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

@@ -1013 +1013 @@
         aProgress.createObject();
 #endif
+
         // Initialize our worker task
         TaskOCI* task = NULL;
@@ -2460 +2461 @@
                     vrc = cloudClient->RunSeveralCommands(ComSafeArrayAsInParam(commandIdList),
                                                           ComSafeArrayAsInParam(paramNames),
-                                                          ComSafeArrayAsInParam(paramValues));
+                                                          ComSafeArrayAsInParam(paramValues),
+                                                          pTask->pProgress);
                 if (RT_FAILURE(vrc))
                     hrc = E_FAIL;