Remove redundant "VLANd said" logging

Change-Id: I9788d3f316ba4000ef61c5e778b2618ed7763478

7 files changed, 0 insertions, 51 deletions

diff --git a/test/complex-4switches-2vlans-1 b/test/complex-4switches-2vlans-1
index 2f1abab..224a48b 100644
--- a/test/complex-4switches-2vlans-1
+++ b/test/complex-4switches-2vlans-1
@@ -49,13 +49,10 @@ log "CHECK INIT END"
 # Create 2 VLANs: tag 30, named "test30" and tag 31, named "test31"
 log "Creating new VLAN tag 30"
 OUTPUT=$(run_admin_command --create_vlan test30 30 false)
-log "VLANd said \"$OUTPUT\""
 VLAN_ID1=$(run_admin_command --lookup_vlan_by_tag 30)
-log "Created new VLAN with ID $VLAN_ID1"
 
 log "Creating new VLAN tag 31"
 OUTPUT=$(run_admin_command --create_vlan test31 31 false)
-log "VLANd said \"$OUTPUT\""
 VLAN_ID2=$(run_admin_command --lookup_vlan_by_tag 31)
 log "Created new VLAN with ID $VLAN_ID2"
 
@@ -66,7 +63,6 @@ pause 10
 # setup
 log "Moving imx5301 to VLAN ID $VLAN_ID1"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${imx5301_PORT_ID} $VLAN_ID1)
-log "VLANd said \"$OUTPUT\""
 pause 60
 log "CHECK STEP1 START"
 log "CHECK STEP1 CHECK VLAN_BASE:panda01:arndale02:arndale03:imx5302:arndale01:panda02:panda03"
@@ -75,7 +71,6 @@ log "CHECK STEP1 END"
 
 log "Moving panda01 to VLAN ID $VLAN_ID1"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${panda01_PORT_ID} $VLAN_ID1)
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports to VLAN ID $VLAN_ID1"
 pause 60
 log "CHECK STEP2 START"
@@ -85,7 +80,6 @@ log "CHECK STEP2 END"
 
 log "Moving arndale02 to VLAN ID $VLAN_ID2"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale02_PORT_ID} $VLAN_ID2)
-log "VLANd said \"$OUTPUT\""
 pause 60
 log "CHECK STEP3 START"
 log "CHECK STEP3 CHECK VLAN_30:imx5301:panda01 VLAN_BASE:arndale03:imx5302:arndale01:panda02:panda03"
@@ -94,7 +88,6 @@ log "CHECK STEP3 END"
 
 log "Moving arndale03 to VLAN ID $VLAN_ID2"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale03_PORT_ID} $VLAN_ID2)
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports to VLAN ID $VLAN_ID2"
 pause 60
 log "CHECK STEP4 START"
@@ -105,13 +98,9 @@ log "CHECK STEP4 END"
 # Move test machines back to their base VLANs
 log "Moving ports back to base"
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${imx5301_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports back to base"
 
 # Wait 60s for everything to settle
@@ -128,9 +117,7 @@ verify_all_hosts_are_base
 
 log "Delete the test VLANs"
 OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID1})
-log "VLANd said \"$OUTPUT\""
 OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID2})
-log "VLANd said \"$OUTPUT\""
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
diff --git a/test/medium-2switches-1vlan-1 b/test/medium-2switches-1vlan-1
index 199d512..5ccec14 100644
--- a/test/medium-2switches-1vlan-1
+++ b/test/medium-2switches-1vlan-1
@@ -48,7 +48,6 @@ log "CHECK INIT END"
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
 OUTPUT=$(run_admin_command --create_vlan test30 30 false)
-log "VLANd said \"$OUTPUT\""
 VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
@@ -58,7 +57,6 @@ pause 10
 # Move some of the test machines to this new VLAN
 log "Moving imx5301 to VLAN ID $VLAN_ID"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${imx5301_PORT_ID} $VLAN_ID)
-log "VLANd said \"$OUTPUT\""
 pause 60
 log "CHECK STEP1 START"
 log "CHECK STEP1 CHECK VLAN_BASE:panda01:imx5302:arndale01"
