Update docs and smoke-tests with new option names
This commit is contained in:
1 parent
ebbb5d379d
commit
4ede33468e
16 files changed
+50
-74
No files matched your search
@@ -10,8 +10,8 @@ SUBNET_2=10.2.3.0/24
|
||||
|
||||
start_suite "Ping over cross-host weave network (with and without IPAM)"
|
||||
|
||||
weave_on $HOST1 launch -iprange $UNIVERSE -ipsubnet $SUBNET_1
|
||||
weave_on $HOST2 launch -iprange $UNIVERSE -ipsubnet $SUBNET_1 $HOST1
|
||||
weave_on $HOST1 launch --ipalloc-range $UNIVERSE --ipalloc-default-subnet $SUBNET_1
|
||||
weave_on $HOST2 launch --ipalloc-range $UNIVERSE --ipalloc-default-subnet $SUBNET_1 $HOST1
|
||||
|
||||
start_container $HOST1 $C1/24 --name=c1
|
||||
start_container $HOST2 ip:$C2/24 --name=c2
|
||||
|
||||
@@ -7,8 +7,8 @@ C2=10.2.1.7
|
||||
|
||||
start_suite "Ping over encrypted cross-host weave network"
|
||||
|
||||
weave_on $HOST1 launch -password notverysecure
|
||||
weave_on $HOST2 launch -password notverysecure $HOST1
|
||||
weave_on $HOST1 launch --password notverysecure
|
||||
weave_on $HOST2 launch --password notverysecure $HOST1
|
||||
|
||||
start_container $HOST1 $C1/24 --name=c1
|
||||
start_container $HOST2 $C2/24 --name=c2
|
||||
|
||||
@@ -40,7 +40,7 @@ run_on1 " $PING $EXP"
|
||||
weave_on1 "hide $EXP/24"
|
||||
run_on1 "! $PING $EXP"
|
||||
|
||||
weave_on $HOST1 launch -iprange $UNIVERSE
|
||||
weave_on $HOST1 launch --ipalloc-range $UNIVERSE
|
||||
|
||||
start_container $HOST1 $C1/24 --name=c1
|
||||
start_container $HOST1 $C2/24 --name=c2
|
||||
|
||||
@@ -6,7 +6,7 @@ start_suite "Run weave with --local"
|
||||
|
||||
run_on $HOST1 sudo weave --local reset
|
||||
|
||||
run_on $HOST1 sudo weave --local launch -iprange 10.2.5.0/24
|
||||
run_on $HOST1 sudo weave --local launch --ipalloc-range 10.2.5.0/24
|
||||
assert_raises "docker_on $HOST1 ps | grep weave"
|
||||
|
||||
run_on $HOST1 sudo weave --local run 10.2.6.5/24 -ti --name=c1 $SMALL_IMAGE /bin/sh
|
||||
|
||||
@@ -29,8 +29,8 @@ check() {
|
||||
|
||||
start_suite "Resolve names across hosts (with and without IPAM), and repopulate on restart"
|
||||
|
||||
weave_on $HOST1 launch-router -iprange $UNIVERSE
|
||||
weave_on $HOST2 launch-router -iprange $UNIVERSE $HOST1
|
||||
weave_on $HOST1 launch-router --ipalloc-range $UNIVERSE
|
||||
weave_on $HOST2 launch-router --ipalloc-range $UNIVERSE $HOST1
|
||||
|
||||
start_container $HOST2 $C2/24 --name=c2 -h $NAME2
|
||||
start_container_with_dns $HOST1 $C1/24 --name=c1
|
||||
|
||||
@@ -22,7 +22,7 @@ assert_expected_fqdn() {
|
||||
|
||||
start_suite "Use container name as hostname"
|
||||
|
||||
weave_on $HOST1 launch -iprange 10.2.0.0/24
|
||||
weave_on $HOST1 launch --ipalloc-range 10.2.0.0/24
|
||||
|
||||
assert_expected_fqdn "$NAME.$DOMAIN" --name=$NAME
|
||||
assert_expected_fqdn "$NAME.$DOMAIN" --name $NAME
|
||||
|
||||
@@ -73,7 +73,7 @@ start_suite "Weave run/start/attach/detach/expose/hide with multiple cidr argume
|
||||
# specific address, i.e. we are assuming that IPAM always returns the
|
||||
# lowest available address in the subnet
|
||||
|
||||
weave_on $HOST1 launch-router -iprange 10.2.3.0/24
|
||||
weave_on $HOST1 launch-router --ipalloc-range 10.2.3.0/24
|
||||
launch_dns_on $HOST1 10.254.254.254/24
|
||||
|
||||
# Run container with three cidrs
|
||||
|
||||
@@ -26,7 +26,7 @@ run_container "grep ^1$ /sys/class/net/ethwe/carrier"
|
||||
build_image false '["/bin/false"]' ''
|
||||
run_container "--entrypoint='grep' false ^1$ /sys/class/net/ethwe/carrier"
|
||||
|
||||
weave_on $HOST1 launch-router -iprange 10.2.2.0/24
|
||||
weave_on $HOST1 launch-router --ipalloc-range 10.2.2.0/24
|
||||
docker_on $HOST1 kill weaveproxy
|
||||
weave_on $HOST1 launch-proxy
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@ assert_no_ethwe() {
|
||||
|
||||
start_suite "Ping proxied containers over cross-host weave network (with IPAM)"
|
||||
|
||||
weave_on $HOST1 launch-router -iprange $UNIVERSE
|
||||
weave_on $HOST2 launch-router -iprange $UNIVERSE $HOST1
|
||||
weave_on $HOST1 launch-router --ipalloc-range $UNIVERSE
|
||||
weave_on $HOST2 launch-router --ipalloc-range $UNIVERSE $HOST1
|
||||
weave_on $HOST1 launch-proxy
|
||||
weave_on $HOST2 launch-proxy --no-default-ipalloc
|
||||
|
||||
|
||||
Reference in new issue
Block a user