aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSteve McIntyre <steve.mcintyre@linaro.org>2015-07-27 18:29:37 +0100
committerSteve McIntyre <steve.mcintyre@linaro.org>2015-07-27 18:29:37 +0100
commitc442d08d42141a32a2e6f2cf98114f89b5c06ad9 (patch)
tree6f1df2d49f5b69b6b7c3e5cb25978a04704eb437 /test
parent5bfa91f3481e389930d393f6ca73283e58478b05 (diff)
Fix up test-1
Move over to the same style as the other tests, using $machine_PORT_ID to pick up the right definitions from test-common Change-Id: Idfdaa8eb6aaf2389d2542b848525d8e770f9d7c0
Diffstat (limited to 'test')
-rw-r--r--test/test-112
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test-1 b/test/test-1
index 4119f79..ea9d536 100644
--- a/test/test-1
+++ b/test/test-1
@@ -55,9 +55,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_SWITCH_PORT} $VLAN_ID
-run_admin_command --set_port_current_vlan ${arndale02_SWITCH_PORT} $VLAN_ID
-run_admin_command --set_port_current_vlan ${arndale03_SWITCH_PORT} $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
log "Done moving ports to VLAN ID $VLAN_ID"
# Wait 60s for everything to settle and logs to show it again
@@ -65,9 +65,9 @@ pause 60
# Move test machines back to their base VLANs
log "Moving ports back to base"
-run_admin_command --restore_port_to_base_vlan ${panda01_SWITCH_PORT}
-run_admin_command --restore_port_to_base_vlan ${arndale02_SWITCH_PORT}
-run_admin_command --restore_port_to_base_vlan ${arndale03_SWITCH_PORT}
+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}
log "Done moving ports back to base"
# Wait 10s for everything to settle