Changeset 79033 in vbox for trunk/src/VBox/Frontends/VBoxManage

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.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (3 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());
     }