From 0608fe2d5b39cbf2e4f542bbc1b4d1fd4bbc958c Mon Sep 17 00:00:00 2001
From: Kenneth Giusti <kgiusti@gmail.com>
Date: Fri, 23 Feb 2018 17:06:25 -0500
Subject: [PATCH] update configuration for qdrouter v1.0.0
Change-Id: I20637c51d5ae4a96f1de9ea6e2a50891adaca52a
---
tools/setup-test-env-amqp1.sh | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/tools/setup-test-env-amqp1.sh b/tools/setup-test-env-amqp1.sh
index b1583d80f..913d5ea25 100755
--- a/tools/setup-test-env-amqp1.sh
+++ b/tools/setup-test-env-amqp1.sh
@@ -22,6 +22,13 @@ function _setup_qpidd_user {
}
function _configure_qdrouterd {
+
+ QDR=$(type -p qdrouterd)
+ if [[ ! -x "$QDR" ]]; then
+ echo "FAILURE: Qpid Dispatch Router (qdrouterd) not installed"
+ exit 1
+ fi
+
# create a stand alone router
cat > ${DATADIR}/qdrouterd.conf <<EOF
router {
@@ -35,9 +42,13 @@ router {
EOF
# create a listener for incoming connect to the router
+ # ip address field name changed to 'host' at 1.0+
+ local field_name
+ field_name=$([[ $($QDR -v) == 0.*.* ]] && echo addr || echo host)
+
cat >> ${DATADIR}/qdrouterd.conf <<EOF
listener {
- addr: 0.0.0.0
+ ${field_name}: 0.0.0.0
port: 65123
role: normal
authenticatePeer: yes