refactor

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

Author: shwstppr

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

@@ -2411,18 +2411,9 @@ public Pair<List<? extends ConfigurationGroup>, Integer> listConfigurationGroups
         return new Pair<>(result.first(), result.second());
     }
 
-    @Override
-    public Pair<List<? extends IpAddress>, Integer> searchForIPAddresses(final ListPublicIpAddressesCmd cmd) {
-        final Long associatedNetworkId = cmd.getAssociatedNetworkId();
-        final Long zone = cmd.getZoneId();
-        final Long vlan = cmd.getVlanId();
-        final Boolean forVirtualNetwork = cmd.isForVirtualNetwork();
-        final Long ipId = cmd.getId();
-        final Long networkId = cmd.getNetworkId();
-        final Long vpcId = cmd.getVpcId();
-
+    protected List<IpAddress.State> getStatesForIpAddressSearch(final ListPublicIpAddressesCmd cmd) {
         final String state = cmd.getState();
-        List<IpAddress.State> states = new ArrayList<>();
+        final List<IpAddress.State> states = new ArrayList<>();
         if (StringUtils.isNotBlank(state)) {
             for (String s : StringUtils.split(state, ",")) {
                 try {
@@ -2432,6 +2423,20 @@ public Pair<List<? extends IpAddress>, Integer> searchForIPAddresses(final ListP
                 }
             }
         }
+        return states;
+    }
+
+    @Override
+    public Pair<List<? extends IpAddress>, Integer> searchForIPAddresses(final ListPublicIpAddressesCmd cmd) {
+        final Long associatedNetworkId = cmd.getAssociatedNetworkId();
+        final Long zone = cmd.getZoneId();
+        final Long vlan = cmd.getVlanId();
+        final Boolean forVirtualNetwork = cmd.isForVirtualNetwork();
+        final Long ipId = cmd.getId();
+        final Long networkId = cmd.getNetworkId();
+        final Long vpcId = cmd.getVpcId();
+
+        final List<IpAddress.State> states = getStatesForIpAddressSearch(cmd);
         Boolean isAllocated = cmd.isAllocatedOnly();
         if (isAllocated == null) {
             if (states.contains(IpAddress.State.Free) || states.contains(IpAddress.State.Reserved)) {

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

@@ -1034,4 +1034,49 @@ public void testGetExternalVmConsole() {
         Assert.assertNotNull(spy.getExternalVmConsole(virtualMachine, host));
         Mockito.verify(extensionManager).getInstanceConsole(virtualMachine, host);
     }
+
+    @Test
+    public void getStatesForIpAddressSearchReturnsValidStates() {
+        ListPublicIpAddressesCmd cmd = Mockito.mock(ListPublicIpAddressesCmd.class);
+        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));
+        Assert.assertTrue(result.contains(IpAddress.State.Free));
+    }
+
+    @Test
+    public void getStatesForIpAddressSearchReturnsEmptyListForNullState() {
+        ListPublicIpAddressesCmd cmd = Mockito.mock(ListPublicIpAddressesCmd.class);
+        Mockito.when(cmd.getState()).thenReturn(null);
+        List<IpAddress.State> result = spy.getStatesForIpAddressSearch(cmd);
+        Assert.assertTrue(result.isEmpty());
+    }
+
+    @Test
+    public void getStatesForIpAddressSearchReturnsEmptyListForBlankState() {
+        ListPublicIpAddressesCmd cmd = Mockito.mock(ListPublicIpAddressesCmd.class);
+        Mockito.when(cmd.getState()).thenReturn("   ");
+        List<IpAddress.State> result = spy.getStatesForIpAddressSearch(cmd);
+        Assert.assertTrue(result.isEmpty());
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void getStatesForIpAddressSearchThrowsExceptionForInvalidState() {
+        ListPublicIpAddressesCmd cmd = Mockito.mock(ListPublicIpAddressesCmd.class);
+        Mockito.when(cmd.getState()).thenReturn("InvalidState");
+        spy.getStatesForIpAddressSearch(cmd);
+    }
+
+    @Test
+    public void getStatesForIpAddressSearchHandlesMixedValidAndInvalidStates() {
+        ListPublicIpAddressesCmd cmd = Mockito.mock(ListPublicIpAddressesCmd.class);
+        Mockito.when(cmd.getState()).thenReturn("Allocated,InvalidState");
+        try {
+            spy.getStatesForIpAddressSearch(cmd);
+            Assert.fail("Expected InvalidParameterValueException to be thrown");
+        } catch (InvalidParameterValueException e) {
+            Assert.assertEquals("Invalid state: InvalidState", e.getMessage());
+        }
+    }
 }