From f301f3b1345cc01cc0f1ff6c9a31ff06a4d79374 Mon Sep 17 00:00:00 2001 From: Steve McIntyre Date: Wed, 29 Jul 2015 18:30:52 +0100 Subject: Yet more cosmetic changes Rather than ignore the VLANd output, grab it and (optionally) log it. Change-Id: I0dae6f4148f95e85f867f6fd8cfacf1aad7f92ff --- test/complex-4switches-2vlans-1 | 36 ++++++++++++++++++++++++------------ test/medium-2switches-1vlan-1 | 18 ++++++++++++------ test/medium-3switches-1vlan-1 | 24 ++++++++++++++++-------- test/simple-CiscoCatalyst-1 | 18 ++++++++++++------ test/simple-CiscoSX300-1 | 18 ++++++++++++------ test/simple-CiscoSX300-2 | 18 ++++++++++++------ test/simple-NetgearXSM-1 | 18 ++++++++++++------ 7 files changed, 100 insertions(+), 50 deletions(-) (limited to 'test') diff --git a/test/complex-4switches-2vlans-1 b/test/complex-4switches-2vlans-1 index fbf4201..17acdb8 100644 --- a/test/complex-4switches-2vlans-1 +++ b/test/complex-4switches-2vlans-1 @@ -48,12 +48,14 @@ log "CHECK INIT END" # Create 2 VLANs: tag 30, named "test30" and tag 31, named "test31" log "Creating new VLAN tag 30" -IGNORE=$(run_admin_command --create_vlan test30 30 false) +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" -IGNORE=$(run_admin_command --create_vlan test31 31 false) +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" @@ -63,7 +65,8 @@ pause 10 # Move some of the test machines to these new VLANs, pausing at each # setup log "Moving imx5301 to VLAN ID $VLAN_ID1" -IGNORE=$(run_admin_command --set_port_current_vlan ${imx5301_PORT_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" @@ -71,7 +74,8 @@ pause 60 log "CHECK STEP1 END" log "Moving panda01 to VLAN ID $VLAN_ID1" -IGNORE=$(run_admin_command --set_port_current_vlan ${panda01_PORT_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" @@ -80,7 +84,8 @@ pause 60 log "CHECK STEP2 END" log "Moving arndale02 to VLAN ID $VLAN_ID2" -IGNORE=$(run_admin_command --set_port_current_vlan ${arndale02_PORT_ID} $VLAN_ID2) +OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale02_PORT_ID} $VLAN_IDlog "VLANd said $OUTPUT" +2) pause 60 log "CHECK STEP3 START" log "CHECK STEP3 CHECK VLAN_30:imx5301:panda01 VLAN_BASE:arndale03:imx5302:arndale01:panda02:panda03" @@ -88,7 +93,8 @@ pause 60 log "CHECK STEP3 END" log "Moving arndale03 to VLAN ID $VLAN_ID2" -IGNORE=$(run_admin_command --set_port_current_vlan ${arndale03_PORT_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" @@ -98,10 +104,14 @@ log "CHECK STEP4 END" # Move test machines back to their base VLANs log "Moving ports back to base" -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}) +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 @@ -117,8 +127,10 @@ log "Checking base VLANs after the test" verify_all_hosts_are_base log "Delete the test VLANs" -IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID1}) -IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID2}) +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 905c664..46e6f1b 100644 --- a/test/medium-2switches-1vlan-1 +++ b/test/medium-2switches-1vlan-1 @@ -47,7 +47,8 @@ log "CHECK INIT END" # Create a VLAN with tag 30, named "test30" log "Creating new VLAN tag 30" -IGNORE=$(run_admin_command --create_vlan test30 30 false) +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" @@ -56,7 +57,8 @@ pause 10 # Move some of the test machines to this new VLAN log "Moving imx5301 to VLAN ID $VLAN_ID" -IGNORE=$(run_admin_command --set_port_current_vlan ${imx5301_PORT_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" @@ -64,7 +66,8 @@ pause 60 log "CHECK STEP1 END" log "Moving panda01 to VLAN ID $VLAN_ID" -IGNORE=$(run_admin_command --set_port_current_vlan ${panda01_PORT_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 @@ -76,8 +79,10 @@ log "CHECK STEP2 END" # Move test machines back to their base VLANs log "Moving ports back to base" -IGNORE=$(run_admin_command --restore_port_to_base_vlan ${imx5301_PORT_ID}) -IGNORE=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID}) +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 @@ -93,7 +98,8 @@ log "Checking base VLANs after the test" verify_all_hosts_are_base log "Delete the test VLAN" -IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID}) +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 700a02d..37c2890 100644 --- a/test/medium-3switches-1vlan-1 +++ b/test/medium-3switches-1vlan-1 @@ -50,7 +50,8 @@ log "CHECK INIT END" # Create a VLAN with tag 30, named "test30" log "Creating new VLAN tag 30" -IGNORE=$(run_admin_command --create_vlan test30 30 false) +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" @@ -59,9 +60,12 @@ pause 10 # Move some of the test machines to this new VLAN log "Moving ports to VLAN 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) +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 @@ -74,9 +78,12 @@ log "CHECK STEP1 END" # Move test machines back to their base VLANs log "Moving ports back to base" -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}) +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 @@ -92,7 +99,8 @@ log "Checking base VLANs after the test" verify_all_hosts_are_base log "Delete the test VLAN" -IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID}) +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 2ba107c..68fe3da 100644 --- a/test/simple-CiscoCatalyst-1 +++ b/test/simple-CiscoCatalyst-1 @@ -43,7 +43,8 @@ log "CHECK INIT END" # Create a VLAN with tag 30, named "test30" log "Creating new VLAN tag 30" -IGNORE=$(run_admin_command --create_vlan test30 30 false) +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" @@ -52,12 +53,14 @@ pause 10 # Move some of the test machines to this new VLAN log "Moving arndale01 to VLAN ID $VLAN_ID" -IGNORE=$(run_admin_command --set_port_current_vlan ${arndale01_PORT_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" -IGNORE=$(run_admin_command --set_port_current_vlan ${panda01_PORT_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 @@ -70,8 +73,10 @@ log "CHECK STEP1 END" # Move test machines back to their base VLANs log "Moving ports back to base" -IGNORE=$(run_admin_command --restore_port_to_base_vlan ${arndale01_PORT_ID}) -IGNORE=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID}) +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 @@ -87,7 +92,8 @@ log "Checking base VLANs after the test" verify_all_hosts_are_base log "Delete the test VLAN" -IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID}) +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 ed11138..2e008d8 100644 --- a/test/simple-CiscoSX300-1 +++ b/test/simple-CiscoSX300-1 @@ -43,7 +43,8 @@ log "CHECK INIT END" # Create a VLAN with tag 30, named "test30" log "Creating new VLAN tag 30" -IGNORE=$(run_admin_command --create_vlan test30 30 false) +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" @@ -52,12 +53,14 @@ pause 10 # Move some of the test machines to this new VLAN log "Moving arndale02 to VLAN ID $VLAN_ID" -IGNORE=$(run_admin_command --set_port_current_vlan ${arndale02_PORT_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" -IGNORE=$(run_admin_command --set_port_current_vlan ${panda02_PORT_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 @@ -70,8 +73,10 @@ log "CHECK STEP1 END" # Move test machines back to their base VLANs log "Moving ports back to base" -IGNORE=$(run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID}) -IGNORE=$(run_admin_command --restore_port_to_base_vlan ${panda02_PORT_ID}) +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 @@ -87,7 +92,8 @@ log "Checking base VLANs after the test" verify_all_hosts_are_base log "Delete the test VLAN" -IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID}) +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 e5664a8..0993b66 100644 --- a/test/simple-CiscoSX300-2 +++ b/test/simple-CiscoSX300-2 @@ -43,7 +43,8 @@ log "CHECK INIT END" # Create a VLAN with tag 30, named "test30" log "Creating new VLAN tag 30" -IGNORE=$(run_admin_command --create_vlan test30 30 false) +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" @@ -52,12 +53,14 @@ pause 10 # Move some of the test machines to this new VLAN log "Moving arndale03 to VLAN ID $VLAN_ID" -IGNORE=$(run_admin_command --set_port_current_vlan ${arndale03_PORT_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" -IGNORE=$(run_admin_command --set_port_current_vlan ${panda03_PORT_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 @@ -70,8 +73,10 @@ log "CHECK STEP1 END" # Move test machines back to their base VLANs log "Moving ports back to base" -IGNORE=$(run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID}) -IGNORE=$(run_admin_command --restore_port_to_base_vlan ${panda03_PORT_ID}) +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 @@ -87,7 +92,8 @@ log "Checking base VLANs after the test" verify_all_hosts_are_base log "Delete the test VLAN" -IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID}) +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 2694e85..9f2304f 100644 --- a/test/simple-NetgearXSM-1 +++ b/test/simple-NetgearXSM-1 @@ -43,7 +43,8 @@ log "CHECK INIT END" # Create a VLAN with tag 30, named "test30" log "Creating new VLAN tag 30" -IGNORE=$(run_admin_command --create_vlan test30 30 false) +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" @@ -52,12 +53,14 @@ pause 10 # Move some of the test machines to this new VLAN log "Moving imx5301 to VLAN ID $VLAN_ID" -IGNORE=$(run_admin_command --set_port_current_vlan ${imx5301_PORT_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" -IGNORE=$(run_admin_command --set_port_current_vlan ${imx5302_PORT_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 @@ -70,8 +73,10 @@ log "CHECK STEP1 END" # Move test machines back to their base VLANs log "Moving ports back to base" -IGNORE=$(run_admin_command --restore_port_to_base_vlan ${imx5301_PORT_ID}) -IGNORE=$(run_admin_command --restore_port_to_base_vlan ${imx5302_PORT_ID}) +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 @@ -87,7 +92,8 @@ log "Checking base VLANs after the test" verify_all_hosts_are_base log "Delete the test VLAN" -IGNORE=$(run_admin_command --delete_vlan ${VLAN_ID}) +OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID}) +log "VLANd said $OUTPUT" # Stop all the test machines logging (and wait 60s) stop_logging -- cgit v1.2.3