Fixes for STC command argument handling when using Karaf client
Change-Id: I696e72d532fef6feb3320b06d2d54657e51c780b
diff --git a/tools/test/bin/onos-create-intent b/tools/test/bin/onos-create-intent
index 1c07185..56626d5 100755
--- a/tools/test/bin/onos-create-intent
+++ b/tools/test/bin/onos-create-intent
@@ -21,5 +21,5 @@
set -x
-onos $target "onos:add-${type}-intent" --key $name "${arg1}" "${arg2}" "${arg3}" "${arg4}" "${arg5}"
+onos -f $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 98bb80f..6a1b704 100644
--- a/tools/test/scenarios/net-host-intent.xml
+++ b/tools/test/scenarios/net-host-intent.xml
@@ -50,6 +50,6 @@
requires="~Host-Intent.Validate-Intent-Installed-Again" />
<step name="Host-Intent.Remove-Intent" requires="~Host-Intent.Net-Link-Down-Up"
- exec="onos ${OC1} remove-intent -p org.onosproject.cli h2h"/>
+ exec="onos -f ${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 4fd2600..ef23ea8 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 ${OC1} remove-intent -p org.onosproject.cli forward"/>
+ exec="onos -f ${OC1} remove-intent -p org.onosproject.cli forward"/>
<step name="M2S-Intent.Remove-Intent-back" requires="~M2S-Intent.Ping-3-back"
- exec="onos ${OC1} remove-intent -p org.onosproject.cli back"/>
+ exec="onos -f ${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 4395794..7626287 100644
--- a/tools/test/scenarios/net-point-intent.xml
+++ b/tools/test/scenarios/net-point-intent.xml
@@ -65,8 +65,8 @@
~P2P-Intent.Validate-Intent-YX-Installed-Again"/>
<step name="P2P-Intent.Remove-Intent-XY" requires="~P2P-Intent.Net-Link-Down-Up"
- exec="onos ${OC1} remove-intent -p org.onosproject.cli xy"/>
+ exec="onos -f ${OC1} remove-intent -p org.onosproject.cli xy"/>
<step name="P2P-Intent.Remove-Intent-YX" requires="~P2P-Intent.Net-Link-Down-Up"
- exec="onos ${OC1} remove-intent -p org.onosproject.cli yx"/>
+ exec="onos -f ${OC1} remove-intent -p org.onosproject.cli yx"/>
</group>
</scenario>
diff --git a/tools/test/scenarios/net-single-to-multi-intent.xml b/tools/test/scenarios/net-single-to-multi-intent.xml
index f998b72..d132d8d 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 ${OC1} remove-intent -p org.onosproject.cli forward"/>
+ exec="onos -f ${OC1} remove-intent -p org.onosproject.cli forward"/>
<step name="S2M-Intent.Remove-Intent-back1" requires="~S2M-Intent.Ping-3-back"
- exec="onos ${OC1} remove-intent -p org.onosproject.cli back1"/>
+ exec="onos -f ${OC1} remove-intent -p org.onosproject.cli back1"/>
<step name="S2M-Intent.Remove-Intent-back2" requires="~S2M-Intent.Ping-3-back"
- exec="onos ${OC1} remove-intent -p org.onosproject.cli back2"/>
+ exec="onos -f ${OC1} remove-intent -p org.onosproject.cli back2"/>
<step name="S2M-Intent.Remove-Intent-back3" requires="~S2M-Intent.Ping-3-back"
- exec="onos ${OC1} remove-intent -p org.onosproject.cli back3"/>
+ exec="onos -f ${OC1} remove-intent -p org.onosproject.cli back3"/>
</group>
</scenario>