More cosmetic changes to test output

 * Eat the output from any run_admin_command calls that weren't being
   used
 * Don't print the "full details" line by default

Change-Id: Ic5da2d9fb052fedf2574e7d4fa68f881ce7c8837

7 files changed, 57 insertions, 57 deletions

diff --git a/test/complex-4switches-2vlans-1 b/test/complex-4switches-2vlans-1
index 6c7d248..fbf4201 100644
--- a/test/complex-4switches-2vlans-1
+++ b/test/complex-4switches-2vlans-1
@@ -48,12 +48,12 @@ log "CHECK INIT END"
 
 # Create 2 VLANs: tag 30, named "test30" and tag 31, named "test31"
 log "Creating new VLAN tag 30"
-run_admin_command --create_vlan test30 30 false
+IGNORE=$(run_admin_command --create_vlan test30 30 false)
 VLAN_ID1=$(run_admin_command --lookup_vlan_by_tag 30)
 log "Created new VLAN with ID $VLAN_ID1"
 
 log "Creating new VLAN tag 31"
-run_admin_command --create_vlan test31 31 false
+IGNORE=$(run_admin_command --create_vlan test31 31 false)
 VLAN_ID2=$(run_admin_command --lookup_vlan_by_tag 31)
 log "Created new VLAN with ID $VLAN_ID2"
 
@@ -63,7 +63,7 @@ pause 10
 # Move some of the test machines to these new VLANs, pausing at each
 # setup
 log "Moving imx5301 to VLAN ID $VLAN_ID1"
-run_admin_command --set_port_current_vlan ${imx5301_PORT_ID} $VLAN_ID1
+IGNORE=$(run_admin_command --set_port_current_vlan ${imx5301_PORT_ID} $VLAN_ID1)
 pause 60
 log "CHECK STEP1 START"
 log "CHECK STEP1 CHECK VLAN_BASE:panda01:arndale02:arndale03:imx5302:arndale01:panda02:panda03"
@@ -71,7 +71,7 @@ pause 60
 log "CHECK STEP1 END"
 
 log "Moving panda01 to VLAN ID $VLAN_ID1"
-run_admin_command --set_port_current_vlan ${panda01_PORT_ID} $VLAN_ID1
+IGNORE=$(run_admin_command --set_port_current_vlan ${panda01_PORT_ID} $VLAN_ID1)
 log "Done moving ports to VLAN ID $VLAN_ID1"
 pause 60
 log "CHECK STEP2 START"
@@ -80,7 +80,7 @@ pause 60
 log "CHECK STEP2 END"
 
 log "Moving arndale02 to VLAN ID $VLAN_ID2"
-run_admin_command --set_port_current_vlan ${arndale02_PORT_ID} $VLAN_ID2
+IGNORE=$(run_admin_command --set_port_current_vlan ${arndale02_PORT_ID} $VLAN_ID2)
 pause 60
 log "CHECK STEP3 START"
 log "CHECK STEP3 CHECK VLAN_30:imx5301:panda01 VLAN_BASE:arndale03:imx5302:arndale01:panda02:panda03"
@@ -88,7 +88,7 @@ pause 60
 log "CHECK STEP3 END"
 
 log "Moving arndale03 to VLAN ID $VLAN_ID2"
-run_admin_command --set_port_current_vlan ${arndale03_PORT_ID} $VLAN_ID2
+IGNORE=$(run_admin_command --set_port_current_vlan ${arndale03_PORT_ID} $VLAN_ID2)
 log "Done moving ports to VLAN ID $VLAN_ID2"
 pause 60
 log "CHECK STEP4 START"
@@ -98,10 +98,10 @@ log "CHECK STEP4 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}
-run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID}
-run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID}
-run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID}
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${imx5301_PORT_ID})
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID})
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID})
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID})
 log "Done moving ports back to base"
 
 # Wait 60s for everything to settle
@@ -117,8 +117,8 @@ log "Checking base VLANs after the test"
 verify_all_hosts_are_base
 
 log "Delete the test VLANs"
-run_admin_command --delete_vlan ${VLAN_ID1}
-run_admin_command --delete_vlan ${VLAN_ID2}
+IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID1})
+IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID2})
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
@@ -134,6 +134,6 @@ clear_logs
 # How did the test do?
 check_test_steps
 
-echo "Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
+vecho "  Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
 
 # DONE!
diff --git a/test/medium-2switches-1vlan-1 b/test/medium-2switches-1vlan-1
index 1b8cd39..905c664 100644
--- a/test/medium-2switches-1vlan-1
+++ b/test/medium-2switches-1vlan-1
@@ -47,7 +47,7 @@ log "CHECK INIT END"
 
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
-run_admin_command --create_vlan test30 30 false
+IGNORE=$(run_admin_command --create_vlan test30 30 false)
 VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
