Change test harness scripts to match the new admin.py interfaces

Change-Id: Iaf94de537f02186aee00b870c78828c0feae9038

11 files changed, 118 insertions, 118 deletions

diff --git a/test/complex-4switches-2vlans-1 b/test/complex-4switches-2vlans-1
index b529f07..1a232c1 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"
-OUTPUT=$(run_admin_command --create_vlan test30 30 false)
-VLAN_ID1=$(run_admin_command --lookup_vlan_by_tag 30)
+OUTPUT=$(run_admin_command create_vlan --name test30 --tag 30 --is_base_vlan false)
+VLAN_ID1=$(run_admin_command lookup_vlan_by_tag --tag 30)
 
 log "Creating new VLAN tag 31"
-OUTPUT=$(run_admin_command --create_vlan test31 31 false)
-VLAN_ID2=$(run_admin_command --lookup_vlan_by_tag 31)
+OUTPUT=$(run_admin_command create_vlan --name test31 --tag 31 --is_base_vlan false)
+VLAN_ID2=$(run_admin_command lookup_vlan_by_tag --tag 31)
 log "Created new VLANs with IDs $VLAN_ID1 and $VLAN_ID2"
 
 # Wait 10s for everything to settle
@@ -62,7 +62,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"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${imx5301_PORT_ID} $VLAN_ID1)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${imx5301_PORT_ID} --vlan_id $VLAN_ID1)
 pause 60
 log "CHECK STEP1 START"
 log "CHECK STEP1 CHECK VLAN_BASE:panda01:arndale02:arndale03:imx5302:arndale01:panda02:panda03"
@@ -70,7 +70,7 @@ pause 60
 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)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${panda01_PORT_ID} --vlan_id $VLAN_ID1)
 log "Done moving ports to VLAN ID $VLAN_ID1"
 pause 60
 log "CHECK STEP2 START"
@@ -79,7 +79,7 @@ pause 60
 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)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${arndale02_PORT_ID} --vlan_id $VLAN_ID2)
 pause 60
 log "CHECK STEP3 START"
 log "CHECK STEP3 CHECK VLAN_30:imx5301:panda01 VLAN_BASE:arndale03:imx5302:arndale01:panda02:panda03"
@@ -87,7 +87,7 @@ pause 60
 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)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${arndale03_PORT_ID} --vlan_id $VLAN_ID2)
 log "Done moving ports to VLAN ID $VLAN_ID2"
 pause 60
 log "CHECK STEP4 START"
@@ -97,10 +97,10 @@ 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})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${imx5301_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${panda01_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${arndale02_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${arndale03_PORT_ID})
 log "Done moving ports back to base"
 
 # Wait 60s for everything to settle
@@ -116,8 +116,8 @@ log "Checking base VLANs after the test"
 verify_all_hosts_are_base
 
 log "Delete the test VLANs"
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID1})
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID2})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID1})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID2})
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
diff --git a/test/complex-5switches-5vlans-1 b/test/complex-5switches-5vlans-1
index cdb0a37..1390ab6 100644
--- a/test/complex-5switches-5vlans-1
+++ b/test/complex-5switches-5vlans-1
@@ -46,20 +46,20 @@ 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)
-VLAN_ID1=$(run_admin_command --lookup_vlan_by_tag 30)
+OUTPUT=$(run_admin_command create_vlan --name test30 --tag 30 --is_base_vlan false)
+VLAN_ID1=$(run_admin_command lookup_vlan_by_tag --tag 30)
 log "Creating new VLAN tag 31"
-OUTPUT=$(run_admin_command --create_vlan test31 31 false)
-VLAN_ID2=$(run_admin_command --lookup_vlan_by_tag 31)
+OUTPUT=$(run_admin_command create_vlan --name test31 --tag 31 --is_base_vlan false)
+VLAN_ID2=$(run_admin_command lookup_vlan_by_tag --tag 31)
 log "Creating new VLAN tag 32"
-OUTPUT=$(run_admin_command --create_vlan test32 32 false)
-VLAN_ID3=$(run_admin_command --lookup_vlan_by_tag 32)
+OUTPUT=$(run_admin_command create_vlan --name test32 --tag 32 --is_base_vlan false)
+VLAN_ID3=$(run_admin_command lookup_vlan_by_tag --tag 32)
 log "Creating new VLAN tag 33"