@@ -67,7 +65,6 @@ log "CHECK STEP1 END"
 
 log "Moving panda01 to VLAN ID $VLAN_ID"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${panda01_PORT_ID} $VLAN_ID)
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports to VLAN ID $VLAN_ID"
 # Wait 60s for everything to settle and logs to show it again
 pause 60
@@ -80,9 +77,7 @@ log "CHECK STEP2 END"
 # Move test machines back to their base VLANs
 log "Moving ports back to base"
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${imx5301_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports back to base"
 
 # Wait 60s for everything to settle
@@ -99,7 +94,6 @@ verify_all_hosts_are_base
 
 log "Delete the test VLAN"
 OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
-log "VLANd said \"$OUTPUT\""
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
diff --git a/test/medium-3switches-1vlan-1 b/test/medium-3switches-1vlan-1
index 1c626bd..2010bbd 100644
--- a/test/medium-3switches-1vlan-1
+++ b/test/medium-3switches-1vlan-1
@@ -51,7 +51,6 @@ log "CHECK INIT END"
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
 OUTPUT=$(run_admin_command --create_vlan test30 30 false)
-log "VLANd said \"$OUTPUT\""
 VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
@@ -61,11 +60,8 @@ pause 10
 # Move some of the test machines to this new VLAN
 log "Moving ports to VLAN ID $VLAN_ID"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${panda01_PORT_ID} $VLAN_ID)
-log "VLANd said \"$OUTPUT\""
 OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale02_PORT_ID} $VLAN_ID)
-log "VLANd said \"$OUTPUT\""
 OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale03_PORT_ID} $VLAN_ID)
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports to VLAN ID $VLAN_ID"
 
 # Wait 60s for everything to settle and logs to show it again
@@ -79,11 +75,8 @@ log "CHECK STEP1 END"
 # Move test machines back to their base VLANs
 log "Moving ports back to base"
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports back to base"
 
 # Wait 30s for everything to settle
@@ -100,7 +93,6 @@ verify_all_hosts_are_base
 
 log "Delete the test VLAN"
 OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
-log "VLANd said \"$OUTPUT\""
 
 # Stop all the test machines logging (and wait 20s for things to
 # recover and get logged)
diff --git a/test/simple-CiscoCatalyst-1 b/test/simple-CiscoCatalyst-1
index b3617a7..e94e5e4 100644
--- a/test/simple-CiscoCatalyst-1
+++ b/test/simple-CiscoCatalyst-1
@@ -44,7 +44,6 @@ log "CHECK INIT END"
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
 OUTPUT=$(run_admin_command --create_vlan test30 30 false)
-log "VLANd said \"$OUTPUT\""
 VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
@@ -54,13 +53,11 @@ pause 10
 # Move some of the test machines to this new VLAN
 log "Moving arndale01 to VLAN ID $VLAN_ID"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale01_PORT_ID} $VLAN_ID)
-log "VLANd said \"$OUTPUT\""
 
 pause 60
 
 log "Moving panda01 to VLAN ID $VLAN_ID"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${panda01_PORT_ID} $VLAN_ID)
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports to VLAN ID $VLAN_ID"
 
 # Wait 60s for everything to settle and logs to show it again
@@ -74,9 +71,7 @@ log "CHECK STEP1 END"
 # Move test machines back to their base VLANs
 log "Moving ports back to base"
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale01_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports back to base"
 
 # Wait 60s for everything to settle
@@ -93,7 +88,6 @@ verify_all_hosts_are_base
 
 log "Delete the test VLAN"
 OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
-log "VLANd said \"$OUTPUT\""
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
diff --git a/test/simple-CiscoSX300-1 b/test/simple-CiscoSX300-1
index 700e311..9da4b7c 100644
--- a/test/simple-CiscoSX300-1
+++ b/test/simple-CiscoSX300-1
@@ -44,7 +44,6 @@ log "CHECK INIT END"
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
 OUTPUT=$(run_admin_command --create_vlan test30 30 false)
