Changeset 79033 in vbox for trunk

Timestamp:

Jun 7, 2019 9:22:06 AM (6 years ago)

Author:

vboxsync

Message:

bugref:9404. Changed the command \'list instances\'. Now the requested states can be combined together in the array.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)

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

@@ -183 +183 @@
     com::SafeArray<BSTR> arrayVMIds;
     ComPtr<IProgress> pProgress;
-
-    RTPrintf("Getting a list of available cloud instances...\n");
+    com::SafeArray<CloudMachineState_T> machimeStates;
+
     RTPrintf("Reply is in the form \'instance name\' = \'instance id\'\n");
+
     CHECK_ERROR2_RET(hrc, oCloudClient,
-                     ListInstances(CloudMachineState_Running,
+                     ListInstances(ComSafeArrayAsInParam(machimeStates),
                                    pVMNamesHolder.asOutParam(),
                                    pVMIdsHolder.asOutParam(),
@@ -202 +203 @@
             RTEXITCODE_FAILURE);
 
-    RTPrintf("List of running instances for the cloud profile \'%ls\' \nand compartment \'%s\':\n",
+    RTPrintf("List of instances for the cloud profile \'%ls\' \nand compartment \'%s\':\n",
              bstrProfileName.raw(), strCompartmentId.c_str());
     size_t cIds = arrayVMIds.size();
@@ -212 +213 @@
             value = arrayVMIds[k];
         RTPrintf("\t%ls = %ls\n", arrayVMNames[k], value.raw());
-    }
-
-    pVMNamesHolder.setNull();
-    pVMIdsHolder.setNull();
-    arrayVMNames.setNull();
-    arrayVMIds.setNull();
-    pProgress.setNull();
-    CHECK_ERROR2_RET(hrc, oCloudClient,
-                     ListInstances(CloudMachineState_Stopped,
-                                   pVMNamesHolder.asOutParam(),
-                                   pVMIdsHolder.asOutParam(),
-                                   pProgress.asOutParam()),
-                     RTEXITCODE_FAILURE);
-    showProgress(pProgress);
-    CHECK_PROGRESS_ERROR_RET(pProgress, ("Failed to list instances"), RTEXITCODE_FAILURE);
-
-    CHECK_ERROR2_RET(hrc,
-        pVMNamesHolder, COMGETTER(Values)(ComSafeArrayAsOutParam(arrayVMNames)),
-            RTEXITCODE_FAILURE);
-    CHECK_ERROR2_RET(hrc,
-        pVMIdsHolder, COMGETTER(Values)(ComSafeArrayAsOutParam(arrayVMIds)),
-            RTEXITCODE_FAILURE);
-
-    RTPrintf("List of paused instances for the cloud profile \'%ls\' \nand compartment \'%s\':\n",
-             bstrProfileName.raw(), strCompartmentId.c_str());
-    cNames = arrayVMNames.size();
-    cIds = arrayVMIds.size();
-    for (size_t k = 0; k < cNames; k++)
-    {
-        Bstr value;
-        if (k < cIds)
-            value = arrayVMIds[k];
-        RTPrintf("\t%ls=%ls\n", arrayVMNames[k], value.raw());
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp

@@ -321 +321 @@
 
             /* Stopped VM names and ids: */
-            CStringArray comNamesStopped;
-            CStringArray comIDsStopped;
-
-            /* Ask for Stopped cloud VMs: */
-            CProgress comProgressStopped = m_comCloudClient.ListInstances(KCloudMachineState_Stopped, comNamesStopped, comIDsStopped);
+            CStringArray comNames;
+            CStringArray comIDs;
+            QVector<KCloudMachineState> comCloudMachineState;
+
+            CProgress comProgress= m_comCloudClient.ListInstances(comCloudMachineState, comNames, comIDs);
             if (!m_comCloudClient.isOk())
             {
@@ -333 +333 @@
 
             /* Show "Acquire cloud instances" progress: */
-            msgCenter().showModalProgressDialog(comProgressStopped, UIWizardImportApp::tr("Acquire stopped cloud instances..."),
+            msgCenter().showModalProgressDialog(comProgress, UIWizardImportApp::tr("Acquire cloud instances..."),
                                                 ":/progress_reading_appliance_90px.png", 0, 0);
-            if (!comProgressStopped.isOk() || comProgressStopped.GetResultCode() != 0)
-            {
-                msgCenter().cannotAcquireCloudClientParameter(comProgressStopped);
-                break;
-            }
-
-            /* Running VM names and ids: */
-            CStringArray comNamesRunning;
-            CStringArray comIDsRunning;
-
-            /* Ask for Running cloud VMs: */
-            CProgress comProgressRunning = m_comCloudClient.ListInstances(KCloudMachineState_Running, comNamesRunning, comIDsRunning);
-            if (!m_comCloudClient.isOk())
-            {
-                msgCenter().cannotAcquireCloudClientParameter(m_comCloudClient);
-                break;
-            }
-
-            /* Show "Acquire cloud instances" progress: */
-            msgCenter().showModalProgressDialog(comProgressRunning, UIWizardImportApp::tr("Acquire running cloud instances..."),
-                                                ":/progress_reading_appliance_90px.png", 0, 0);
-            if (!comProgressRunning.isOk() || comProgressRunning.GetResultCode() != 0)
-            {
-                msgCenter().cannotAcquireCloudClientParameter(comProgressRunning);
+            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+            {
+                msgCenter().cannotAcquireCloudClientParameter(comProgress);
                 break;
             }
 
             /* Push acquired names to list rows: */
-            const QVector<QString> names = comNamesStopped.GetValues() + comNamesRunning.GetValues();
-            const QVector<QString> ids = comIDsStopped.GetValues() + comIDsRunning.GetValues();
+            const QVector<QString> names = comNames.GetValues();
+            const QVector<QString> ids = comIDs.GetValues();
             for (int i = 0; i < names.size(); ++i)
             {

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

@@ -25961 +25961 @@
   <interface
     name="ICloudClient" extends="$unknown"
-    uuid="d1ac0b72-861a-11e9-a0cf-b38ea8ea9e63"
+    uuid="17a5ade9-d9ad-4723-8004-8f47d5d7a2cc"
     wsmap="managed" reservedMethods="13" reservedAttributes="8"
     >
@@ -26039 +26039 @@
         Returns the list of the instances in the Cloud.
       </desc>
-      <param name="machineState" type="CloudMachineState" dir="in"/>
+      <param name="machineState" type="CloudMachineState" dir="in" safearray="yes"/>
       <param name="returnNames" type="IStringArray" dir="out">
         <desc>VM names.</desc>