-OUTPUT=$(run_admin_command --create_vlan test33 33 false)
-VLAN_ID4=$(run_admin_command --lookup_vlan_by_tag 33)
+OUTPUT=$(run_admin_command create_vlan --name test33 --tag 33 --is_base_vlan false)
+VLAN_ID4=$(run_admin_command lookup_vlan_by_tag --tag 33)
 log "Creating new VLAN tag 34"
-OUTPUT=$(run_admin_command --create_vlan test34 34 false)
-VLAN_ID5=$(run_admin_command --lookup_vlan_by_tag 34)
+OUTPUT=$(run_admin_command create_vlan --name test34 --tag 34 --is_base_vlan false)
+VLAN_ID5=$(run_admin_command lookup_vlan_by_tag --tag 34)
 
 log "Created new VLANs with IDs $VLAN_ID1, $VLAN_ID2, $VLAN_ID3, $VLAN_ID4 and $VLAN_ID5"
 
@@ -69,9 +69,9 @@ pause 10
 # Move some of the test machines to these new VLANs, pausing at each
 # setup
 log "Moving panda01 to VLAN ID $VLAN_ID1"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${panda01_PORT_ID} $VLAN_ID1)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${panda01_PORT_ID} --vlan_id $VLAN_ID1)
 log "Moving panda02 to VLAN ID $VLAN_ID1"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${panda02_PORT_ID} $VLAN_ID1)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${panda02_PORT_ID} --vlan_id $VLAN_ID1)
 log "Done moving ports to VLAN ID $VLAN_ID1"
 pause 60
 log "CHECK STEP1 START"
@@ -81,9 +81,9 @@ pause 60
 log "CHECK STEP1 END"
 
 log "Moving panda03 to VLAN ID $VLAN_ID2"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${panda03_PORT_ID} $VLAN_ID2)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${panda03_PORT_ID} --vlan_id $VLAN_ID2)
 log "Moving imx5303 to VLAN ID $VLAN_ID2"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${imx5303_PORT_ID} $VLAN_ID2)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${imx5303_PORT_ID} --vlan_id $VLAN_ID2)
 log "Done moving ports to VLAN ID $VLAN_ID2"
 pause 60
 log "CHECK STEP2 START"
@@ -94,9 +94,9 @@ pause 60
 log "CHECK STEP2 END"
 
 log "Moving imx5301 to VLAN ID $VLAN_ID3"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${imx5301_PORT_ID} $VLAN_ID3)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${imx5301_PORT_ID} --vlan_id $VLAN_ID3)
 log "Moving arndale03 to VLAN ID $VLAN_ID3"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale03_PORT_ID} $VLAN_ID3)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${arndale03_PORT_ID} --vlan_id $VLAN_ID3)
 log "Done moving ports to VLAN ID $VLAN_ID3"
 pause 60
 log "CHECK STEP3 START"
@@ -108,9 +108,9 @@ pause 60
 log "CHECK STEP3 END"
 
 log "Moving arndale01 to VLAN ID $VLAN_ID4"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale01_PORT_ID} $VLAN_ID4)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${arndale01_PORT_ID} --vlan_id $VLAN_ID4)
 log "Moving arndale04 to VLAN ID $VLAN_ID4"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale04_PORT_ID} $VLAN_ID4)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${arndale04_PORT_ID} --vlan_id $VLAN_ID4)
 log "Done moving ports to VLAN ID $VLAN_ID4"
 pause 60
 log "CHECK STEP4 START"
@@ -123,9 +123,9 @@ pause 60
 log "CHECK STEP4 END"
 
 log "Moving imx5302 to VLAN ID $VLAN_ID5"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${imx5302_PORT_ID} $VLAN_ID5)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${imx5302_PORT_ID} --vlan_id $VLAN_ID5)
 log "Moving arndale02 to VLAN ID $VLAN_ID5"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale02_PORT_ID} $VLAN_ID5)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${arndale02_PORT_ID} --vlan_id $VLAN_ID5)
 log "Done moving ports to VLAN ID $VLAN_ID4"
 pause 60
 log "CHECK STEP5 START"
