change

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

server/src/main/java/com/cloud/server/ManagementServerImpl.java

@@ -822,6 +822,7 @@
 import com.cloud.user.dao.SSHKeyPairDao;
 import com.cloud.user.dao.UserDao;
 import com.cloud.user.dao.UserDataDao;
+import com.cloud.utils.EnumUtils;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.Pair;
 import com.cloud.utils.PasswordGenerator;
@@ -2412,16 +2413,17 @@ public Pair<List<? extends ConfigurationGroup>, Integer> listConfigurationGroups
     }
 
     protected List<IpAddress.State> getStatesForIpAddressSearch(final ListPublicIpAddressesCmd cmd) {
-        final String state = cmd.getState();
+        final String statesStr = cmd.getState();
         final List<IpAddress.State> states = new ArrayList<>();
-        if (StringUtils.isNotBlank(state)) {
-            for (String s : StringUtils.split(state, ",")) {
-                try {
-                    states.add(IpAddress.State.valueOf(s));
-                } catch (IllegalArgumentException e) {
-                    throw new InvalidParameterValueException("Invalid state: " + s);
-                }
+        if (StringUtils.isBlank(statesStr)) {
+            return states;
+        }
+        for (String s : StringUtils.split(statesStr, ",")) {
+            IpAddress.State state = EnumUtils.getEnumIgnoreCase(IpAddress.State.class, s.trim());
+            if (state == null) {
+                throw new InvalidParameterValueException("Invalid state: " + s);
             }
+            states.add(state);
         }
         return states;
     }

server/src/test/java/com/cloud/server/ManagementServerImplTest.java

@@ -1038,7 +1038,7 @@ public void testGetExternalVmConsole() {
     @Test
     public void getStatesForIpAddressSearchReturnsValidStates() {
         ListPublicIpAddressesCmd cmd = Mockito.mock(ListPublicIpAddressesCmd.class);
-        Mockito.when(cmd.getState()).thenReturn("Allocated,Free");
+        Mockito.when(cmd.getState()).thenReturn("Allocated ,free");
         List<IpAddress.State> result = spy.getStatesForIpAddressSearch(cmd);
         Assert.assertEquals(2, result.size());
         Assert.assertTrue(result.contains(IpAddress.State.Allocated));

utils/src/main/java/com/cloud/utils/EnumUtils.java

@@ -55,4 +55,16 @@ public static <T extends Enum<T>> T fromString(Class<T> clz, String value) {
         }
         return null;
     }
+
+    public static <T extends Enum<T>> T getEnumIgnoreCase(Class<T> enumClass, String name) {
+        if (enumClass == null || name == null) {
+            return null;
+        }
+        for (T constant : enumClass.getEnumConstants()) {
+            if (constant.name().equalsIgnoreCase(name.trim())) {
+                return constant;
+            }
+        }
+        return null;
+    }
 }