-log "VLANd said \"$OUTPUT\""
 VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
@@ -54,13 +53,11 @@ pause 10
 # Move some of the test machines to this new VLAN
 log "Moving arndale02 to VLAN ID $VLAN_ID"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale02_PORT_ID} $VLAN_ID)
-log "VLANd said \"$OUTPUT\""
 
 pause 60
 
 log "Moving panda02 to VLAN ID $VLAN_ID"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${panda02_PORT_ID} $VLAN_ID)
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports to VLAN ID $VLAN_ID"
 
 # Wait 60s for everything to settle and logs to show it again
@@ -74,9 +71,7 @@ log "CHECK STEP1 END"
 # Move test machines back to their base VLANs
 log "Moving ports back to base"
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda02_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports back to base"
 
 # Wait 30s for everything to settle
@@ -93,7 +88,6 @@ verify_all_hosts_are_base
 
 log "Delete the test VLAN"
 OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
-log "VLANd said \"$OUTPUT\""
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
diff --git a/test/simple-CiscoSX300-2 b/test/simple-CiscoSX300-2
index 50487b3..523f98f 100644
--- a/test/simple-CiscoSX300-2
+++ b/test/simple-CiscoSX300-2
@@ -44,7 +44,6 @@ log "CHECK INIT END"
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
 OUTPUT=$(run_admin_command --create_vlan test30 30 false)
-log "VLANd said \"$OUTPUT\""
 VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
@@ -54,13 +53,11 @@ pause 10
 # Move some of the test machines to this new VLAN
 log "Moving arndale03 to VLAN ID $VLAN_ID"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale03_PORT_ID} $VLAN_ID)
-log "VLANd said \"$OUTPUT\""
 
 pause 60
 
 log "Moving panda03 to VLAN ID $VLAN_ID"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${panda03_PORT_ID} $VLAN_ID)
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports to VLAN ID $VLAN_ID"
 
 # Wait 60s for everything to settle and logs to show it again
@@ -74,9 +71,7 @@ log "CHECK STEP1 END"
 # Move test machines back to their base VLANs
 log "Moving ports back to base"
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda03_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports back to base"
 
 # Wait 30s for everything to settle
@@ -93,7 +88,6 @@ verify_all_hosts_are_base
 
 log "Delete the test VLAN"
 OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
-log "VLANd said \"$OUTPUT\""
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
diff --git a/test/simple-NetgearXSM-1 b/test/simple-NetgearXSM-1
index 494f235..05450b5 100644
--- a/test/simple-NetgearXSM-1
+++ b/test/simple-NetgearXSM-1
@@ -44,7 +44,6 @@ log "CHECK INIT END"
 # Create a VLAN with tag 30, named "test30"
 log "Creating new VLAN tag 30"
 OUTPUT=$(run_admin_command --create_vlan test30 30 false)
-log "VLANd said \"$OUTPUT\""
 VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
@@ -54,13 +53,11 @@ pause 10
 # Move some of the test machines to this new VLAN
 log "Moving imx5301 to VLAN ID $VLAN_ID"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${imx5301_PORT_ID} $VLAN_ID)
-log "VLANd said \"$OUTPUT\""
 
 pause 60
 
 log "Moving imx5302 to VLAN ID $VLAN_ID"
 OUTPUT=$(run_admin_command --set_port_current_vlan ${imx5302_PORT_ID} $VLAN_ID)
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports to VLAN ID $VLAN_ID"
 
 # Wait 60s for everything to settle and logs to show it again
@@ -74,9 +71,7 @@ log "CHECK STEP1 END"
 # Move test machines back to their base VLANs
 log "Moving ports back to base"
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${imx5301_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${imx5302_PORT_ID})
-log "VLANd said \"$OUTPUT\""
 log "Done moving ports back to base"
 
 # Wait 60s for everything to settle
@@ -93,7 +88,6 @@ verify_all_hosts_are_base
 
 log "Delete the test VLAN"
 OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
-log "VLANd said \"$OUTPUT\""
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging