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

Timestamp:

Jun 10, 2019 11:38:45 AM (6 years ago)

Author:

vboxsync

Message:

bugre:9404. Added parameter '--state' for the 'VBoxManage cloud list images' command. 3 general states are possible: available, disabled, deleted.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (7 diffs)

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

@@ -141 +141 @@
     if (strState.isNotEmpty())
     {
-        if (strState.equals("run"))
+        if (strState.equals("running"))
             machimeStates.push_back(CloudMachineState_Running);
-        else if (strState.equals("stop"))
+        else if (strState.equals("paused"))
             machimeStates.push_back(CloudMachineState_Stopped);
-        else if (strState.equals("terminate"))
+        else if (strState.equals("terminated"))
             machimeStates.push_back(CloudMachineState_Terminated);
     }
@@ -247 +247 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
-        { "--compartment-id", 'c', RTGETOPT_REQ_STRING }
+        { "--compartment-id", 'c', RTGETOPT_REQ_STRING },
+        { "--state",          's', RTGETOPT_REQ_STRING }
     };
     RTGETOPTSTATE GetState;
@@ -255 +256 @@
 
     Utf8Str strCompartmentId;
+    Utf8Str strState;
     int c;
     while ((c = RTGetOpt(&GetState, &ValueUnion)) != 0)
@@ -261 +263 @@
         {
             case 'c':
-                    strCompartmentId = ValueUnion.psz;
+                strCompartmentId = ValueUnion.psz;
+                break;
+            case 's':
+                strState = ValueUnion.psz;
                 break;
             case VINF_GETOPT_NOT_OPTION:
@@ -268 +273 @@
                 return errorGetOpt(c, &ValueUnion);
         }
+    }
+
+    com::SafeArray<CloudImageState_T> imageStates;
+    if (strState.isNotEmpty())
+    {
+        if (strState.equals("available"))
+            imageStates.push_back(CloudImageState_Available);
+        else if (strState.equals("disabled"))
+            imageStates.push_back(CloudImageState_Disabled);
+        else if (strState.equals("deleted"))
+            imageStates.push_back(CloudImageState_Deleted);
     }
 
@@ -324 +340 @@
     RTPrintf("Reply is in the form \'image name\' = \'image id\'\n");
     CHECK_ERROR2_RET(hrc, oCloudClient,
-                     ListImages(CloudImageState_Available,
+                     ListImages(ComSafeArrayAsInParam(imageStates),
                                 pVMNamesHolder.asOutParam(),
                                 pVMIdsHolder.asOutParam(),
@@ -339 +355 @@
             RTEXITCODE_FAILURE);
 
-    RTPrintf("List of available images for the cloud profile \'%ls\' \nand compartment \'%s\':\n",
+    RTPrintf("List of images for the cloud profile \'%ls\' \nand compartment \'%s\':\n",
              bstrProfileName.raw(), strCompartmentId.c_str());
     size_t cNames = arrayVMNames.size();