remove deprecated -f command line options
Change-Id: I174425ba4c26001304515626383b20a0f918c26f
diff --git a/tools/test/bin/onos-create-intent b/tools/test/bin/onos-create-intent
index 2f08d5d..91f91af 100755
--- a/tools/test/bin/onos-create-intent
+++ b/tools/test/bin/onos-create-intent
@@ -21,5 +21,5 @@
set -x
-onos -f $target "onos:add-${type}-intent" --key $name "${arg1}" "${arg2}" "${arg3}" "${arg4}" "${arg5}"
+onos $target "onos:add-${type}-intent" --key $name "${arg1}" "${arg2}" "${arg3}" "${arg4}" "${arg5}"
diff --git a/tools/test/scenarios/net-host-intent.xml b/tools/test/scenarios/net-host-intent.xml
index b11f663..e8286c4 100644
--- a/tools/test/scenarios/net-host-intent.xml
+++ b/tools/test/scenarios/net-host-intent.xml
@@ -57,6 +57,6 @@
requires="~Host-Intent.Validate-Intent-Installed-Again" />
<step name="Host-Intent.Remove-Intent" requires="~Host-Intent.Net-Link-Down-Up"
- exec="onos -f ${OC1} remove-intent -p org.onosproject.cli h2h"/>
+ exec="onos ${OC1} remove-intent -p org.onosproject.cli h2h"/>
</group>
</scenario>
diff --git a/tools/test/scenarios/net-multi-to-single-intent.xml b/tools/test/scenarios/net-multi-to-single-intent.xml
index 4ce8003..780d9a3 100644
--- a/tools/test/scenarios/net-multi-to-single-intent.xml
+++ b/tools/test/scenarios/net-multi-to-single-intent.xml
@@ -52,8 +52,8 @@
<!-- Clean up intents -->
<step name="M2S-Intent.Remove-Intent-forward" requires="~M2S-Intent.Ping-3-back"
- exec="onos -f ${OC1} remove-intent -p org.onosproject.cli forward"/>
+ exec="onos ${OC1} remove-intent -p org.onosproject.cli forward"/>
<step name="M2S-Intent.Remove-Intent-back" requires="~M2S-Intent.Ping-3-back"
- exec="onos -f ${OC1} remove-intent -p org.onosproject.cli back"/>
+ exec="onos ${OC1} remove-intent -p org.onosproject.cli back"/>
</group>
</scenario>
diff --git a/tools/test/scenarios/net-point-intent.xml b/tools/test/scenarios/net-point-intent.xml
index 3d2cee7..72a7fb0 100644
--- a/tools/test/scenarios/net-point-intent.xml
+++ b/tools/test/scenarios/net-point-intent.xml
@@ -71,8 +71,8 @@
requires="~P2P-Intent.ExpectExceptionMarkEnd"/>
<step name="P2P-Intent.Remove-Intent-XY" requires="~P2P-Intent.Net-Link-Down-Up"
- exec="onos -f ${OC1} remove-intent -p org.onosproject.cli xy"/>
+ exec="onos ${OC1} remove-intent -p org.onosproject.cli xy"/>
<step name="P2P-Intent.Remove-Intent-YX" requires="~P2P-Intent.Net-Link-Down-Up"
- exec="onos -f ${OC1} remove-intent -p org.onosproject.cli yx"/>
+ exec="onos ${OC1} remove-intent -p org.onosproject.cli yx"/>
</group>
</scenario>
diff --git a/tools/test/scenarios/net-setup-vnet2.xml b/tools/test/scenarios/net-setup-vnet2.xml
index 2703a66..297b371 100644
--- a/tools/test/scenarios/net-setup-vnet2.xml
+++ b/tools/test/scenarios/net-setup-vnet2.xml
@@ -86,10 +86,10 @@
exec="onos ${OCI} links | grep ${physicalDevice1}/${physicalPort1} | grep ${physicalDevice2}/${physicalPort2}"/>
<step name="Create-Bidirectional-VirtualLink" requires="^"
- exec="onos -f ${OCI} vnet-create-link --bidirectional ${networkId} ${virtualDevice2} 2 ${virtualDevice1} 2"/>
+ exec="onos ${OCI} vnet-create-link --bidirectional ${networkId} ${virtualDevice2} 2 ${virtualDevice1} 2"/>
<step name="Show-VirtualLink-Setup" requires="^"
- exec="onos -f ${OCI} vnet-links ${networkId}"/>
+ exec="onos ${OCI} vnet-links ${networkId}"/>
<step name="Create-VirtualHost-1" requires="^"
exec="onos ${OCI} vnet-create-host ${networkId} ${virtualHost1Id} 65535 ${virtualDevice1} 1"/>
diff --git a/tools/test/scenarios/net-setup-vnets.xml b/tools/test/scenarios/net-setup-vnets.xml
index cc9e39c..739097c 100644
--- a/tools/test/scenarios/net-setup-vnets.xml
+++ b/tools/test/scenarios/net-setup-vnets.xml
@@ -44,16 +44,16 @@
exec="onos ${OCI} vnet-create-port ${networkId} device2 2 of:0000000000000009 1"/>
<step name="Create-Bidirectional-Link" requires="^"
- exec="onos -f ${OCI} vnet-create-link --bidirectional ${networkId} device2 2 device1 1"/>
+ exec="onos ${OCI} vnet-create-link --bidirectional ${networkId} device2 2 device1 1"/>
<step name="Create-Intent-1" requires="^"
- exec="onos -f ${OCI} add-vnet-intent --key 21 --encapsulation VLAN ${networkId} device2/2 device1/1"/>
+ exec="onos ${OCI} add-vnet-intent --key 21 --encapsulation VLAN ${networkId} device2/2 device1/1"/>
<step name="Check-intents-installed-1" requires="^"
exec="onos-check-intent ${OCI} 21 INSTALLED 1"/>
<step name="Create-Intent-2" requires="^"
- exec="onos -f ${OCI} add-vnet-intent --key 12 --encapsulation VLAN ${networkId} device1/1 device2/2"/>
+ exec="onos ${OCI} add-vnet-intent --key 12 --encapsulation VLAN ${networkId} device1/1 device2/2"/>
<step name="Check-intents-installed-2" requires="^"
exec="onos-check-intent ${OCI} 12 INSTALLED 1"/>
diff --git a/tools/test/scenarios/net-single-to-multi-intent.xml b/tools/test/scenarios/net-single-to-multi-intent.xml
index e7fea6a..e647471 100644
--- a/tools/test/scenarios/net-single-to-multi-intent.xml
+++ b/tools/test/scenarios/net-single-to-multi-intent.xml
@@ -60,12 +60,12 @@
<!-- Clean up intents -->
<step name="S2M-Intent.Remove-Intent-forward" requires="~S2M-Intent.Ping-3-back"
- exec="onos -f ${OC1} remove-intent -p org.onosproject.cli forward"/>
+ exec="onos ${OC1} remove-intent -p org.onosproject.cli forward"/>
<step name="S2M-Intent.Remove-Intent-back1" requires="~S2M-Intent.Ping-3-back"
- exec="onos -f ${OC1} remove-intent -p org.onosproject.cli back1"/>
+ exec="onos ${OC1} remove-intent -p org.onosproject.cli back1"/>
<step name="S2M-Intent.Remove-Intent-back2" requires="~S2M-Intent.Ping-3-back"
- exec="onos -f ${OC1} remove-intent -p org.onosproject.cli back2"/>
+ exec="onos ${OC1} remove-intent -p org.onosproject.cli back2"/>
<step name="S2M-Intent.Remove-Intent-back3" requires="~S2M-Intent.Ping-3-back"
- exec="onos -f ${OC1} remove-intent -p org.onosproject.cli back3"/>
+ exec="onos ${OC1} remove-intent -p org.onosproject.cli back3"/>
</group>
</scenario>
diff --git a/tools/test/scenarios/net-teardown-vnet2.xml b/tools/test/scenarios/net-teardown-vnet2.xml
index ca2a2a7..f21c563 100644
--- a/tools/test/scenarios/net-teardown-vnet2.xml
+++ b/tools/test/scenarios/net-teardown-vnet2.xml
@@ -31,7 +31,7 @@
exec="echo @stc virtualHost2Id=00:00:00:00:00:02"/>
<step name="Remove-Bidirectional-VirtualLink" requires="^"
- exec="onos -f ${OCI} vnet-remove-link --bidirectional ${networkId} ${virtualDevice2} 2 ${virtualDevice1} 2"/>
+ exec="onos ${OCI} vnet-remove-link --bidirectional ${networkId} ${virtualDevice2} 2 ${virtualDevice1} 2"/>
<step name="Show-VirtualLink-Teardown" requires="^"
exec="onos ${OCI} vnet-links ${networkId}"/>
diff --git a/tools/test/scenarios/net-teardown-vnets.xml b/tools/test/scenarios/net-teardown-vnets.xml
index add862e..5fcf78e 100644
--- a/tools/test/scenarios/net-teardown-vnets.xml
+++ b/tools/test/scenarios/net-teardown-vnets.xml
@@ -20,13 +20,13 @@
exec="test '${networkId}' != ''"/>
<step name="Remove-Intent-1" requires="^"
- exec="onos -f ${OCI} remove-vnet-intent -p ${networkId} org.onosproject.cli 21"/>
+ exec="onos ${OCI} remove-vnet-intent -p ${networkId} org.onosproject.cli 21"/>
<step name="Check-intents-removed-1" requires="^"
exec="onos-check-intent ${OCI} 21 WITHDRAWN 1"/>
<step name="Remove-Intent-2" requires="^"
- exec="onos -f ${OCI} remove-vnet-intent -p ${networkId} org.onosproject.cli 12"/>
+ exec="onos ${OCI} remove-vnet-intent -p ${networkId} org.onosproject.cli 12"/>
<step name="Check-intents-removed-2" requires="^"
exec="onos-check-intent ${OCI} 12 WITHDRAWN 1"/>
@@ -35,7 +35,7 @@
exec="onos ${OCI} vnet-links ${networkId}"/>
<step name="Remove-Bidirectional-Link" requires="^"
- exec="onos -f ${OCI} vnet-remove-link --bidirectional ${networkId} device2 2 device1 1"/>
+ exec="onos ${OCI} vnet-remove-link --bidirectional ${networkId} device2 2 device1 1"/>
<step name="Ping-hosts-2" requires="^"
exec="onos-mininet sendAndExpect h4 ping -c1 h9 --expect \ 100% packet loss"/>