cleanup proxy test helpers

test/610_proxy_wait_for_weave_test.sh

@@ -10,6 +10,6 @@ if (docker_on $HOST1 images $BASE_IMAGE | grep $BASE_IMAGE); then
   docker_on $HOST1 rmi $BASE_IMAGE
 fi
 
-assert_raises "docker_proxy_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' $BASE_IMAGE $CHECK_ETHWE_UP"
+assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' $BASE_IMAGE $CHECK_ETHWE_UP"
 
 end_suite

test/620_proxy_entrypoint_inheritance_test.sh

@@ -9,6 +9,6 @@ docker_on $HOST1 build -t inspect-ethwe - <<- EOF
   ENTRYPOINT ["ip", "link", "show", "ethwe"]
 EOF
 
-assert_raises "docker_proxy_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' inspect-ethwe | grep 'state UP'"
+assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' inspect-ethwe | grep 'state UP'"
 
 end_suite

test/630_proxy_dns_test.sh

@@ -10,8 +10,8 @@ start_suite "Proxy registers containers with dns"
 
 weave_on $HOST1 launch-dns 10.2.254.1/24
 weave_on $HOST1 launch-proxy --with-dns
-docker_proxy_on $HOST1 run -e WEAVE_CIDR=$C2/24 -dt --name=c2 -h $NAME gliderlabs/alpine /bin/sh
-docker_proxy_on $HOST1 run -e WEAVE_CIDR=$C1/24 -dt --name=c1 aanand/docker-dnsutils /bin/sh
+proxy docker_on $HOST1 run -e WEAVE_CIDR=$C2/24 -dt --name=c2 -h $NAME gliderlabs/alpine /bin/sh
+proxy docker_on $HOST1 run -e WEAVE_CIDR=$C1/24 -dt --name=c1 aanand/docker-dnsutils /bin/sh
 
 assert_dns_record $HOST1 c1 $NAME $C2
 

test/640_proxy_restart_reattaches_test.sh

@@ -10,11 +10,11 @@ start_suite "Proxy restart reattaches networking to containers"
 
 weave_on $HOST1 launch-dns 10.2.254.1/24
 weave_on $HOST1 launch-proxy --with-dns
-docker_proxy_on $HOST1 run -e WEAVE_CIDR=$C2/24 -dt --name=c2 -h $NAME gliderlabs/alpine /bin/sh
-docker_proxy_on $HOST1 run -e WEAVE_CIDR=$C1/24 -dt --name=c1 aanand/docker-dnsutils /bin/sh
+proxy docker_on $HOST1 run -e WEAVE_CIDR=$C2/24 -dt --name=c2 -h $NAME gliderlabs/alpine /bin/sh
+proxy docker_on $HOST1 run -e WEAVE_CIDR=$C1/24 -dt --name=c1 aanand/docker-dnsutils /bin/sh
 
-docker_proxy_on $HOST1 restart c2
-assert_raises "proxy_exec_on $HOST1 c2 $CHECK_ETHWE_UP"
+proxy docker_on $HOST1 restart c2
+assert_raises "proxy exec_on $HOST1 c2 $CHECK_ETHWE_UP"
 assert_dns_record $HOST1 c1 $NAME $C2
 
 end_suite

test/650_proxy_entrypoint_override_test.sh

@@ -9,6 +9,6 @@ docker_on $HOST1 build -t false - <<- EOF
   ENTRYPOINT ["/bin/false"]
 EOF
 
-assert_raises "docker_proxy_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' --entrypoint '/sbin/ip' false link show ethwe | grep 'state UP'"
+assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' --entrypoint '/sbin/ip' false link show ethwe | grep 'state UP'"
 
 end_suite

test/660_proxy_ipam_test.sh

@@ -11,8 +11,8 @@ weave_on $HOST1 launch-proxy
 weave_on $HOST2 launch -iprange $UNIVERSE $HOST1
 weave_on $HOST2 launch-proxy
 
-proxy_start_container $HOST1 -e WEAVE_CIDR= --name=c1
-proxy_start_container $HOST2 -e WEAVE_CIDR= --name=c2
+proxy start_container $HOST1 -e WEAVE_CIDR= --name=c1
+proxy start_container $HOST2 -e WEAVE_CIDR= --name=c2
 C2=$(container_ip $HOST2 c2)
 assert_raises "exec_on $HOST1 c1 $PING $C2"
 

test/config.sh

@@ -32,6 +32,8 @@ SSH=${SSH:-ssh -l vagrant -i ./insecure_private_key -o UserKnownHostsFile=./.ssh
 PING="ping -nq -W 1 -c 1"
 CHECK_ETHWE_UP="grep ^1$ /sys/class/net/ethwe/carrier"
 
+DOCKER_PORT=2375
+
 remote() {
     rem=$1
     shift 1
@@ -73,51 +75,34 @@ run_on() {
 docker_on() {
     host=$1
     shift 1
-    greyly echo "Docker on $host: $@" >&2
-    docker -H tcp://$host:2375 "$@"
+    greyly echo "Docker on $host:$DOCKER_PORT: $@" >&2
+    docker -H tcp://$host:$DOCKER_PORT "$@"
 }
 
-docker_proxy_on() {
-    host=$1
-    shift 1
-    greyly echo "Docker (with proxy) on $host: $@" >&2
-    docker -H tcp://$host:12375 "$@"
+proxy() {
+  DOCKER_PORT=12375 "$@"
 }
 
 weave_on() {
     host=$1
     shift 1
-    greyly echo "Weave on $host: $@" >&2
-    DOCKER_HOST=tcp://$host:2375 $WEAVE "$@"
+    greyly echo "Weave on $host:$DOCKER_PORT: $@" >&2
+    DOCKER_HOST=tcp://$host:$DOCKER_PORT $WEAVE "$@"
 }
 
 exec_on() {
     host=$1
     container=$2
     shift 2
-    docker -H tcp://$host:2375 exec $container "$@"
+    docker -H tcp://$host:$DOCKER_PORT exec $container "$@"
 }
 
-proxy_exec_on() {
-    host=$1
-    container=$2
-    shift 2
-    docker -H tcp://$host:12375 exec $container "$@"
-}
-
-
 start_container() {
     host=$1
     shift 1
     weave_on $host run "$@" -t gliderlabs/alpine /bin/sh
 }
 
-proxy_start_container() {
-    host=$1
-    shift 1
-    docker -H tcp://$host:12375 run "$@" -dt gliderlabs/alpine /bin/sh
-}
-
 start_container_with_dns() {
     host=$1
     shift 1