@@ -56,7 +56,7 @@ 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
+IGNORE=$(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"
@@ -64,7 +64,7 @@ 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
+IGNORE=$(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
@@ -76,8 +76,8 @@ 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}
-run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID}
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${imx5301_PORT_ID})
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID})
 log "Done moving ports back to base"
 
 # Wait 60s for everything to settle
@@ -93,7 +93,7 @@ log "Checking base VLANs after the test"
 verify_all_hosts_are_base
 
 log "Delete the test VLAN"
-run_admin_command --delete_vlan ${VLAN_ID}
+IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID})
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
@@ -109,6 +109,6 @@ clear_logs
 # How did the test do?
 check_test_steps
 
-echo "Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
+vecho "  Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
 
 # DONE!
diff --git a/test/medium-3switches-1vlan-1 b/test/medium-3switches-1vlan-1
index 2eed93c..700a02d 100644
--- a/test/medium-3switches-1vlan-1
+++ b/test/medium-3switches-1vlan-1
@@ -50,7 +50,7 @@ log "CHECK INIT END"
 
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
-run_admin_command --create_vlan test30 30 false
+IGNORE=$(run_admin_command --create_vlan test30 30 false)
 VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
@@ -59,9 +59,9 @@ pause 10
 
 # Move some of the test machines to this new VLAN
 log "Moving ports to VLAN ID $VLAN_ID"
-run_admin_command --set_port_current_vlan ${panda01_PORT_ID} $VLAN_ID
-run_admin_command --set_port_current_vlan ${arndale02_PORT_ID} $VLAN_ID
-run_admin_command --set_port_current_vlan ${arndale03_PORT_ID} $VLAN_ID
+IGNORE=$(run_admin_command --set_port_current_vlan ${panda01_PORT_ID} $VLAN_ID)
+IGNORE=$(run_admin_command --set_port_current_vlan ${arndale02_PORT_ID} $VLAN_ID)
+IGNORE=$(run_admin_command --set_port_current_vlan ${arndale03_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
@@ -74,9 +74,9 @@ 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}
-run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID}
-run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID}
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID})
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID})
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID})
 log "Done moving ports back to base"
 
 # Wait 30s for everything to settle
@@ -92,7 +92,7 @@ log "Checking base VLANs after the test"
 verify_all_hosts_are_base
 
 log "Delete the test VLAN"
-run_admin_command --delete_vlan ${VLAN_ID}
+IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID})
 
 # Stop all the test machines logging (and wait 20s for things to
 # recover and get logged)
@@ -108,6 +108,6 @@ clear_logs
 # How did the test do?
 check_test_steps
 
-echo "Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
+vecho "  Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
 
 # DONE!
diff --git a/test/simple-CiscoCatalyst-1 b/test/simple-CiscoCatalyst-1
index 46b9837..2ba107c 100644
--- a/test/simple-CiscoCatalyst-1
+++ b/test/simple-CiscoCatalyst-1
@@ -43,7 +43,7 @@ log "CHECK INIT END"
 
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
-run_admin_command --create_vlan test30 30 false
+IGNORE=$(run_admin_command --create_vlan test30 30 false)
 VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
@@ -52,12 +52,12 @@ pause 10
 
 # Move some of the test machines to this new VLAN
 log "Moving arndale01 to VLAN ID $VLAN_ID"
-run_admin_command --set_port_current_vlan ${arndale01_PORT_ID} $VLAN_ID
+IGNORE=$(run_admin_command --set_port_current_vlan ${arndale01_PORT_ID} $VLAN_ID)
 
 pause 60
 
 log "Moving panda01 to VLAN ID $VLAN_ID"
-run_admin_command --set_port_current_vlan ${panda01_PORT_ID} $VLAN_ID
+IGNORE=$(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
@@ -70,8 +70,8 @@ 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}
-run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID}
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${arndale01_PORT_ID})
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID})
 log "Done moving ports back to base"
 
 # Wait 60s for everything to settle
@@ -87,7 +87,7 @@ log "Checking base VLANs after the test"
 verify_all_hosts_are_base
 
 log "Delete the test VLAN"
-run_admin_command --delete_vlan ${VLAN_ID}
+IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID})
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
@@ -103,6 +103,6 @@ clear_logs
 # How did the test do?
 check_test_steps
 
-echo "Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
+vecho "  Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
 
 # DONE!
diff --git a/test/simple-CiscoSX300-1 b/test/simple-CiscoSX300-1
index e75b9d1..ed11138 100644
--- a/test/simple-CiscoSX300-1
+++ b/test/simple-CiscoSX300-1
@@ -43,7 +43,7 @@ log "CHECK INIT END"
 
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
-run_admin_command --create_vlan test30 30 false
+IGNORE=$(run_admin_command --create_vlan test30 30 false)
 VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