@@ -140,16 +140,16 @@ log "CHECK STEP5 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})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${imx5302_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${imx5303_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda02_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda03_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale01_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale04_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${imx5301_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${imx5302_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${imx5303_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${panda01_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${panda02_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${panda03_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${arndale01_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${arndale02_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${arndale03_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${arndale04_PORT_ID})
 log "Done moving ports back to base"
 
 # Wait 60s for everything to settle
@@ -165,11 +165,11 @@ log "Checking base VLANs after the test"
 verify_all_hosts_are_base
 
 log "Delete the test VLANs"
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID1})
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID2})
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID3})
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID4})
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID5})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID1})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID2})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID3})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID4})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID5})
 
 # 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 5ccec14..49346f6 100644
--- a/test/medium-2switches-1vlan-1
+++ b/test/medium-2switches-1vlan-1
@@ -47,8 +47,8 @@ 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)
-VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
+OUTPUT=$(run_admin_command create_vlan --name test30 --tag 30 --is_base_vlan false)
+VLAN_ID=$(run_admin_command lookup_vlan_by_tag --tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
 # Wait 10s for everything to settle
@@ -56,7 +56,7 @@ 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)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${imx5301_PORT_ID} --vlan_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"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${panda01_PORT_ID} $VLAN_ID)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${panda01_PORT_ID} --vlan_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"
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${imx5301_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${imx5301_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${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"
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID})
 
 # 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 2010bbd..c20c311 100644
--- a/test/medium-3switches-1vlan-1
+++ b/test/medium-3switches-1vlan-1
@@ -50,8 +50,8 @@ 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)
-VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
+OUTPUT=$(run_admin_command create_vlan --name test30 --tag 30 --is_base_vlan false)
+VLAN_ID=$(run_admin_command lookup_vlan_by_tag --tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
 # Wait 10s for everything to settle
@@ -59,9 +59,9 @@ 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)
-OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale02_PORT_ID} $VLAN_ID)
-OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale03_PORT_ID} $VLAN_ID)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${panda01_PORT_ID} --vlan_id $VLAN_ID)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${arndale02_PORT_ID} --vlan_id $VLAN_ID)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${arndale03_PORT_ID} --vlan_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"
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${panda01_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${arndale02_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${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"
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID})
 
 # Stop all the test machines logging (and wait 20s for things to
 # recover and get logged)
diff --git a/test/medium-3switches-1vlan-2 b/test/medium-3switches-1vlan-2
index 1b61570..c76175c 100644
--- a/test/medium-3switches-1vlan-2
+++ b/test/medium-3switches-1vlan-2
@@ -50,8 +50,8 @@ 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)
-VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
+OUTPUT=$(run_admin_command create_vlan --name test30 --tag 30 --is_base_vlan false)
+VLAN_ID=$(run_admin_command lookup_vlan_by_tag --tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
 # Wait 10s for everything to settle
@@ -59,9 +59,9 @@ 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 ${imx5303_PORT_ID} $VLAN_ID)
-OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale03_PORT_ID} $VLAN_ID)
-OUTPUT=$(run_admin_command --set_port_current_vlan ${imx5301_PORT_ID} $VLAN_ID)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${imx5303_PORT_ID} --vlan_id $VLAN_ID)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${arndale03_PORT_ID} --vlan_id $VLAN_ID)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${imx5301_PORT_ID} --vlan_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"
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${imx5303_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${imx5301_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${imx5303_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${arndale03_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${imx5301_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"
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID})
 
 # 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 e94e5e4..9b70a19 100644
--- a/test/simple-CiscoCatalyst-1
+++ b/test/simple-CiscoCatalyst-1
@@ -43,8 +43,8 @@ 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)
-VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
+OUTPUT=$(run_admin_command create_vlan --name test30 --tag 30 --is_base_vlan false)
+VLAN_ID=$(run_admin_command lookup_vlan_by_tag --tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
 # Wait 10s for everything to settle
@@ -52,12 +52,12 @@ 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)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${arndale01_PORT_ID} --vlan_id $VLAN_ID)
 
 pause 60
 
 log "Moving panda01 to VLAN ID $VLAN_ID"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${panda01_PORT_ID} $VLAN_ID)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${panda01_PORT_ID} --vlan_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"
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale01_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda01_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${arndale01_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${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"
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID})
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
diff --git a/test/simple-CiscoSX300-1 b/test/simple-CiscoSX300-1
index 9da4b7c..c8950e2 100644
--- a/test/simple-CiscoSX300-1
+++ b/test/simple-CiscoSX300-1
@@ -43,8 +43,8 @@ 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)
-VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
+OUTPUT=$(run_admin_command create_vlan --name test30 --tag 30 --is_base_vlan false)
+VLAN_ID=$(run_admin_command lookup_vlan_by_tag --tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
 # Wait 10s for everything to settle
@@ -52,12 +52,12 @@ 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)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${arndale02_PORT_ID} --vlan_id $VLAN_ID)
 
 pause 60
 
 log "Moving panda02 to VLAN ID $VLAN_ID"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${panda02_PORT_ID} $VLAN_ID)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${panda02_PORT_ID} --vlan_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"
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale02_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda02_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${arndale02_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${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"
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID})
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
diff --git a/test/simple-CiscoSX300-2 b/test/simple-CiscoSX300-2
index 523f98f..5620c4d 100644
--- a/test/simple-CiscoSX300-2
+++ b/test/simple-CiscoSX300-2
@@ -43,8 +43,8 @@ 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)
-VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
+OUTPUT=$(run_admin_command create_vlan --name test30 --tag 30 --is_base_vlan false)
+VLAN_ID=$(run_admin_command lookup_vlan_by_tag --tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
 # Wait 10s for everything to settle
@@ -52,12 +52,12 @@ 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)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${arndale03_PORT_ID} --vlan_id $VLAN_ID)
 
 pause 60
 
 log "Moving panda03 to VLAN ID $VLAN_ID"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${panda03_PORT_ID} $VLAN_ID)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${panda03_PORT_ID} --vlan_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"
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale03_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${panda03_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${arndale03_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${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"
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID})
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
diff --git a/test/simple-NetgearXSM-1 b/test/simple-NetgearXSM-1
index 4678d08..fa09df4 100644
--- a/test/simple-NetgearXSM-1
+++ b/test/simple-NetgearXSM-1
@@ -43,8 +43,8 @@ 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)
-VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
+OUTPUT=$(run_admin_command create_vlan --name test30 --tag 30 --is_base_vlan false)
+VLAN_ID=$(run_admin_command lookup_vlan_by_tag --tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
 # Wait 10s for everything to settle
@@ -52,12 +52,12 @@ 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)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${imx5301_PORT_ID} --vlan_id $VLAN_ID)
 
 pause 60
 
 log "Moving imx5302 to VLAN ID $VLAN_ID"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${imx5302_PORT_ID} $VLAN_ID)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${imx5302_PORT_ID} --vlan_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"
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${imx5301_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${imx5302_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${imx5301_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${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"
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID})
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
diff --git a/test/simple-TPLinkTLSG2XXX-1 b/test/simple-TPLinkTLSG2XXX-1
index c6acfc2..6e838ae 100644
--- a/test/simple-TPLinkTLSG2XXX-1
+++ b/test/simple-TPLinkTLSG2XXX-1
@@ -43,8 +43,8 @@ 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)
-VLAN_ID=$(run_admin_command --lookup_vlan_by_tag 30)
+OUTPUT=$(run_admin_command create_vlan --name test30 --tag 30 --is_base_vlan false)
+VLAN_ID=$(run_admin_command lookup_vlan_by_tag --tag 30)
 log "Created new VLAN with ID $VLAN_ID"
 
 # Wait 10s for everything to settle
@@ -52,12 +52,12 @@ pause 10
 
 # Move some of the test machines to this new VLAN
 log "Moving arndale04 to VLAN ID $VLAN_ID"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${arndale04_PORT_ID} $VLAN_ID)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${arndale04_PORT_ID} --vlan_id $VLAN_ID)
 
 pause 60
 
 log "Moving imx5303 to VLAN ID $VLAN_ID"
