From 7cb0683dc6f2420479a4356e458eb30f5c6aad64 Mon Sep 17 00:00:00 2001
From: Oleksii Zamiatin <ozamiatin@mirantis.com>
Date: Wed, 30 Nov 2016 17:01:28 +0200
Subject: [PATCH] [zmq] Fix non voting gate jobs

Fix proxy configuration and create a valid transport_url.

Change-Id: I35f22376b8eb75c2cb2175f19435a806f3dca1c1
---
 oslo_messaging/tests/functional/test_functional.py | 2 +-
 setup-test-env-zmq-proxy.sh                        | 7 ++-----
 setup-test-env-zmq-pub-sub.sh                      | 7 ++-----
 setup-test-env-zmq.sh                              | 8 +++-----
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/oslo_messaging/tests/functional/test_functional.py b/oslo_messaging/tests/functional/test_functional.py
index 83116482b..ba9f2989c 100644
--- a/oslo_messaging/tests/functional/test_functional.py
+++ b/oslo_messaging/tests/functional/test_functional.py
@@ -258,7 +258,7 @@ class NotifyTestCase(utils.SkipIfNoTransportURL):
     def test_multiple_servers(self):
         if self.url.startswith("amqp:"):
             self.skipTest("QPID-6307")
-        if self.url.startswith("zmq:"):
+        if self.url.startswith("zmq"):
             self.skipTest("ZeroMQ-PUB-SUB")
 
         listener_a = self.useFixture(
diff --git a/setup-test-env-zmq-proxy.sh b/setup-test-env-zmq-proxy.sh
index e6c6db072..59e8efb85 100755
--- a/setup-test-env-zmq-proxy.sh
+++ b/setup-test-env-zmq-proxy.sh
@@ -6,13 +6,13 @@ set -e
 DATADIR=$(mktemp -d /tmp/OSLOMSG-ZEROMQ.XXXXX)
 trap "clean_exit $DATADIR" EXIT
 
-export TRANSPORT_URL=zmq://
 export ZMQ_MATCHMAKER=redis
 export ZMQ_REDIS_PORT=65123
 export ZMQ_IPC_DIR=${DATADIR}
 export ZMQ_USE_PUB_SUB=false
 export ZMQ_USE_ROUTER_PROXY=true
 export ZMQ_USE_ACKS=false
+export TRANSPORT_URL="zmq+${ZMQ_MATCHMAKER}://127.0.0.1:${ZMQ_REDIS_PORT}"
 
 export ZMQ_PROXY_HOST=127.0.0.1
 
@@ -20,13 +20,10 @@ cat > ${DATADIR}/zmq.conf <<EOF
 [DEFAULT]
 transport_url=${TRANSPORT_URL}
 [oslo_messaging_zmq]
-rpc_zmq_matchmaker=${ZMQ_MATCHMAKER}
 rpc_zmq_ipc_dir=${ZMQ_IPC_DIR}
 use_pub_sub=${ZMQ_USE_PUB_SUB}
 use_router_proxy=${ZMQ_USE_ROUTER_PROXY}
 rpc_use_acks=${ZMQ_USE_ACKS}
-[matchmaker_redis]
-port=${ZMQ_REDIS_PORT}
 
 [zmq_proxy_opts]
 host=${ZMQ_PROXY_HOST}
@@ -34,6 +31,6 @@ EOF
 
 redis-server --port $ZMQ_REDIS_PORT &
 
-oslo-messaging-zmq-proxy --debug --config-file ${DATADIR}/zmq.conf > ${DATADIR}/zmq-proxy.log 2>&1 &
+oslo-messaging-zmq-proxy --debug --url ${TRANSPORT_URL} --config-file ${DATADIR}/zmq.conf > ${DATADIR}/zmq-proxy.log 2>&1 &
 
 $*
diff --git a/setup-test-env-zmq-pub-sub.sh b/setup-test-env-zmq-pub-sub.sh
index ef99cf294..187076d40 100755
--- a/setup-test-env-zmq-pub-sub.sh
+++ b/setup-test-env-zmq-pub-sub.sh
@@ -6,13 +6,13 @@ set -e
 DATADIR=$(mktemp -d /tmp/OSLOMSG-ZEROMQ.XXXXX)
 trap "clean_exit $DATADIR" EXIT
 
-export TRANSPORT_URL=zmq://
 export ZMQ_MATCHMAKER=redis
 export ZMQ_REDIS_PORT=65123
 export ZMQ_IPC_DIR=${DATADIR}
 export ZMQ_USE_PUB_SUB=true
 export ZMQ_USE_ROUTER_PROXY=true
 export ZMQ_USE_ACKS=false
+export TRANSPORT_URL="zmq+${ZMQ_MATCHMAKER}://127.0.0.1:${ZMQ_REDIS_PORT}"
 
 export ZMQ_PROXY_HOST=127.0.0.1
 
@@ -20,13 +20,10 @@ cat > ${DATADIR}/zmq.conf <<EOF
 [DEFAULT]
 transport_url=${TRANSPORT_URL}
 [oslo_messaging_zmq]
-rpc_zmq_matchmaker=${ZMQ_MATCHMAKER}
 rpc_zmq_ipc_dir=${ZMQ_IPC_DIR}
 use_pub_sub=${ZMQ_USE_PUB_SUB}
 use_router_proxy=${ZMQ_USE_ROUTER_PROXY}
 rpc_use_acks=${ZMQ_USE_ACKS}
-[matchmaker_redis]
-port=${ZMQ_REDIS_PORT}
 
 [zmq_proxy_opts]
 host=${ZMQ_PROXY_HOST}
@@ -34,6 +31,6 @@ EOF
 
 redis-server --port $ZMQ_REDIS_PORT &
 
-oslo-messaging-zmq-proxy --debug --config-file ${DATADIR}/zmq.conf > ${DATADIR}/zmq-proxy.log 2>&1 &
+oslo-messaging-zmq-proxy --debug --url ${TRANSPORT_URL} --config-file ${DATADIR}/zmq.conf > ${DATADIR}/zmq-proxy.log 2>&1 &
 
 $*
diff --git a/setup-test-env-zmq.sh b/setup-test-env-zmq.sh
index 87808723d..e6b219d5f 100755
--- a/setup-test-env-zmq.sh
+++ b/setup-test-env-zmq.sh
@@ -6,27 +6,25 @@ set -e
 DATADIR=$(mktemp -d /tmp/OSLOMSG-ZEROMQ.XXXXX)
 trap "clean_exit $DATADIR" EXIT
 
-export TRANSPORT_URL=zmq://
 export ZMQ_MATCHMAKER=redis
 export ZMQ_REDIS_PORT=65123
 export ZMQ_IPC_DIR=${DATADIR}
 export ZMQ_USE_PUB_SUB=false
 export ZMQ_USE_ROUTER_PROXY=false
+export ZMQ_USE_ACKS=false
+export TRANSPORT_URL="zmq+${ZMQ_MATCHMAKER}://127.0.0.1:${ZMQ_REDIS_PORT}"
 
 cat > ${DATADIR}/zmq.conf <<EOF
 [DEFAULT]
 transport_url=${TRANSPORT_URL}
 [oslo_messaging_zmq]
-rpc_zmq_matchmaker=${ZMQ_MATCHMAKER}
 rpc_zmq_ipc_dir=${ZMQ_IPC_DIR}
 use_pub_sub=${ZMQ_USE_PUB_SUB}
 use_router_proxy=${ZMQ_USE_ROUTER_PROXY}
-[matchmaker_redis]
-port=${ZMQ_REDIS_PORT}
 EOF
 
 redis-server --port $ZMQ_REDIS_PORT &
 
-oslo-messaging-zmq-proxy --debug True --config-file ${DATADIR}/zmq.conf > ${DATADIR}/zmq-proxy.log 2>&1 &
+oslo-messaging-zmq-proxy --debug --url ${TRANSPORT_URL} --config-file ${DATADIR}/zmq.conf > ${DATADIR}/zmq-proxy.log 2>&1 &
 
 $*