@@ -52,12 +52,12 @@ pause 10
 
 # Move some of the test machines to this new VLAN
 log "Moving arndale02 to VLAN ID $VLAN_ID"
-run_admin_command --set_port_current_vlan ${arndale02_PORT_ID} $VLAN_ID
+IGNORE=$(run_admin_command --set_port_current_vlan ${arndale02_PORT_ID} $VLAN_ID)
 
 pause 60
 
 log "Moving panda02 to VLAN ID $VLAN_ID"
-run_admin_command --set_port_current_vlan ${panda02_PORT_ID} $VLAN_ID
+IGNORE=$(run_admin_command --set_port_current_vlan ${panda02_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
@@ -70,8 +70,8 @@ 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}
-run_admin_command --restore_port_to_base_vlan ${panda02_PORT_ID}
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID})
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${panda02_PORT_ID})
 log "Done moving ports back to base"
 
 # Wait 30s for everything to settle
@@ -87,7 +87,7 @@ log "Checking base VLANs after the test"
 verify_all_hosts_are_base
 
 log "Delete the test VLAN"
-run_admin_command --delete_vlan ${VLAN_ID}
+IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID})
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
@@ -103,6 +103,6 @@ clear_logs
 # How did the test do?
 check_test_steps
 
-echo "Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
+vecho "  Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
 
 # DONE!
diff --git a/test/simple-CiscoSX300-2 b/test/simple-CiscoSX300-2
index 93657f5..e5664a8 100644
--- a/test/simple-CiscoSX300-2
+++ b/test/simple-CiscoSX300-2
@@ -43,7 +43,7 @@ log "CHECK INIT END"
 
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
-run_admin_command --create_vlan test30 30 false
+IGNORE=$(run_admin_command --create_vlan test30 30 false)
 VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
@@ -52,12 +52,12 @@ pause 10
 
 # Move some of the test machines to this new VLAN
 log "Moving arndale03 to VLAN ID $VLAN_ID"
-run_admin_command --set_port_current_vlan ${arndale03_PORT_ID} $VLAN_ID
+IGNORE=$(run_admin_command --set_port_current_vlan ${arndale03_PORT_ID} $VLAN_ID)
 
 pause 60
 
 log "Moving panda03 to VLAN ID $VLAN_ID"
-run_admin_command --set_port_current_vlan ${panda03_PORT_ID} $VLAN_ID
+IGNORE=$(run_admin_command --set_port_current_vlan ${panda03_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
@@ -70,8 +70,8 @@ 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}
-run_admin_command --restore_port_to_base_vlan ${panda03_PORT_ID}
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID})
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${panda03_PORT_ID})
 log "Done moving ports back to base"
 
 # Wait 30s for everything to settle
@@ -87,7 +87,7 @@ log "Checking base VLANs after the test"
 verify_all_hosts_are_base
 
 log "Delete the test VLAN"
-run_admin_command --delete_vlan ${VLAN_ID}
+IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID})
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
@@ -103,6 +103,6 @@ clear_logs
 # How did the test do?
 check_test_steps
 
-echo "Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
+vecho "  Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
 
 # DONE!
diff --git a/test/simple-NetgearXSM-1 b/test/simple-NetgearXSM-1
index 299365b..2694e85 100644
--- a/test/simple-NetgearXSM-1
+++ b/test/simple-NetgearXSM-1
@@ -43,7 +43,7 @@ log "CHECK INIT END"
 
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
-run_admin_command --create_vlan test30 30 false
+IGNORE=$(run_admin_command --create_vlan test30 30 false)
 VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
@@ -52,12 +52,12 @@ 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
+IGNORE=$(run_admin_command --set_port_current_vlan ${imx5301_PORT_ID} $VLAN_ID)
 
 pause 60
 
 log "Moving imx5302 to VLAN ID $VLAN_ID"
-run_admin_command --set_port_current_vlan ${imx5302_PORT_ID} $VLAN_ID
+IGNORE=$(run_admin_command --set_port_current_vlan ${imx5302_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
@@ -70,8 +70,8 @@ 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}
-run_admin_command --restore_port_to_base_vlan ${imx5302_PORT_ID}
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${imx5301_PORT_ID})
+IGNORE=$(run_admin_command --restore_port_to_base_vlan ${imx5302_PORT_ID})
 log "Done moving ports back to base"
 
 # Wait 60s for everything to settle
@@ -87,7 +87,7 @@ log "Checking base VLANs after the test"
 verify_all_hosts_are_base
 
 log "Delete the test VLAN"
-run_admin_command --delete_vlan ${VLAN_ID}
+IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID})
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
@@ -103,6 +103,6 @@ clear_logs
 # How did the test do?
 check_test_steps
 
-echo "Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
+vecho "  Full details are in $LOGFILE, use \"sort -u $LOGFILE\" to read them in order."
 
 # DONE!