utils: fix extra slash in Redfish default systems url path

This removes extra slash from the base system url in Redfish oobm client
utility.

Fixes #10441

Signed-off-by: Rohit Yadav <[email protected]>

Author: rohityadavcloud

utils/src/main/java/org/apache/cloudstack/utils/redfish/RedfishClient.java

@@ -75,8 +75,8 @@ public class RedfishClient {
     private boolean ignoreSsl;
     private int redfishRequestMaxRetries;
 
-    private final static String SYSTEMS_URL_PATH = "redfish/v1/Systems/";
-    private final static String COMPUTER_SYSTEM_RESET_URL_PATH = "/Actions/ComputerSystem.Reset";
+    private final static String SYSTEMS_URL_PATH = "redfish/v1/Systems";
+    private final static String COMPUTER_SYSTEM_RESET_URL_PATH = "Actions/ComputerSystem.Reset";
     private final static String REDFISH_RESET_TYPE = "ResetType";
     private final static String POWER_STATE = "PowerState";
     private final static String APPLICATION_JSON = "application/json";
@@ -265,12 +265,12 @@ private String getRequestPathForCommand(RedfishCmdType cmd, String resourceId) {
             if (StringUtils.isBlank(resourceId)) {
                 throw new RedfishException(String.format("Command '%s' requires a valid resource ID '%s'.", cmd, resourceId));
             }
-            return String.format("%s%s", SYSTEMS_URL_PATH, resourceId);
+            return String.format("%s/%s", SYSTEMS_URL_PATH, resourceId);
         case ComputerSystemReset:
             if (StringUtils.isBlank(resourceId)) {
                 throw new RedfishException(String.format("Command '%s' requires a valid resource ID '%s'.", cmd, resourceId));
             }
-            return String.format("%s%s%s", SYSTEMS_URL_PATH, resourceId, COMPUTER_SYSTEM_RESET_URL_PATH);
+            return String.format("%s/%s/%s", SYSTEMS_URL_PATH, resourceId, COMPUTER_SYSTEM_RESET_URL_PATH);
         default:
             throw new RedfishException(String.format("Redfish client does not support command '%s'.", cmd));
         }

utils/src/test/java/org/apache/cloudstack/utils/redfish/RedfishClientTest.java

@@ -41,9 +41,9 @@ public class RedfishClientTest {
     private static final String PASSWORD = "password";
     private static final String oobAddress = "oob.host.address";
     private static final String systemId = "SystemID.1";
-    private final static String COMPUTER_SYSTEM_RESET_URL_PATH = "/Actions/ComputerSystem.Reset";
+    private final static String COMPUTER_SYSTEM_RESET_URL_PATH = "Actions/ComputerSystem.Reset";
     private final static Integer REDFISHT_REQUEST_RETRIES = Integer.valueOf(2);
-    private static final String url = "https://address.system.net/redfish/v1/Systems/";
+    private static final String url = "https://address.system.net/redfish/v1/Systems";
     private static final HttpRequestBase httpReq = new HttpGet(url);
 
     @Mock
@@ -87,31 +87,31 @@ public void validateAddressAndPrepareForUrlTestIpv6() {
     public void buildRequestUrlTestHttpsGetSystemId() {
         RedfishClient redfishclient = new RedfishClient(USERNAME, PASSWORD, true, false, REDFISHT_REQUEST_RETRIES);
         String result = redfishclient.buildRequestUrl(oobAddress, RedfishClient.RedfishCmdType.GetSystemId, systemId);
-        String expected = String.format("https://%s/redfish/v1/Systems/", oobAddress);
+        String expected = String.format("https://%s/redfish/v1/Systems", oobAddress);
         Assert.assertEquals(expected, result);
     }
 
     @Test
     public void buildRequestUrlTestGetSystemId() {
         RedfishClient redfishclient = new RedfishClient(USERNAME, PASSWORD, false, false, REDFISHT_REQUEST_RETRIES);
         String result = redfishclient.buildRequestUrl(oobAddress, RedfishClient.RedfishCmdType.GetSystemId, systemId);
-        String expected = String.format("http://%s/redfish/v1/Systems/", oobAddress);
+        String expected = String.format("http://%s/redfish/v1/Systems", oobAddress);
         Assert.assertEquals(expected, result);
     }
 
     @Test
     public void buildRequestUrlTestHttpsComputerSystemReset() {
         RedfishClient redfishclient = new RedfishClient(USERNAME, PASSWORD, true, false, REDFISHT_REQUEST_RETRIES);
         String result = redfishclient.buildRequestUrl(oobAddress, RedfishClient.RedfishCmdType.ComputerSystemReset, systemId);
-        String expected = String.format("https://%s/redfish/v1/Systems/%s%s", oobAddress, systemId, COMPUTER_SYSTEM_RESET_URL_PATH);
+        String expected = String.format("https://%s/redfish/v1/Systems/%s/%s", oobAddress, systemId, COMPUTER_SYSTEM_RESET_URL_PATH);
         Assert.assertEquals(expected, result);
     }
 
     @Test
     public void buildRequestUrlTestComputerSystemReset() {
         RedfishClient redfishclient = new RedfishClient(USERNAME, PASSWORD, false, false, REDFISHT_REQUEST_RETRIES);
         String result = redfishclient.buildRequestUrl(oobAddress, RedfishClient.RedfishCmdType.ComputerSystemReset, systemId);
-        String expected = String.format("http://%s/redfish/v1/Systems/%s%s", oobAddress, systemId, COMPUTER_SYSTEM_RESET_URL_PATH);
+        String expected = String.format("http://%s/redfish/v1/Systems/%s/%s", oobAddress, systemId, COMPUTER_SYSTEM_RESET_URL_PATH);
         Assert.assertEquals(expected, result);
     }