Fixes for STC command argument handling when using Karaf client

Change-Id: I696e72d532fef6feb3320b06d2d54657e51c780b

@@ -21,5 +21,5 @@ arg5=$8
 
 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}"
 

@@ -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>

@@ -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>

@@ -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>

@@ -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>