add 'weave connect --replace ...'

This commit is contained in:
Paul Bellamy committed 2015-05-29 15:44:45 +01:00
1 parent 6e2bb075a6
commit 858356de22
5 files changed
+37 -22

No files matched your search

+15 -14
View File
@@ -6,17 +6,11 @@ C1=10.2.1.4
C2=10.2.1.7
direct_peers() {
weave_on $1 status | awk "/^Direct Peers:$/{f=1;next} /Reconnects:/{f=0} f"
weave_on $1 status | awk "/^Direct Peers:$/{f=1;next} /Reconnects:/{f=0} f" | sort
}
assert_connected() {
assert_raises "direct_peers $HOST2 | grep '^$HOST1$'"
assert_raises "exec_on $HOST1 c1 $PING $C2"
}
assert_disconnected() {
assert "direct_peers $HOST2" ""
assert_raises "exec_on $HOST1 c1 sh -c '! $PING $C2'"
assert_peers() {
assert "direct_peers $1" "$(echo "$2" | sort)"
}
start_suite "Connecting and forgetting routers after launch"
@@ -27,14 +21,21 @@ weave_on $HOST2 launch
start_container $HOST1 $C1/24 --name=c1
start_container $HOST2 $C2/24 --name=c2
assert_disconnected
assert_raises "weave_on $HOST2 connect $HOST1 $HOST2"
assert_connected
# Connect to some bogus hosts
assert_raises "weave_on $HOST2 connect 10.2.2.1 10.2.2.2"
assert_peers $HOST2 "10.2.2.1\n10.2.2.2"
# Replace bogus hosts with real hosts
assert_raises "exec_on $HOST1 c1 sh -c '! $PING $C2'"
assert_raises "weave_on $HOST2 connect --replace $HOST1 $HOST2"
assert_peers $HOST2 "$HOST1\n$HOST2"
assert_raises "exec_on $HOST1 c1 $PING $C2"
# Forget everyone and disonnect
assert_raises "weave_on $HOST2 forget $HOST1 $HOST2"
assert_raises "weave_on $HOST1 stop"
assert_raises "weave_on $HOST1 launch"
assert_disconnected
assert_peers $HOST2 ""
assert_raises "exec_on $HOST1 c1 sh -c '! $PING $C2'"
end_suite