Changeset 79869 in vbox

Timestamp:

Jul 18, 2019 11:29:25 PM (6 years ago)

Author:

vboxsync

Message:

bugref:9404 - listCloudInstances: handle all known values for --state;
report an error if an unknown one is specified; allow multiple --state
options (API call takes an array of states).

File:

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

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

@@ -95 +95 @@
 }
 
+
 /**
  * List all available cloud instances for the specified cloud provider.
@@ -118 +119 @@
 
     Utf8Str strCompartmentId;
-    Utf8Str strState;
+    com::SafeArray<CloudMachineState_T> machineStates;
 
     int c;
@@ -128 +129 @@
                 strCompartmentId = ValueUnion.psz;
                 break;
+
             case 's':
-                strState = ValueUnion.psz;
-                break;
-            case VINF_GETOPT_NOT_OPTION:
-                return errorUnknownSubcommand(ValueUnion.psz);
-            default:
-                return errorGetOpt(c, &ValueUnion);
-        }
-    }
-
-    com::SafeArray<CloudMachineState_T> machineStates;
-    if (strState.isNotEmpty())
-    {
-        if (strState.equals("running"))
-            machineStates.push_back(CloudMachineState_Running);
-        else if (strState.equals("paused"))
-            machineStates.push_back(CloudMachineState_Stopped);
-        else if (strState.equals("terminated"))
-            machineStates.push_back(CloudMachineState_Terminated);
+            {
+                const char * const pszState = ValueUnion.psz;
+
+                if (RTStrICmp(pszState, "creatingimage") == 0)
+                    machineStates.push_back(CloudMachineState_CreatingImage);
+                else if (RTStrICmp(pszState, "paused") == 0) /* XXX */
+                    machineStates.push_back(CloudMachineState_Stopped);
+                else if (RTStrICmp(pszState, "provisioning") == 0)
+                    machineStates.push_back(CloudMachineState_Provisioning);
+                else if (RTStrICmp(pszState, "running") == 0)
+                    machineStates.push_back(CloudMachineState_Running);
+                else if (RTStrICmp(pszState, "starting") == 0)
+                    machineStates.push_back(CloudMachineState_Starting);
+                else if (RTStrICmp(pszState, "stopped") == 0)
+                    machineStates.push_back(CloudMachineState_Stopped);
+                else if (RTStrICmp(pszState, "stopping") == 0)
+                    machineStates.push_back(CloudMachineState_Stopping);
+                else if (RTStrICmp(pszState, "terminated") == 0)
+                    machineStates.push_back(CloudMachineState_Terminated);
+                else if (RTStrICmp(pszState, "terminating") == 0)
+                    machineStates.push_back(CloudMachineState_Terminating);
+                else
+                    return errorArgument("Unknown cloud instance state \"%s\"", pszState);
+                break;
+            }
+
+            case VINF_GETOPT_NOT_OPTION:
+                return errorUnknownSubcommand(ValueUnion.psz);
+
+            default:
+                return errorGetOpt(c, &ValueUnion);
+        }
     }
 
     HRESULT hrc = S_OK;
     ComPtr<IVirtualBox> pVirtualBox = a->virtualBox;
+
     ComPtr<ICloudProviderManager> pCloudProviderManager;
     CHECK_ERROR2_RET(hrc, pVirtualBox,
                      COMGETTER(CloudProviderManager)(pCloudProviderManager.asOutParam()),
                      RTEXITCODE_FAILURE);
+
     ComPtr<ICloudProvider> pCloudProvider;
-
     CHECK_ERROR2_RET(hrc, pCloudProviderManager,
                      GetProviderByShortName(Bstr(pCommonOpts->provider.pszProviderName).raw(), pCloudProvider.asOutParam()),
                      RTEXITCODE_FAILURE);
+
     ComPtr<ICloudProfile> pCloudProfile;
-
     CHECK_ERROR2_RET(hrc, pCloudProvider,
                      GetProfileByName(Bstr(pCommonOpts->profile.pszProfileName).raw(), pCloudProfile.asOutParam()),
@@ -234 +251 @@
 }
 
+
 /**
  * List all available cloud images for the specified cloud provider.
@@ -255 +273 @@
     AssertRCReturn(vrc, RTEXITCODE_FAILURE);
 
+    Utf8Str strCompartmentId;
     com::SafeArray<CloudImageState_T> imageStates;
 
-    Utf8Str strCompartmentId;
     int c;
     while ((c = RTGetOpt(&GetState, &ValueUnion)) != 0)