Replacing terms that are considered to be non inclusive (#353)

faucetsdn · Feb 17, 2022 · 31bbe4e · 31bbe4e
1 parent a8ecc2a
commit 31bbe4e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/bin/setup_stack b/bin/setup_stack
@@ -267,7 +267,7 @@ if [ -z "$skip_conn_check" ]; then
     echo Waiting for warm-ups to complete...
     wait
 
-    echo Connection sanity check...
+    echo Connection readiness check...
     docker exec forch-faux-0 ping -q -c 1 $ip_faux_2
     docker exec forch-faux-1 ping -q -c 1 $ip_faux_3
     docker exec forch-faux-2 ping -q -c 1 $ip_faux_1

diff --git a/bin/stack_functions b/bin/stack_functions
@@ -309,7 +309,7 @@ function test_stack {
     pcount52=$(tcpdump -en -r $t2sw1p52_pcap vlan | wc -l) 2>/dev/null
     pcount_total=$((pcount50 + pcount52))
     echo $desc pcap count is $pcount6a $pcound6i $pcount50 $pcount52 $pcount_total
-    echo pcap sane $((pcount6a > 10)) $((pcount6i > 10)) $((pcount6a < 180)) \
+    echo pcap valid $((pcount6a > 10)) $((pcount6i > 10)) $((pcount6a < 180)) \
          $((pcount_total > 80)) $((pcount_total < 160)) | tee -a $TEST_RESULTS
 
     bcount1e=$(tcpdump -en -r $t1sw1p28_pcap ether broadcast| wc -l) 2>/dev/null

diff --git a/etc/test_stack.out b/etc/test_stack.out
@@ -10,7 +10,7 @@ faucet_config_warning_count 1
 Starting stack-solid test...
 (UNKNOWN) [192.168.1.1] 23 (telnet) : Connection timed out
 (UNKNOWN) [192.168.1.1] 443 (https) : Connection refused
-pcap sane 1 0 1 1 1
+pcap valid 1 0 1 1 1
 pcap bcast 1 0 1 1
 telnet 1 https 2
 forch-faux-0: ping -c 10 192.168.1.1 10
@@ -128,7 +128,7 @@ process_state{process="sleep"} 0
 Starting stack-linkd test...
 (UNKNOWN) [192.168.1.1] 23 (telnet) : Connection timed out
 (UNKNOWN) [192.168.1.1] 443 (https) : Connection refused
-pcap sane 1 1 1 1 1
+pcap valid 1 1 1 1 1
 pcap bcast 1 0 1 1
 telnet 1 https 2
 forch-faux-0: ping -c 10 192.168.1.1 10
@@ -150,7 +150,7 @@ port_lacp_state{dp_id="0xb2",dp_name="nz-kiwi-t1sw2",port="28",port_description=
 Starting stack-twod test...
 (UNKNOWN) [192.168.1.1] 23 (telnet) : Connection timed out
 (UNKNOWN) [192.168.1.1] 443 (https) : Connection refused
-pcap sane 1 1 1 1 1
+pcap valid 1 1 1 1 1
 pcap bcast 1 0 1 1
 telnet 1 https 2
 forch-faux-0: ping -c 10 192.168.1.1 10
@@ -219,7 +219,7 @@ null
 Starting stack-broken test...
 (UNKNOWN) [192.168.1.1] 23 (telnet) : Connection timed out
 (UNKNOWN) [192.168.1.1] 443 (https) : Connection timed out
-pcap sane 0 0 1 1 1
+pcap valid 0 0 1 1 1
 pcap bcast 1 0 1 1
 telnet 0 https 0
 forch-faux-0: ping -c 10 192.168.1.1 0
@@ -285,7 +285,7 @@ null
 Starting stack-restored test...
 (UNKNOWN) [192.168.1.1] 23 (telnet) : Connection timed out
 (UNKNOWN) [192.168.1.1] 443 (https) : Connection refused
-pcap sane 1 1 1 1 1
+pcap valid 1 1 1 1 1
 pcap bcast 1 0 1 1
 telnet 1 https 2
 forch-faux-0: ping -c 10 192.168.1.1 10
@@ -351,7 +351,7 @@ null
 Starting stack-orphaned test...
 (UNKNOWN) [192.168.1.1] 23 (telnet) : Connection timed out
 (UNKNOWN) [192.168.1.1] 443 (https) : Connection refused
-pcap sane 0 0 1 1 1
+pcap valid 0 0 1 1 1
 pcap bcast -1 1 1 1
 telnet 1 https 2
 forch-faux-0: ping -c 10 192.168.1.1 10