-OUTPUT=$(run_admin_command --set_port_current_vlan ${imx5303_PORT_ID} $VLAN_ID)
+OUTPUT=$(run_admin_command set_port_current_vlan --port_id ${imx5303_PORT_ID} --vlan_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"
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${arndale04_PORT_ID})
-OUTPUT=$(run_admin_command --restore_port_to_base_vlan ${imx5303_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${arndale04_PORT_ID})
+OUTPUT=$(run_admin_command restore_port_to_base_vlan --port_id ${imx5303_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"
-OUTPUT=$(run_admin_command --delete_vlan ${VLAN_ID})
+OUTPUT=$(run_admin_command delete_vlan --vlan_id ${VLAN_ID})
 
 # Stop all the test machines logging (and wait 60s)
 stop_logging
diff --git a/test/test-common b/test/test-common
index 3ce609a..ddc7986 100755
--- a/test/test-common
+++ b/test/test-common
@@ -82,10 +82,10 @@ verify_host_is_base () {
     HOST=$1
     PORT_ID_VAR=${HOST}_PORT_ID
     PORT_ID=${!PORT_ID_VAR}
-    CURRENT_VLAN_ID=$(run_admin_command --get_port_current_vlan $PORT_ID)
-    CURRENT_VLAN_TAG=$(run_admin_command --show_vlan_tag $CURRENT_VLAN_ID)
-    BASE_VLAN_ID=$(run_admin_command --get_port_base_vlan $PORT_ID)
-    BASE_VLAN_TAG=$(run_admin_command --show_vlan_tag $BASE_VLAN_ID)
+    CURRENT_VLAN_ID=$(run_admin_command get_port_current_vlan --port_id $PORT_ID)
+    CURRENT_VLAN_TAG=$(run_admin_command show_vlan_tag --vlan_id $CURRENT_VLAN_ID)
+    BASE_VLAN_ID=$(run_admin_command get_port_base_vlan --port_id $PORT_ID)
+    BASE_VLAN_TAG=$(run_admin_command show_vlan_tag --vlan_id $BASE_VLAN_ID)
     vlog "$HOST"
     vlog "  is on port ID $PORT_ID"
     vlog "  which is on VLAN ID $CURRENT_VLAN_ID, tag $CURRENT_VLAN_TAG"
@@ -262,13 +262,13 @@ echo "  ($DESCRIPTION)"
 echo "  Logging to ${LOGFILE}"
 
 # Startup check
-STATUS=$(run_admin_command --status)
+STATUS=$(run_admin_command status)
 log $STATUS
 
 # Preload some data - what are the switch IDs and port IDs of the
 # various things in our test setup?
 for SWITCH in $SWITCHES; do
-    export ${SWITCH}_ID=$(run_admin_command --lookup_switch_by_name $SWITCH)
+    export ${SWITCH}_ID=$(run_admin_command lookup_switch_by_name --name $SWITCH)
 done
 
 # Generate more detailed data for the hosts by asking VLANd what the
@@ -279,10 +279,10 @@ for host in $HOSTS; do
     SW_VAR=${SW}_ID
     SW_ID=${!SW_VAR}
     PORT_NAME=${!SWITCH_PORT_VAR##*:}
-    PORT_ID=$(run_admin_command --lookup_port_by_switch_and_name $SW_ID $PORT_NAME)
+    PORT_ID=$(run_admin_command lookup_port_by_switch_and_name --switch_id $SW_ID --name $PORT_NAME)
     export ${host}_PORT_ID=${PORT_ID}
-    CURRENT_VLAN_ID=$(run_admin_command --get_port_current_vlan $PORT_ID)
+    CURRENT_VLAN_ID=$(run_admin_command get_port_current_vlan --port_id $PORT_ID)
     export ${host}_CURRENT_VLANID=$CURRENT_VLAN_ID
-    CURRENT_VLAN_TAG=$(run_admin_command --show_vlan_tag $CURRENT_VLAN_ID)
+    CURRENT_VLAN_TAG=$(run_admin_command show_vlan_tag --vlan_id $CURRENT_VLAN_ID)
     export ${host}_CURRENT_VLAN_TAG=$CURRENT_VLAN_TAG
 done