Changeset 79797 in vbox

Timestamp:

Jul 15, 2019 3:39:19 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132164

Message:

bugref:9481 - listCloudImages: 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) (2 diffs)

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

@@ -255 +255 @@
     AssertRCReturn(vrc, RTEXITCODE_FAILURE);
 
+    com::SafeArray<CloudImageState_T> imageStates;
+
     Utf8Str strCompartmentId;
-    Utf8Str strState;
     int c;
     while ((c = RTGetOpt(&GetState, &ValueUnion)) != 0)
@@ -265 +266 @@
                 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<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);
-        else if (strState.equals("exporting"))
-            imageStates.push_back(CloudImageState_Exporting);
-        else if (strState.equals("importing"))
-            imageStates.push_back(CloudImageState_Importing);
-    }
+            {
+                const char * const pszState = ValueUnion.psz;
+
+                if (RTStrICmp(pszState, "available") == 0)
+                    imageStates.push_back(CloudImageState_Available);
+                else if (RTStrICmp(pszState, "deleted") == 0)
+                    imageStates.push_back(CloudImageState_Deleted);
+                else if (RTStrICmp(pszState, "disabled") == 0)
+                    imageStates.push_back(CloudImageState_Disabled);
+                else if (RTStrICmp(pszState, "exporting") == 0)
+                    imageStates.push_back(CloudImageState_Exporting);
+                else if (RTStrICmp(pszState, "importing") == 0)
+                    imageStates.push_back(CloudImageState_Importing);
+                else if (RTStrICmp(pszState, "provisioning") == 0)
+                    imageStates.push_back(CloudImageState_Provisioning);
+                else
+                    return errorArgument("Unknown cloud image 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()),
                      RTEXITCODE_FAILURE);
+
     if (strCompartmentId.isNotEmpty())
     {