diff --git a/site/how-it-works/encryption-implementation.md b/site/how-it-works/encryption-implementation.md index 88fafc25..907a6040 100644 --- a/site/how-it-works/encryption-implementation.md +++ b/site/how-it-works/encryption-implementation.md @@ -4,7 +4,7 @@ menu_order: 70 --- This section describes some details of Weave Net's built-in -[encryption](/how-it-works/encryption.md): +[encryption](/site/how-it-works/encryption.md): * [Establishing the Ephemeral Session Key](#ephemeral-key) * [Key Generation](#csprng) diff --git a/site/using-weave/configuring-weave.md b/site/using-weave/configuring-weave.md index e975f458..439527f6 100644 --- a/site/using-weave/configuring-weave.md +++ b/site/using-weave/configuring-weave.md @@ -39,4 +39,4 @@ Networks](https://en.wikipedia.org/wiki/Private_network). For example **See Also** - * [IP Addresses, Routes and Networks](/how-it-works/ip-addresses.md) + * [IP Addresses, Routes and Networks](/site/how-it-works/ip-addresses.md) diff --git a/site/using-weave/manual-ip-address.md b/site/using-weave/manual-ip-address.md index 5fd24ce5..3863edab 100644 --- a/site/using-weave/manual-ip-address.md +++ b/site/using-weave/manual-ip-address.md @@ -10,7 +10,7 @@ Containers are automatically allocated an IP address that is unique across the W Weave Net detects when a container has exited and releases its allocated addresses so they can be re-used by the network. -See the [Automatic IP Address Management](/site/ipam.md) and also an explanation of [the basics of IP addressing](/how-it-works/ip-addresses.md) for further details. +See the [Automatic IP Address Management](/site/ipam.md) and also an explanation of [the basics of IP addressing](/site/how-it-works/ip-addresses.md) for further details. Instead of allowing Weave Net to allocate IP addresses automatically (using IPAM), there may be instances where you need to control a particular container or a cluster by setting an IP address for it. diff --git a/site/using-weave/security-untrusted-networks.md b/site/using-weave/security-untrusted-networks.md index bbe9e998..c5d586db 100644 --- a/site/using-weave/security-untrusted-networks.md +++ b/site/using-weave/security-untrusted-networks.md @@ -45,5 +45,5 @@ Be aware that: **See Also** - * [Weave Encryption](/how-it-works/encryption.md) + * [Weave Encryption](/site/how-it-works/encryption.md) * [Using Fast Datapath](/site/using-weave/fastdp.md) diff --git a/test/320_claim_3_test_disabled.sh b/test/320_claim_3_test.sh similarity index 79% rename from test/320_claim_3_test_disabled.sh rename to test/320_claim_3_test.sh index e0ad4966..2e860534 100755 --- a/test/320_claim_3_test_disabled.sh +++ b/test/320_claim_3_test.sh @@ -2,6 +2,13 @@ . ./config.sh +delete_persistence() { + for host in "$@" ; do + docker_on $host rm -v weavedb >/dev/null + docker_on $host rm weave >/dev/null + done +} + start_suite "Claiming addresses" weave_on $HOST1 launch-router @@ -15,6 +22,9 @@ assert_raises "exec_on $HOST2 c2 $PING $C1" stop_weave_on $HOST1 stop_weave_on $HOST2 +# Delete persistence data so they form a blank ring +delete_persistence $HOST1 $HOST2 + # Start hosts in reverse order so c1's address has to be claimed from host2 weave_on $HOST2 launch-router weave_on $HOST1 launch-router $HOST2 @@ -31,11 +41,14 @@ assert_raises "exec_on $HOST1 c1 $PING $C3" stop_weave_on $HOST1 stop_weave_on $HOST2 +delete_persistence $HOST1 $HOST2 + # Now make host1 attempt to claim from host2, when host2 is stopped # the point being to check whether host1 will hang trying to talk to host2 weave_on $HOST2 launch-router # Introduce host3 to remember the IPAM CRDT when we stop host2 weave_on $HOST3 launch-router $HOST2 +weave_on $HOST3 prime stop_weave_on $HOST2 weave_on $HOST1 launch-router $HOST3