QPID-4787: HA brokers find self-address in brokers_url.

HA brokers need to know their own addresses, but it is not safe to simply use
local hosts name and Broker::getPort() since the broker may be listening on
multiple addresses. The solution is to have brokers check the ha-rokers-url for
their own address while doing the initial status check of the cluster.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1477165 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 15 insertions, 16 deletions

diff --git a/cpp/src/tests/ha_tests.py b/cpp/src/tests/ha_tests.py
index e7be2a246d..8ee27b5519 100755
--- a/cpp/src/tests/ha_tests.py
+++ b/cpp/src/tests/ha_tests.py
@@ -545,26 +545,25 @@ class ReplicationTests(HaBrokerTest):
         """Check that broker information is correctly published via management"""
         cluster = HaCluster(self, 3)
 
+        def ha_broker(broker):
+            ha_broker = broker.agent().getHaBroker();
+            ha_broker.update()
+            return ha_broker
+
         for broker in cluster:  # Make sure HA system-id matches broker's
-            qmf = broker.agent().getHaBroker()
-            self.assertEqual(qmf.systemId, UUID(broker.agent().getBroker().systemRef))
-
-        cluster_ports = map(lambda b: b.port(), cluster)
-        cluster_ports.sort()
-        def ports(qmf):
-            qmf.update()
-            return sorted(map(lambda b: b["port"], qmf.members))
+            self.assertEqual(ha_broker(broker).systemId, UUID(broker.agent().getBroker().systemRef))
+
         # Check that all brokers have the same membership as the cluster
-        for broker in cluster:
-            qmf = broker.agent().getHaBroker()
-            assert retry(lambda: cluster_ports == ports(qmf), 1), "%s != %s on %s"%(cluster_ports, ports(qmf), broker)
+        def check_ids(broker):
+            cluster_ids = set([ ha_broker(b).systemId for b in cluster])
+            broker_ids = set([m["system-id"] for m in  ha_broker(broker).members])
+            assert retry(lambda: cluster_ids == broker_ids, 1), "%s != %s on %s"%(cluster_ids, broker_ids, broker)
+
+        for broker in cluster: check_ids(broker)
+
         # Add a new broker, check it is updated everywhere
         b = cluster.start()
-        cluster_ports.append(b.port())
-        cluster_ports.sort()
-        for broker in cluster:
-            qmf = broker.agent().getHaBroker()
-            assert retry(lambda: cluster_ports == ports(qmf), 1), "%s != %s"%(cluster_ports, ports(qmf))
+        for broker in cluster: check_ids(broker)
 
     def test_auth(self):
         """Verify that authentication does not interfere with replication."""