[proxy] --with-ipam -> --no-default-ipam

test/600_proxy_docker_py_test.sh

@@ -4,7 +4,7 @@
 
 start_suite "Run docker-py test suite against the proxy"
 
-weave_on $HOST1 launch-proxy
+weave_on $HOST1 launch-proxy --no-default-ipam
 assert_raises "docker_on $HOST1 ps | grep weaveproxy"
 assert_raises "docker_on $HOST1 run \
   -e NOT_ON_HOST=true \

test/620_proxy_entrypoint_command_test.sh

@@ -28,7 +28,7 @@ run_container "--entrypoint='grep' false ^1$ /sys/class/net/ethwe/carrier"
 
 weave_on $HOST1 launch -iprange 10.2.2.0/24
 docker_on $HOST1 kill weaveproxy
-weave_on $HOST1 launch-proxy --with-ipam
+weave_on $HOST1 launch-proxy
 
 assert_raises "proxy docker_on $HOST1 run check-ethwe-up"
 

test/660_proxy_ipam_test.sh

@@ -9,14 +9,18 @@ start_suite "Ping proxied containers over cross-host weave network (with IPAM)"
 weave_on $HOST1 launch -iprange $UNIVERSE
 weave_on $HOST1 launch-proxy
 weave_on $HOST2 launch -iprange $UNIVERSE $HOST1
-weave_on $HOST2 launch-proxy --with-ipam
+weave_on $HOST2 launch-proxy --no-default-ipam
 
-proxy docker_on $HOST1 run -e WEAVE_CIDR= --name=c1 -dt $SMALL_IMAGE /bin/sh
-proxy docker_on $HOST2 run                --name=c2 -dt $SMALL_IMAGE /bin/sh
+proxy docker_on $HOST1 run                --name=auto     -dt $SMALL_IMAGE /bin/sh
+proxy docker_on $HOST2 run -e WEAVE_CIDR= --name=explicit -dt $SMALL_IMAGE /bin/sh
+proxy docker_on $HOST2 run                --name=none     -dt $SMALL_IMAGE /bin/sh
 
-C1=$(container_ip $HOST1 c1)
-C2=$(container_ip $HOST2 c2)
-assert_raises "proxy exec_on $HOST1 c1 $PING $C2"
-assert_raises "proxy exec_on $HOST2 c2 $PING $C1"
+AUTO=$(container_ip $HOST1 auto)
+EXPLICIT=$(container_ip $HOST2 explicit)
+assert_raises "proxy exec_on $HOST1 auto     $PING $EXPLICIT"
+assert_raises "proxy exec_on $HOST2 explicit $PING $AUTO"
+
+assert_raises "container_ip $HOST2 none" 1
+assert_raises "proxy exec_on $HOST2 none ip link show | grep -v ethwe"
 
 end_suite