aboutsummaryrefslogtreecommitdiffstats
path: root/validation-scripts/all-nodes.sh
diff options
context:
space:
mode:
authormarios <marios@redhat.com>2016-01-15 14:00:33 +0200
committermarios <marios@redhat.com>2016-01-20 11:53:29 +0200
commit45be848991eb2da0ed039dcaa457800b8ed3f314 (patch)
treeb379c21b2a5fe417cce0214792a92728cf723db5 /validation-scripts/all-nodes.sh
parenta2300bc50e4675bbd6d892d40dd14221ebbf0c5d (diff)
Adds v6 capability to the deploy validation test (pings)
This changes the ping_controller_ips function in the all-nodes.sh bash validation script which is run during deployment to check network connectivity (to fail early). The main differences are using the v6 routes when it is a v6 address and using python -c to check if the v6 address is in the network and (thanks emachi!) using ping6 instead of ping. Closes-Bug: 1534578 Change-Id: Id41950f767e11884b4123fcb0bd2339636fdda68
Diffstat (limited to 'validation-scripts/all-nodes.sh')
-rw-r--r--validation-scripts/all-nodes.sh34
1 files changed, 18 insertions, 16 deletions
diff --git a/validation-scripts/all-nodes.sh b/validation-scripts/all-nodes.sh
index 8057f20..ae1fddf 100644
--- a/validation-scripts/all-nodes.sh
+++ b/validation-scripts/all-nodes.sh
@@ -5,23 +5,25 @@
# attempt a ping test the remote network IP.
function ping_controller_ips() {
local REMOTE_IPS=$1
-
for REMOTE_IP in $(echo $REMOTE_IPS | sed -e "s| |\n|g" | sort -u); do
-
- for LOCAL_NETWORK in $(ip r | grep -v default | cut -d " " -f 1); do
- local LOCAL_CIDR=$(echo $LOCAL_NETWORK | cut -d "/" -f 2)
- local LOCAL_NETMASK=$(ipcalc -m $LOCAL_NETWORK | grep NETMASK | cut -d "=" -f 2)
- local REMOTE_NETWORK=$(ipcalc -np $REMOTE_IP $LOCAL_NETMASK | grep NETWORK | cut -d "=" -f 2)
-
- if [ $REMOTE_NETWORK/$LOCAL_CIDR == $LOCAL_NETWORK ]; then
- echo -n "Trying to ping $REMOTE_IP for local network $LOCAL_NETWORK..."
- if ! ping -W 300 -c 1 $REMOTE_IP &> /dev/null; then
- echo "FAILURE"
- echo "$REMOTE_IP is not pingable. Local Network: $LOCAL_NETWORK" >&2
- exit 1
- fi
- echo "SUCCESS"
- fi
+ if [[ $REMOTE_IP =~ ":" ]]; then
+ networks=$(ip -6 r | grep -v default | cut -d " " -f 1 | grep -v "unreachable")
+ ping=ping6
+ else
+ networks=$(ip r | grep -v default | cut -d " " -f 1)
+ ping=ping
+ fi
+ for LOCAL_NETWORK in $networks; do
+ in_network=$(python -c "import ipaddr; net=ipaddr.IPNetwork('$LOCAL_NETWORK'); addr=ipaddr.IPAddress('$REMOTE_IP'); print(addr in net)")
+ if [[ $in_network == "True" ]]; then
+ echo -n "Trying to ping $REMOTE_IP for local network $LOCAL_NETWORK..."
+ if ! $ping -W 300 -c 1 $REMOTE_IP &> /dev/null; then
+ echo "FAILURE"
+ echo "$REMOTE_IP is not pingable. Local Network: $LOCAL_NETWORK" >&2
+ exit 1
+ fi
+ echo "SUCCESS"
+ fi
done
done
}