Fix standalone brokerUri name vs address usage

rh-messaging-qe · Jan 31, 2025 · 6f88745 · 6f88745
1 parent 65fd6be
commit 6f88745
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/standalone-suite/src/test/java/io/brokerqe/claire/AbstractSystemTests.java b/standalone-suite/src/test/java/io/brokerqe/claire/AbstractSystemTests.java
@@ -161,7 +161,33 @@ public static void ensureSameMessages(int totalProducedMessages, Map<String, Mes
         }
     }
 
+    protected String getAmqpBrokerUri(ArtemisContainer artemis, DeployableClient deployableClient) {
+        String brokerUriName = Constants.AMQP_URL_PREFIX + artemis.getName() + ":" + DEFAULT_AMQP_PORT;
+        String brokerUriAddress = Constants.AMQP_URL_PREFIX + artemis.getContainerIpAddress() + ":" + DEFAULT_AMQP_PORT;
+        try {
+            LOGGER.info("Trying to use artemis container name in brokerURI.");
+            testSimpleSendReceive(deployableClient, brokerUriName, "testConnectionQueue", ArtemisConstants.ADMIN_NAME, ArtemisConstants.ADMIN_PASS);
+            return brokerUriName;
+        } catch (Exception e) {
+            LOGGER.warn("Failed. Using IP address in brokerURI instead.");
+            return brokerUriAddress;
+        }
+    }
+
     // ==== Messaging methods
+    protected void testSimpleSendReceive(DeployableClient deployableClient, String brokerUri, String queue, String username, String password) {
+        Map<String, String> clientOptions = Map.of(
+                "conn-username", username,
+                "conn-password", password,
+                "address", "testMeAddress",
+                "count", "1"
+        );
+        MessagingClient messagingClient = new AmqpQpidClient(deployableClient, brokerUri, clientOptions, clientOptions);
+        messagingClient.sendMessages();
+        messagingClient.receiveMessages();
+        deleteQueue(deployableClient, queue);
+        deleteAddress(deployableClient, queue);
+    }
     protected void deleteAddress(DeployableClient artemisDeployableClient, String name) {
         BundledArtemisClient artemisClient = new BundledArtemisClient(artemisDeployableClient, ArtemisCommand.ADDRESS_DELETE, Map.of("name", name));
         artemisClient.executeCommand();

diff --git a/standalone-suite/src/test/java/io/brokerqe/claire/messaging/MessagingTests.java b/standalone-suite/src/test/java/io/brokerqe/claire/messaging/MessagingTests.java
@@ -59,9 +59,9 @@ void setupEnv() {
         LOGGER.info("Creating artemis instance: " + artemisName);
         artemis = ArtemisDeployment.createArtemis(artemisName);
         // BrokerService.getAmqpPort?
-        brokerUri = Constants.AMQP_URL_PREFIX + artemis.getName() + ":" + DEFAULT_AMQP_PORT;
         stDeployableClient = new StJavaClientDeployment();
         artemisDeployableClient = new BundledClientDeployment();
+        brokerUri = getAmqpBrokerUri(artemis, artemisDeployableClient);
     }
 
 

diff --git a/standalone-suite/src/test/java/io/brokerqe/claire/messaging/TransactionTests.java b/standalone-suite/src/test/java/io/brokerqe/claire/messaging/TransactionTests.java
@@ -51,7 +51,7 @@ void setupEnv() {
         LOGGER.info("Creating artemis instance: " + artemisName);
         artemis = ArtemisDeployment.createArtemis(artemisName);
         deployableClient = new StJavaClientDeployment();
-        brokerUri = Constants.AMQP_URL_PREFIX + artemis.getName() + ":" + DEFAULT_AMQP_PORT;
+        brokerUri = getAmqpBrokerUri(artemis, deployableClient);
     }
 
     private void doTestTransactions(String address, Map<String, String> senderOptions, Map<String, String> receiverOptions, int receiverExpMsgCount, int leftoverMessages) {