From 3c608290db9f9c140a4000bc03e2e2676a1f69ab Mon Sep 17 00:00:00 2001
From: slavkap <51903378+slavkap@users.noreply.github.com>
Date: Wed, 27 Sep 2023 17:02:07 +0300
Subject: [PATCH] Fix tests on CS build when cloudstack-management service is
 running (#8009)

---
 .../datastore/client/ScaleIOGatewayClientImplTest.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/storage/volume/scaleio/src/test/java/org/apache/cloudstack/storage/datastore/client/ScaleIOGatewayClientImplTest.java b/plugins/storage/volume/scaleio/src/test/java/org/apache/cloudstack/storage/datastore/client/ScaleIOGatewayClientImplTest.java
index cf624c26680..817a67fc650 100644
--- a/plugins/storage/volume/scaleio/src/test/java/org/apache/cloudstack/storage/datastore/client/ScaleIOGatewayClientImplTest.java
+++ b/plugins/storage/volume/scaleio/src/test/java/org/apache/cloudstack/storage/datastore/client/ScaleIOGatewayClientImplTest.java
@@ -58,7 +58,8 @@ public class ScaleIOGatewayClientImplTest {
 
     @Rule
     public WireMockRule wireMockRule = new WireMockRule(wireMockConfig()
-            .httpsPort(port)
+            .dynamicHttpsPort()
+            .dynamicPort()
             .needClientAuth(false)
             .basicAdminAuthenticator(username, password)
             .bindAddress("localhost"));
@@ -70,7 +71,7 @@ public class ScaleIOGatewayClientImplTest {
                         .withHeader("content-type", "application/json;charset=UTF-8")
                         .withBody(sessionKey)));
 
-        client = new ScaleIOGatewayClientImpl(String.format("https://localhost:%d/api", port), username, password, false, timeout, maxConnections);
+        client = new ScaleIOGatewayClientImpl(String.format("https://localhost:%d/api", wireMockRule.httpsPort()), username, password, false, timeout, maxConnections);
 
         wireMockRule.stubFor(post("/api/types/Volume/instances")
                 .willReturn(aResponse()