From 5c638baf93f594eb2d18a9d6d4bc1723df5ba0b2 Mon Sep 17 00:00:00 2001
From: Pedro Ruivo <pruivo@redhat.com>
Date: Wed, 16 Nov 2022 17:05:11 +0000
Subject: [PATCH] ISPN-14313 Set different properties and port for cross-site
 testdriver

---
 .../src/test/resources/jgroups/xsite-stacks.xml    | 14 +++++++++++---
 .../configuration/jgroups/authz-stacks.xml         | 12 ++++++++++--
 .../configuration/jgroups/xsite-stacks.xml         | 14 +++++++++++---
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/server/testdriver/junit5/src/test/resources/jgroups/xsite-stacks.xml b/server/testdriver/junit5/src/test/resources/jgroups/xsite-stacks.xml
index 3dd7e384f4d4..7efdc0aceb2c 100644
--- a/server/testdriver/junit5/src/test/resources/jgroups/xsite-stacks.xml
+++ b/server/testdriver/junit5/src/test/resources/jgroups/xsite-stacks.xml
@@ -3,19 +3,27 @@
                              urn:org:jgroups http://www.jgroups.org/schema/jgroups-5.2.xsd"
          xmlns="urn:infinispan:config:15.0"
          xmlns:ispn="urn:infinispan:config:15.0">
-   <stack name="test-tcp" extends="tcp">
+   <stack name="global" extends="tcp">
       <MPING mcast_addr="${jgroups.xsite.mcast_addr:239.6.7.8}"
              mcast_port="${jgroups.xsite.mcast_port:55555}"
              num_discovery_runs="3"
              ip_ttl="${jgroups.udp.ip_ttl:2}"
              ispn:stack.combine="REPLACE"
       />
+   </stack>
+   <stack name="test-tcp" extends="tcp">
+      <MPING mcast_addr="${jgroups.mcast_addr:239.6.7.8}"
+             mcast_port="${jgroups.cluster.mcast_port}"
+             num_discovery_runs="3"
+             ip_ttl="${jgroups.udp.ip_ttl:2}"
+             ispn:stack.combine="REPLACE"
+      />
       <MERGE3 min_interval="1000" max_interval="5000" ispn:stack.combine="REPLACE"/>
       <FD_SOCK2 connect_timeout="3000"/>
       <FD_ALL3 timeout="3000"
                interval="1000"/>
       <relay.RELAY2 site="${relay.site_name}" max_site_masters="3" xmlns="urn:org:jgroups"/>
-      <remote-sites default-stack="tcp">
+      <remote-sites default-stack="global">
          <remote-site name="LON"/>
          <remote-site name="NYC"/>
       </remote-sites>
@@ -48,7 +56,7 @@
       <FD_ALL3 timeout="3000"
                interval="1000"/>
       <relay.RELAY2 site="${relay.site_name}" max_site_masters="3" xmlns="urn:org:jgroups"/>
-      <remote-sites default-stack="tcp">
+      <remote-sites default-stack="global">
          <remote-site name="LON"/>
          <remote-site name="NYC"/>
       </remote-sites>
diff --git a/server/tests/src/test/resources/configuration/jgroups/authz-stacks.xml b/server/tests/src/test/resources/configuration/jgroups/authz-stacks.xml
index 7a87c46b28a5..38ee474f14f5 100644
--- a/server/tests/src/test/resources/configuration/jgroups/authz-stacks.xml
+++ b/server/tests/src/test/resources/configuration/jgroups/authz-stacks.xml
@@ -3,13 +3,21 @@
             urn:org:jgroups http://www.jgroups.org/schema/jgroups-5.2.xsd"
          xmlns="urn:infinispan:config:15.0"
          xmlns:ispn="urn:infinispan:config:15.0">
+   <stack name="global" extends="tcp">
+      <MPING mcast_addr="${jgroups.xsite.mcast_addr:239.6.7.8}"
+             mcast_port="${jgroups.xsite.mcast_port:55555}"
+             num_discovery_runs="3"
+             ip_ttl="${jgroups.udp.ip_ttl:2}"
+             ispn:stack.combine="REPLACE"
+      />
+   </stack>
    <stack name="test-tcp" extends="tcp">
       <MERGE3 min_interval="1000" max_interval="5000" ispn:stack.combine="REPLACE"/>
       <FD_SOCK2 connect_timeout="3000"/>
       <FD_ALL3 timeout="3000"
                interval="1000"/>
       <relay.RELAY2 site="LON" max_site_masters="3" xmlns="urn:org:jgroups"/>
-      <remote-sites default-stack="tcp">
+      <remote-sites default-stack="global">
          <remote-site name="LON"/>
          <remote-site name="NYC"/>
       </remote-sites>
@@ -20,7 +28,7 @@
       <FD_ALL3 timeout="3000"
                interval="1000"/>
       <relay.RELAY2 site="LON" max_site_masters="3" xmlns="urn:org:jgroups"/>
-      <remote-sites default-stack="tcp">
+      <remote-sites default-stack="global">
          <remote-site name="LON"/>
          <remote-site name="NYC"/>
       </remote-sites>
diff --git a/server/tests/src/test/resources/configuration/jgroups/xsite-stacks.xml b/server/tests/src/test/resources/configuration/jgroups/xsite-stacks.xml
index 3dd7e384f4d4..7efdc0aceb2c 100644
--- a/server/tests/src/test/resources/configuration/jgroups/xsite-stacks.xml
+++ b/server/tests/src/test/resources/configuration/jgroups/xsite-stacks.xml
@@ -3,19 +3,27 @@
                              urn:org:jgroups http://www.jgroups.org/schema/jgroups-5.2.xsd"
          xmlns="urn:infinispan:config:15.0"
          xmlns:ispn="urn:infinispan:config:15.0">
-   <stack name="test-tcp" extends="tcp">
+   <stack name="global" extends="tcp">
       <MPING mcast_addr="${jgroups.xsite.mcast_addr:239.6.7.8}"
              mcast_port="${jgroups.xsite.mcast_port:55555}"
              num_discovery_runs="3"
              ip_ttl="${jgroups.udp.ip_ttl:2}"
              ispn:stack.combine="REPLACE"
       />
+   </stack>
+   <stack name="test-tcp" extends="tcp">
+      <MPING mcast_addr="${jgroups.mcast_addr:239.6.7.8}"
+             mcast_port="${jgroups.cluster.mcast_port}"
+             num_discovery_runs="3"
+             ip_ttl="${jgroups.udp.ip_ttl:2}"
+             ispn:stack.combine="REPLACE"
+      />
       <MERGE3 min_interval="1000" max_interval="5000" ispn:stack.combine="REPLACE"/>
       <FD_SOCK2 connect_timeout="3000"/>
       <FD_ALL3 timeout="3000"
                interval="1000"/>
       <relay.RELAY2 site="${relay.site_name}" max_site_masters="3" xmlns="urn:org:jgroups"/>
-      <remote-sites default-stack="tcp">
+      <remote-sites default-stack="global">
          <remote-site name="LON"/>
          <remote-site name="NYC"/>
       </remote-sites>
@@ -48,7 +56,7 @@
       <FD_ALL3 timeout="3000"
                interval="1000"/>
       <relay.RELAY2 site="${relay.site_name}" max_site_masters="3" xmlns="urn:org:jgroups"/>
-      <remote-sites default-stack="tcp">
+      <remote-sites default-stack="global">
          <remote-site name="LON"/>
          <remote-site name="NYC"/>
       </remote-sites>