홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
381f8d85 1 parent f5d7236e

Fixes for STC command argument handling when using Karaf client 

Change-Id: I696e72d532fef6feb3320b06d2d54657e51c780b
Inline Side-by-side
Showing 5 changed files with 10 additions and 10 deletions
...@@ -21,5 +21,5 @@ arg5=$8 ...@@ -21,5 +21,5 @@ arg5=$8
21 21
22 set -x 22 set -x
23 23
24 -onos $target "onos:add-${type}-intent" --key $name "${arg1}" "${arg2}" "${arg3}" "${arg4}" "${arg5}" 24 +onos -f $target "onos:add-${type}-intent" --key $name "${arg1}" "${arg2}" "${arg3}" "${arg4}" "${arg5}"
25 25
......
...@@ -50,6 +50,6 @@ ...@@ -50,6 +50,6 @@
50 requires="~Host-Intent.Validate-Intent-Installed-Again" /> 50 requires="~Host-Intent.Validate-Intent-Installed-Again" />
51 51
52 <step name="Host-Intent.Remove-Intent" requires="~Host-Intent.Net-Link-Down-Up" 52 <step name="Host-Intent.Remove-Intent" requires="~Host-Intent.Net-Link-Down-Up"
53 - exec="onos ${OC1} remove-intent -p org.onosproject.cli h2h"/> 53 + exec="onos -f ${OC1} remove-intent -p org.onosproject.cli h2h"/>
54 </group> 54 </group>
55 </scenario> 55 </scenario>
......
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
52 52
53 <!-- Clean up intents --> 53 <!-- Clean up intents -->
54 <step name="M2S-Intent.Remove-Intent-forward" requires="~M2S-Intent.Ping-3-back" 54 <step name="M2S-Intent.Remove-Intent-forward" requires="~M2S-Intent.Ping-3-back"
55 - exec="onos ${OC1} remove-intent -p org.onosproject.cli forward"/> 55 + exec="onos -f ${OC1} remove-intent -p org.onosproject.cli forward"/>
56 <step name="M2S-Intent.Remove-Intent-back" requires="~M2S-Intent.Ping-3-back" 56 <step name="M2S-Intent.Remove-Intent-back" requires="~M2S-Intent.Ping-3-back"
57 - exec="onos ${OC1} remove-intent -p org.onosproject.cli back"/> 57 + exec="onos -f ${OC1} remove-intent -p org.onosproject.cli back"/>
58 </group> 58 </group>
59 </scenario> 59 </scenario>
......
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
65 ~P2P-Intent.Validate-Intent-YX-Installed-Again"/> 65 ~P2P-Intent.Validate-Intent-YX-Installed-Again"/>
66 66
67 <step name="P2P-Intent.Remove-Intent-XY" requires="~P2P-Intent.Net-Link-Down-Up" 67 <step name="P2P-Intent.Remove-Intent-XY" requires="~P2P-Intent.Net-Link-Down-Up"
68 - exec="onos ${OC1} remove-intent -p org.onosproject.cli xy"/> 68 + exec="onos -f ${OC1} remove-intent -p org.onosproject.cli xy"/>
69 <step name="P2P-Intent.Remove-Intent-YX" requires="~P2P-Intent.Net-Link-Down-Up" 69 <step name="P2P-Intent.Remove-Intent-YX" requires="~P2P-Intent.Net-Link-Down-Up"
70 - exec="onos ${OC1} remove-intent -p org.onosproject.cli yx"/> 70 + exec="onos -f ${OC1} remove-intent -p org.onosproject.cli yx"/>
71 </group> 71 </group>
72 </scenario> 72 </scenario>
......
...@@ -60,12 +60,12 @@ ...@@ -60,12 +60,12 @@
60 60
61 <!-- Clean up intents --> 61 <!-- Clean up intents -->
62 <step name="S2M-Intent.Remove-Intent-forward" requires="~S2M-Intent.Ping-3-back" 62 <step name="S2M-Intent.Remove-Intent-forward" requires="~S2M-Intent.Ping-3-back"
63 - exec="onos ${OC1} remove-intent -p org.onosproject.cli forward"/> 63 + exec="onos -f ${OC1} remove-intent -p org.onosproject.cli forward"/>
64 <step name="S2M-Intent.Remove-Intent-back1" requires="~S2M-Intent.Ping-3-back" 64 <step name="S2M-Intent.Remove-Intent-back1" requires="~S2M-Intent.Ping-3-back"
65 - exec="onos ${OC1} remove-intent -p org.onosproject.cli back1"/> 65 + exec="onos -f ${OC1} remove-intent -p org.onosproject.cli back1"/>
66 <step name="S2M-Intent.Remove-Intent-back2" requires="~S2M-Intent.Ping-3-back" 66 <step name="S2M-Intent.Remove-Intent-back2" requires="~S2M-Intent.Ping-3-back"
67 - exec="onos ${OC1} remove-intent -p org.onosproject.cli back2"/> 67 + exec="onos -f ${OC1} remove-intent -p org.onosproject.cli back2"/>
68 <step name="S2M-Intent.Remove-Intent-back3" requires="~S2M-Intent.Ping-3-back" 68 <step name="S2M-Intent.Remove-Intent-back3" requires="~S2M-Intent.Ping-3-back"
69 - exec="onos ${OC1} remove-intent -p org.onosproject.cli back3"/> 69 + exec="onos -f ${OC1} remove-intent -p org.onosproject.cli back3"/>
70 </group> 70 </group>
71 </scenario> 71 </scenario>
......