Add the new log-parsing setup into all the test scripts

Add the test area definitions.
Add the final call to check_test_steps.
Remove the "sort -u $LOGFILE", we don't need to see that detail any
more by default.

Change-Id: I2f1af95581aded65d8731c36f946abe9b88a6757

7 files changed, 97 insertions, 19 deletions

diff --git a/test/complex-4switches-2vlans-1 b/test/complex-4switches-2vlans-1
index 2644738..734a31f 100644
--- a/test/complex-4switches-2vlans-1
+++ b/test/complex-4switches-2vlans-1
@@ -130,9 +130,6 @@ grab_logs >> $LOGFILE
 # Clear old logs
 clear_logs
 
-# And now sort the logs so we have clean output
-sort -u $LOGFILE
-
 # How did the test do?
 check_test_steps
 
diff --git a/test/medium-2switches-1vlan-1 b/test/medium-2switches-1vlan-1
index 57a1b68..f9c023d 100644
--- a/test/medium-2switches-1vlan-1
+++ b/test/medium-2switches-1vlan-1
@@ -38,6 +38,10 @@ clear_logs
 # them show baseline results before we start testing
 start_logging
 pause 60
+log "CHECK INIT START"
+log "CHECK INIT CHECK VLAN_BASE:imx5301:panda01:imx5302:arndale01"
+pause 60
+log "CHECK INIT END"
 
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
@@ -51,16 +55,23 @@ pause 10
 # Move some of the test machines to this new VLAN
 log "Moving imx5301 to VLAN ID $VLAN_ID"
 run_admin_command --set_port_current_vlan ${imx5301_PORT_ID} $VLAN_ID
-
 pause 60
+log "CHECK STEP1 START"
+log "CHECK STEP1 CHECK VLAN_BASE:panda01:imx5302:arndale01"
+pause 60
+log "CHECK STEP1 END"
 
 log "Moving panda01 to VLAN ID $VLAN_ID"
 run_admin_command --set_port_current_vlan ${panda01_PORT_ID} $VLAN_ID
 log "Done moving ports to VLAN ID $VLAN_ID"
-
 # Wait 60s for everything to settle and logs to show it again
 pause 60
 
+log "CHECK STEP2 START"
+log "CHECK STEP2 CHECK VLAN_30:imx5301:panda01 VLAN_BASE:imx5302:arndale01"
+pause 60
+log "CHECK STEP2 END"
+
 # Move test machines back to their base VLANs
 log "Moving ports back to base"
 run_admin_command --restore_port_to_base_vlan ${imx5301_PORT_ID}
@@ -70,6 +81,11 @@ log "Done moving ports back to base"
 # Wait 60s for everything to settle
 pause 60
 
+log "CHECK FINI START"
+log "CHECK FINI CHECK VLAN_BASE:imx5301:panda01:imx5302:arndale01"
+pause 60
+log "CHECK FINI END"
+
 # Check that they're all back on their base VLANs
 log "Checking base VLANs after the test"
 verify_all_hosts_are_base
@@ -88,8 +104,8 @@ grab_logs >> $LOGFILE
 # Clear old logs
 clear_logs
 
-# And now sort the logs so we have clean output
-sort -u $LOGFILE
+# How did the test do?
+check_test_steps
 
 echo "Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
 
diff --git a/test/medium-3switches-1vlan-1 b/test/medium-3switches-1vlan-1
index 0aa1de0..7b683e8 100644
--- a/test/medium-3switches-1vlan-1
+++ b/test/medium-3switches-1vlan-1
@@ -42,7 +42,10 @@ clear_logs
 # Start all the test machines logging, then wait 60s to let all of
 # them show baseline results before we start testing
 start_logging
+log "CHECK INIT START"
+log "CHECK INIT CHECK VLAN_BASE:panda01:arndale02:arndale03:imx5302"
 pause 60
+log "CHECK INIT END"
 
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
@@ -63,6 +66,11 @@ log "Done moving ports to VLAN ID $VLAN_ID"
 # Wait 60s for everything to settle and logs to show it again
 pause 60
 
