Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding new option for network check in persist_firewall test #3257

Merged
merged 3 commits into from
Nov 13, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 32 additions & 18 deletions tests_e2e/tests/scripts/agent_persist_firewall-access_wireserver
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,34 @@ function check_online
{
echo "Checking network connectivity..."

echo "Running ping to 8.8.8.8 option"
checks=0
while true; do
if ping 8.8.8.8 -c 1 -i .2 -t 30; then
echo "Network is accessible"
return 0
fi
checks=$((checks + 1))
if [ $checks -gt 10 ]; then
break
fi
echo "Connecting to ifconfig.io to check network connection"
if command -v curl >/dev/null 2>&1; then
curl --retry 5 --retry-delay 5 --connect-timeout 5 -4 ifconfig.io/ip
elif command -v wget >/dev/null 2>&1; then
wget --tries=5 --timeout=5 --wait=5 -4 ifconfig.io/ip
else
http_get.py "http://ifconfig.io/ip" --timeout 5 --delay 5 --tries 5
fi

if [[ $? -eq 0 ]]; then
echo "Network is accessible"
return 0
else
echo "$(date --utc +%FT%T.%3NZ): Network still not accessible"
# We're offline. Sleep for a bit, then check again
sleep 1;
done
fi

echo "Running ping to 8.8.8.8 option"

if ping 8.8.8.8 -c 1 -i .2 -t 30; then
echo "Network is accessible"
return 0
fi

echo "$(date --utc +%FT%T.%3NZ): Network still not accessible"
echo "Unable to connect to network, giving up"
return 1

# Will remove other options if we determine first option is stable

echo "Checking other options to see if network is accessible..."

Expand Down Expand Up @@ -77,10 +89,12 @@ fi
echo "Finally online, Time: $(date --utc +%FT%T.%3NZ)"
echo "Trying to contact Wireserver as $USER to see if accessible"
echo ""

# This script is run by a cron job on reboot, so it runs in a limited environment. Some distros may be missing the iptables path,
# so adding common iptables paths to the environment.
export PATH=$PATH:/usr/sbin:/sbin
echo "Firewall configuration before accessing Wireserver:"
if sudo which iptables > /dev/null ; then
sudo iptables -t security -L -nxv -w
else
if ! sudo iptables -t security -L -nxv -w; then
sudo nft list table walinuxagent
fi
echo ""
Expand All @@ -89,7 +103,7 @@ WIRE_IP=$(cat /var/lib/waagent/WireServerEndpoint 2>/dev/null || echo '168.63.12
if command -v curl >/dev/null 2>&1; then
curl --retry 3 --retry-delay 5 --connect-timeout 5 "http://$WIRE_IP/?comp=versions" -o "/tmp/wire-versions-$USER.xml"
elif command -v wget >/dev/null 2>&1; then
wget --tries=3 "http://$WIRE_IP/?comp=versions" --timeout=5 -O "/tmp/wire-versions-$USER.xml"else
wget --tries=3 "http://$WIRE_IP/?comp=versions" --timeout=5 --wait=5 -O "/tmp/wire-versions-$USER.xml"
else
http_get.py "http://168.63.129.16/?comp=versions" --timeout 5 --delay 5 --tries 3
fi
Expand Down
Loading