Route all connections in tests to toxiproxy

kelvich · kelvich · commit cb38bc343fb9 · 2016-10-24T15:26:38.000+03:00
diff --git a/contrib/mmts/tests2/docker-compose.yml b/contrib/mmts/tests2/docker-compose.yml
@@ -10,6 +10,10 @@ services:
       POSTGRES_USER: 'pg'
       POSTGRES_DB: 'regression'
       NODE_ID: 1
+      CONNSTR: |
+        dbname=regression user=pg host=node1 arbiterport=5433,
+        dbname=regression user=pg host=toxi port=12000 arbiterport=12001,
+        dbname=regression user=pg host=toxi port=13000 arbiterport=13001
     ports:
       - "15432:5432"
 
@@ -21,6 +25,10 @@ services:
       POSTGRES_USER: 'pg'
       POSTGRES_DB: 'regression'
       NODE_ID: 2
+      CONNSTR: |
+        dbname=regression user=pg host=toxi port=21000 arbiterport=21001,
+        dbname=regression user=pg host=node2 arbiterport=5433,
+        dbname=regression user=pg host=toxi port=23000 arbiterport=23001
     ports:
       - "15433:5432"
 
@@ -32,6 +40,40 @@ services:
       POSTGRES_USER: 'pg'
       POSTGRES_DB: 'regression'
       NODE_ID: 3
+      CONNSTR: |
+        dbname=regression user=pg host=toxi port=31000 arbiterport=31001,
+        dbname=regression user=pg host=toxi port=32000 arbiterport=32001,
+        dbname=regression user=pg host=node3 arbiterport=5433
     ports:
       - "15434:5432"
 
+  toxi:
+    image: kelvich/toxiproxy
+    ports:
+      - "8474:8474"
+
+  toxi_seed:
+    image: kelvich/toxiproxy
+    depends_on:
+      - toxi
+    entrypoint: |
+      curl
+      -X POST 'http://toxi:8474/populate'
+      -H 'Content-Type: application/json; charset=utf-8'
+      -d
+      '[
+        {"name": "rep12", "listen": "0.0.0.0:12000", "upstream": "node2:5432"},
+        {"name": "arb12", "listen": "0.0.0.0:12001", "upstream": "node2:5433"},
+        {"name": "rep13", "listen": "0.0.0.0:13000", "upstream": "node3:5432"},
+        {"name": "arb13", "listen": "0.0.0.0:13001", "upstream": "node3:5433"},
+
+        {"name": "rep21", "listen": "0.0.0.0:21000", "upstream": "node1:5432"},
+        {"name": "arb21", "listen": "0.0.0.0:21001", "upstream": "node1:5433"},
+        {"name": "rep23", "listen": "0.0.0.0:23000", "upstream": "node3:5432"},
+        {"name": "arb23", "listen": "0.0.0.0:23001", "upstream": "node3:5433"},
+
+        {"name": "rep31", "listen": "0.0.0.0:31000", "upstream": "node1:5432"},
+        {"name": "arb31", "listen": "0.0.0.0:31001", "upstream": "node1:5433"},
+        {"name": "rep32", "listen": "0.0.0.0:32000", "upstream": "node2:5432"},
+        {"name": "arb32", "listen": "0.0.0.0:32001", "upstream": "node2:5433"}
+      ]'
diff --git a/contrib/mmts/tests2/docker-entrypoint.sh b/contrib/mmts/tests2/docker-entrypoint.sh
@@ -40,7 +40,10 @@ if [ "$1" = 'postgres' ]; then
 
 		############################################################################
 
-		CONNSTRS="dbname=$POSTGRES_DB user=$POSTGRES_USER host=node1, dbname=$POSTGRES_DB user=$POSTGRES_USER host=node2, dbname=$POSTGRES_DB user=$POSTGRES_USER host=node3"
+		# CONNSTRS="\
+		# 	dbname=$POSTGRES_DB user=$POSTGRES_USER host=node1, \
+		# 	dbname=$POSTGRES_DB user=$POSTGRES_USER host=node2, \
+		# 	dbname=$POSTGRES_DB user=$POSTGRES_USER host=node3"
 
 		cat <<-EOF >> $PGDATA/postgresql.conf
 			listen_addresses='*' 
diff --git a/contrib/mmts/tests2/lib/__init__.py b/contrib/mmts/tests2/lib/__init__.py