+log "CHECK STEP1 START"
+log "CHECK STEP1 CHECK VLAN_30:panda01:arndale02:arndale03"
+pause 60
+log "CHECK STEP1 END"
+
 # Move test machines back to their base VLANs
 log "Moving ports back to base"
 run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID}
@@ -70,8 +78,13 @@ run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID}
 run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID}
 log "Done moving ports back to base"
 
-# Wait 10s for everything to settle
-pause 10
+# Wait 30s for everything to settle
+pause 30
+
+log "CHECK FINI START"
+log "CHECK FINI CHECK VLAN_BASE:panda01:arndale02:arndale03:imx5302"
+pause 60
+log "CHECK FINI END"
 
 # Check that they're all back on their base VLANs
 log "Checking base VLANs after the test"
@@ -91,8 +104,8 @@ grab_logs >> $LOGFILE
 # Clear old logs
 clear_logs
 
-# And now sort the logs so we have clean output
-sort -u $LOGFILE
+# How did the test do?
+check_test_steps
 
 echo "Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
 
diff --git a/test/simple-CiscoCatalyst-1 b/test/simple-CiscoCatalyst-1
index 0803174..9a5bbc3 100644
--- a/test/simple-CiscoCatalyst-1
+++ b/test/simple-CiscoCatalyst-1
@@ -34,7 +34,10 @@ clear_logs
 # Start all the test machines logging, then wait 60s to let all of
 # them show baseline results before we start testing
 start_logging
+log "CHECK INIT START"
+log "CHECK INIT CHECK VLAN_BASE:arndale01:panda01"
 pause 60
+log "CHECK INIT END"
 
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
@@ -58,6 +61,11 @@ log "Done moving ports to VLAN ID $VLAN_ID"
 # Wait 60s for everything to settle and logs to show it again
 pause 60
 
+log "CHECK STEP1 START"
+log "CHECK STEP1 CHECK VLAN_30:arndale01:panda01"
+pause 60
+log "CHECK STEP1 END"
+
 # Move test machines back to their base VLANs
 log "Moving ports back to base"
 run_admin_command --restore_port_to_base_vlan ${arndale01_PORT_ID}
@@ -67,6 +75,11 @@ log "Done moving ports back to base"
 # Wait 60s for everything to settle
 pause 60
 
+log "CHECK FINI START"
+log "CHECK FINI CHECK VLAN_BASE:arndale01:panda01"
+pause 60
+log "CHECK FINI END"
+
 # Check that they're all back on their base VLANs
 log "Checking base VLANs after the test"
 verify_all_hosts_are_base
@@ -85,8 +98,8 @@ grab_logs >> $LOGFILE
 # Clear old logs
 clear_logs
 
-# And now sort the logs so we have clean output
-sort -u $LOGFILE
+# How did the test do?
+check_test_steps
 
 echo "Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
 
diff --git a/test/simple-CiscoSX300-1 b/test/simple-CiscoSX300-1
index 57378ac..fc1eeb8 100644
--- a/test/simple-CiscoSX300-1
+++ b/test/simple-CiscoSX300-1
@@ -34,7 +34,10 @@ clear_logs
 # Start all the test machines logging, then wait 60s to let all of
 # them show baseline results before we start testing
 start_logging
+log "CHECK INIT START"
+log "CHECK INIT CHECK VLAN_BASE:arndale02:panda02"
 pause 60
+log "CHECK INIT END"
 
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
@@ -58,6 +61,11 @@ log "Done moving ports to VLAN ID $VLAN_ID"
 # Wait 60s for everything to settle and logs to show it again
 pause 60
 
+log "CHECK STEP1 START"
+log "CHECK STEP1 CHECK VLAN_30:arndale02:panda02"
+pause 60
+log "CHECK STEP1 END"
+
 # Move test machines back to their base VLANs
 log "Moving ports back to base"
 run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID}
@@ -67,6 +75,11 @@ log "Done moving ports back to base"
 # Wait 30s for everything to settle
 pause 30
 
+log "CHECK FINI START"
+log "CHECK FINI CHECK VLAN_BASE:arndale02:panda02"
+pause 60
+log "CHECK FINI END"
+
 # Check that they're all back on their base VLANs
 log "Checking base VLANs after the test"
 verify_all_hosts_are_base
@@ -85,8 +98,8 @@ grab_logs >> $LOGFILE
 # Clear old logs
 clear_logs
 
-# And now sort the logs so we have clean output
-sort -u $LOGFILE
+# How did the test do?
+check_test_steps
 
 echo "Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
 
diff --git a/test/simple-CiscoSX300-2 b/test/simple-CiscoSX300-2
index a513993..34eedcc 100644
--- a/test/simple-CiscoSX300-2
+++ b/test/simple-CiscoSX300-2
@@ -34,7 +34,10 @@ clear_logs
 # Start all the test machines logging, then wait 60s to let all of
 # them show baseline results before we start testing
 start_logging
+log "CHECK INIT START"
+log "CHECK INIT CHECK VLAN_BASE:arndale03:panda03"
 pause 60
+log "CHECK INIT END"
 
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
@@ -58,6 +61,11 @@ log "Done moving ports to VLAN ID $VLAN_ID"
 # Wait 60s for everything to settle and logs to show it again
 pause 60
 
+log "CHECK STEP1 START"
+log "CHECK STEP1 CHECK VLAN_30:arndale03:panda03"
+pause 60
+log "CHECK STEP1 END"
+
 # Move test machines back to their base VLANs
 log "Moving ports back to base"
 run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID}
@@ -67,6 +75,11 @@ log "Done moving ports back to base"
 # Wait 30s for everything to settle
 pause 30
 
+log "CHECK FINI START"
+log "CHECK FINI CHECK VLAN_BASE:arndale03:panda03"
+pause 60
+log "CHECK FINI END"
+
 # Check that they're all back on their base VLANs
 log "Checking base VLANs after the test"
 verify_all_hosts_are_base
@@ -85,8 +98,8 @@ grab_logs >> $LOGFILE
 # Clear old logs
 clear_logs
 
-# And now sort the logs so we have clean output
-sort -u $LOGFILE
+# How did the test do?
+check_test_steps
 
 echo "Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
 
diff --git a/test/simple-NetgearXSM-1 b/test/simple-NetgearXSM-1
index 98ea9df..0f31100 100644
--- a/test/simple-NetgearXSM-1
+++ b/test/simple-NetgearXSM-1
@@ -34,7 +34,10 @@ clear_logs
 # Start all the test machines logging, then wait 60s to let all of
 # them show baseline results before we start testing
 start_logging
+log "CHECK INIT START"
+log "CHECK INIT CHECK VLAN_BASE:imx5301:imx5302"
 pause 60
+log "CHECK INIT END"
 
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
@@ -58,6 +61,11 @@ log "Done moving ports to VLAN ID $VLAN_ID"
 # Wait 60s for everything to settle and logs to show it again
 pause 60
 
+log "CHECK STEP1 START"
+log "CHECK STEP1 CHECK VLAN_BASE:imx5301:imx5302"
+pause 60
+log "CHECK STEP1 END"
+
 # Move test machines back to their base VLANs
 log "Moving ports back to base"
 run_admin_command --restore_port_to_base_vlan ${imx5301_PORT_ID}
@@ -67,6 +75,11 @@ log "Done moving ports back to base"
 # Wait 60s for everything to settle
 pause 60
 
+log "CHECK FINI START"
+log "CHECK FINI CHECK VLAN_BASE:imx5301:imx5302"
+pause 60
+log "CHECK FINI END"
+
 # Check that they're all back on their base VLANs
 log "Checking base VLANs after the test"
 verify_all_hosts_are_base
@@ -85,8 +98,8 @@ grab_logs >> $LOGFILE
 # Clear old logs
 clear_logs
 
-# And now sort the logs so we have clean output
-sort -u $LOGFILE
+# How did the test do?
+check_test_steps
 
 echo "Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."