홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
955c4b82 1 parent deac28bf

Refactor activate/deactivate of forwarding app 

Change-Id: Iae71b3334fba08dceac7adb47a457ae0af0dcabc
Inline Side-by-side
Showing 11 changed files with 195 additions and 54 deletions
1 +#!/bin/bash
2 +# -----------------------------------------------------------------------------
3 +# Checks ONOS flows
4 +# -----------------------------------------------------------------------------
5 +
6 +aux=/tmp/stc-$$.log
7 +trap "rm -f $aux 2>/dev/null" EXIT
8 +
9 +want_present=0
10 +
11 +if [ "$3" == "present" ]; then
12 + want_present=1
13 +fi
14 +
15 +for i in {1..5}; do
16 + onos ${1:-$OCI} "onos:flows added $2" > $aux
17 + grep "ETH_TYPE:ipv4" $aux
18 + found=$?
19 +
20 + if [ $want_present == 1 -a $found -eq 0 ] ||
21 + [ $want_present == 0 -a $found -ne 0 ]; then
22 + cat $aux
23 + exit 0
24 + else
25 + sleep 1
26 + fi
27 +done
28 +cat $aux
29 +exit 1
1 +<!--
2 + ~ Copyright 2015-present Open Networking Laboratory
3 + ~
4 + ~ Licensed under the Apache License, Version 2.0 (the "License");
5 + ~ you may not use this file except in compliance with the License.
6 + ~ You may obtain a copy of the License at
7 + ~
8 + ~ http://www.apache.org/licenses/LICENSE-2.0
9 + ~
10 + ~ Unless required by applicable law or agreed to in writing, software
11 + ~ distributed under the License is distributed on an "AS IS" BASIS,
12 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + ~ See the License for the specific language governing permissions and
14 + ~ limitations under the License.
15 + -->
16 +<scenario name="net-activate-fwd" description="Activate forwarding apps">
17 + <group name="Net-Activate-Fwd">
18 + <!-- TODO: parametrize this via recipes -->
19 +
20 + <step name="Install-Fwd-Apps"
21 + exec="onos ${OC1} app activate org.onosproject.openflow org.onosproject.proxyarp org.onosproject.fwd"/>
22 + <step name="Check-Fwd-Apps" requires="Install-Fwd-Apps"
23 + exec="onos-check-apps ${OC1} drivers,openflow,proxyarp,fwd includes"/>
24 +
25 + <step name="Check-Fwd-Flows1" requires="Check-Fwd-Apps"
26 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000001 present"/>
27 + <step name="Check-Fwd-Flows2" requires="Check-Fwd-Apps"
28 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000002 present"/>
29 + <step name="Check-Fwd-Flows3" requires="Check-Fwd-Apps"
30 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000003 present"/>
31 + <step name="Check-Fwd-Flows4" requires="Check-Fwd-Apps"
32 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000004 present"/>
33 + <step name="Check-Fwd-Flows5" requires="Check-Fwd-Apps"
34 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000005 present"/>
35 + <step name="Check-Fwd-Flows6" requires="Check-Fwd-Apps"
36 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000006 present"/>
37 + <step name="Check-Fwd-Flows7" requires="Check-Fwd-Apps"
38 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000007 present"/>
39 + <step name="Check-Fwd-Flows8" requires="Check-Fwd-Apps"
40 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000008 present"/>
41 + <step name="Check-Fwd-Flows9" requires="Check-Fwd-Apps"
42 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000009 present"/>
43 + <step name="Check-Fwd-Flowsa" requires="Check-Fwd-Apps"
44 + exec="onos-check-ipv4-flows ${OC1} of:000000000000000a present"/>
45 + <step name="Check-Fwd-Flowsb" requires="Check-Fwd-Apps"
46 + exec="onos-check-ipv4-flows ${OC1} of:000000000000000b present"/>
47 + <step name="Check-Fwd-Flowsc" requires="Check-Fwd-Apps"
48 + exec="onos-check-ipv4-flows ${OC1} of:000000000000000c present"/>
49 + <step name="Check-Fwd-Flowsd" requires="Check-Fwd-Apps"
50 + exec="onos-check-ipv4-flows ${OC1} of:000000000000000d present"/>
51 + <step name="Check-Fwd-Flowse" requires="Check-Fwd-Apps"
52 + exec="onos-check-ipv4-flows ${OC1} of:000000000000000e present"/>
53 + <step name="Check-Fwd-Flowsf" requires="Check-Fwd-Apps"
54 + exec="onos-check-ipv4-flows ${OC1} of:000000000000000f present"/>
55 + <step name="Check-Fwd-Flows10" requires="Check-Fwd-Apps"
56 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000010 present"/>
57 + <step name="Check-Fwd-Flows11" requires="Check-Fwd-Apps"
58 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000011 present"/>
59 + <step name="Check-Fwd-Flows12" requires="Check-Fwd-Apps"
60 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000012 present"/>
61 + <step name="Check-Fwd-Flows13" requires="Check-Fwd-Apps"
62 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000013 present"/>
63 + <step name="Check-Fwd-Flows14" requires="Check-Fwd-Apps"
64 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000014 present"/>
65 + <step name="Check-Fwd-Flows15" requires="Check-Fwd-Apps"
66 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000015 present"/>
67 + <step name="Check-Fwd-Flows16" requires="Check-Fwd-Apps"
68 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000016 present"/>
69 + <step name="Check-Fwd-Flows17" requires="Check-Fwd-Apps"
70 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000017 present"/>
71 + <step name="Check-Fwd-Flows18" requires="Check-Fwd-Apps"
72 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000018 present"/>
73 + <step name="Check-Fwd-Flows19" requires="Check-Fwd-Apps"
74 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000019 present"/>
75 + </group>
76 +</scenario>
...@@ -18,22 +18,13 @@ ...@@ -18,22 +18,13 @@
18 <!-- TODO: parametrize this via recipes --> 18 <!-- TODO: parametrize this via recipes -->
19 <group name="Net-Create-Flows"> 19 <group name="Net-Create-Flows">
20 20
21 - <!-- Make sure that reactive forwarding is off -->
22 - <step name="Net-Create-Flows.Uninstall-Reactive-Forwarding"
23 - exec="onos ${OC1} app deactivate org.onosproject.fwd org.onosproject.ifwd"/>
24 - <step name="Net-Create-Flows.Check-Apps" requires="^"
25 - exec="onos-check-apps ${OC1} fwd,ifwd excludes"/>
26 -
27 <!-- Force discovery of hosts --> 21 <!-- Force discovery of hosts -->
28 - <step name="Net-Create-Flows.Find-Host-1" requires="^" 22 + <step name="Net-Create-Flows.Find-Host-1"
29 exec="onos-mininet sendAndExpect h1 ping -c1 -w1 h4 --expect 100% packet loss"/> 23 exec="onos-mininet sendAndExpect h1 ping -c1 -w1 h4 --expect 100% packet loss"/>
30 <step name="Net-Create-Flows.Find-Host-2" requires="^" 24 <step name="Net-Create-Flows.Find-Host-2" requires="^"
31 exec="onos-mininet sendAndExpect h4 ping -c1 -w1 h1 --expect 100% packet loss"/> 25 exec="onos-mininet sendAndExpect h4 ping -c1 -w1 h1 --expect 100% packet loss"/>
32 26
33 -
34 <!-- Use REST API to create a point to point intent in each direction --> 27 <!-- Use REST API to create a point to point intent in each direction -->
35 - <step name="Net-Create-Flows.1-to-Host" requires="Net-Create-Flows.Find-Host-2"
36 - exec="create-flow.py ${OC1} f1 of:0000000000000001 5 1"/>
37 <step name="Net-Create-Flows.1-to-19" requires="^" 28 <step name="Net-Create-Flows.1-to-19" requires="^"
38 exec="create-flow.py ${OC1} f2 of:0000000000000001 1 2"/> 29 exec="create-flow.py ${OC1} f2 of:0000000000000001 1 2"/>
39 <step name="Net-Create-Flows.19-to-7" requires="^" 30 <step name="Net-Create-Flows.19-to-7" requires="^"
...@@ -43,8 +34,6 @@ ...@@ -43,8 +34,6 @@
43 <step name="Net-Create-Flows.4-to-Host" requires="^" 34 <step name="Net-Create-Flows.4-to-Host" requires="^"
44 exec="create-flow.py ${OC1} f5 of:0000000000000004 1 3"/> 35 exec="create-flow.py ${OC1} f5 of:0000000000000004 1 3"/>
45 36
46 - <step name="Net-Create-Flows.Host-to-1" requires="^"
47 - exec="create-flow.py ${OC1} f6 of:0000000000000001 1 5"/>
48 <step name="Net-Create-Flows.19-to-1" requires="^" 37 <step name="Net-Create-Flows.19-to-1" requires="^"
49 exec="create-flow.py ${OC1} f7 of:0000000000000001 2 1"/> 38 exec="create-flow.py ${OC1} f7 of:0000000000000001 2 1"/>
50 <step name="Net-Create-Flows.7-to-19" requires="^" 39 <step name="Net-Create-Flows.7-to-19" requires="^"
...@@ -65,8 +54,6 @@ ...@@ -65,8 +54,6 @@
65 exec="onos-mininet sendAndExpect h4 ping -c1 h1 --expect \ 0% packet loss"/> 54 exec="onos-mininet sendAndExpect h4 ping -c1 h1 --expect \ 0% packet loss"/>
66 55
67 <!-- Use REST API to remove the flows. --> 56 <!-- Use REST API to remove the flows. -->
68 - <step name="Net-Create-Flows.Delete-f1" requires="^"
69 - exec="curl -f -X DELETE -uonos:rocks ${f1Location}"/>
70 <step name="Net-Create-Flows.Delete-f2" requires="^" 57 <step name="Net-Create-Flows.Delete-f2" requires="^"
71 exec="curl -f -X DELETE -uonos:rocks ${f2Location}"/> 58 exec="curl -f -X DELETE -uonos:rocks ${f2Location}"/>
72 <step name="Net-Create-Flows.Delete-f3" requires="^" 59 <step name="Net-Create-Flows.Delete-f3" requires="^"
...@@ -75,8 +62,6 @@ ...@@ -75,8 +62,6 @@
75 exec="curl -f -X DELETE -uonos:rocks ${f4Location}"/> 62 exec="curl -f -X DELETE -uonos:rocks ${f4Location}"/>
76 <step name="Net-Create-Flows.Delete-f5" requires="^" 63 <step name="Net-Create-Flows.Delete-f5" requires="^"
77 exec="curl -f -X DELETE -uonos:rocks ${f5Location}"/> 64 exec="curl -f -X DELETE -uonos:rocks ${f5Location}"/>
78 - <step name="Net-Create-Flows.Delete-f6" requires="^"
79 - exec="curl -f -X DELETE -uonos:rocks ${f6Location}"/>
80 <step name="Net-Create-Flows.Delete-f7" requires="^" 65 <step name="Net-Create-Flows.Delete-f7" requires="^"
81 exec="curl -f -X DELETE -uonos:rocks ${f7Location}"/> 66 exec="curl -f -X DELETE -uonos:rocks ${f7Location}"/>
82 <step name="Net-Create-Flows.Delete-f8" requires="^" 67 <step name="Net-Create-Flows.Delete-f8" requires="^"
......
1 +<!--
2 + ~ Copyright 2015-present Open Networking Laboratory
3 + ~
4 + ~ Licensed under the Apache License, Version 2.0 (the "License");
5 + ~ you may not use this file except in compliance with the License.
6 + ~ You may obtain a copy of the License at
7 + ~
8 + ~ http://www.apache.org/licenses/LICENSE-2.0
9 + ~
10 + ~ Unless required by applicable law or agreed to in writing, software
11 + ~ distributed under the License is distributed on an "AS IS" BASIS,
12 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + ~ See the License for the specific language governing permissions and
14 + ~ limitations under the License.
15 + -->
16 +<scenario name="net-deactivate-fwd" description="Deactivate forwarding apps">
17 + <group name="Net-Deactivate-Fwd">
18 + <!-- TODO: parametrize this via recipes -->
19 + <step name="Net-Deactivate-Fwd.Uninstall-Reactive-Forwarding"
20 + exec="onos ${OC1} app deactivate org.onosproject.fwd org.onosproject.ifwd"/>
21 + <step name="Net-Deactivate-Fwd.Check-Apps" requires="Net-Deactivate-Fwd.Uninstall-Reactive-Forwarding"
22 + exec="onos-check-apps ${OC1} fwd,ifwd excludes"/>
23 +
24 + <step name="Check-DFwd-Flows1" requires="Net-Deactivate-Fwd.Check-Apps"
25 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000001 not-present"/>
26 + <step name="Check-DFwd-Flows2" requires="Net-Deactivate-Fwd.Check-Apps"
27 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000002 not-present"/>
28 + <step name="Check-DFwd-Flows3" requires="Net-Deactivate-Fwd.Check-Apps"
29 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000003 not-present"/>
30 + <step name="Check-DFwd-Flows4" requires="Net-Deactivate-Fwd.Check-Apps"
31 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000004 not-present"/>
32 + <step name="Check-DFwd-Flows5" requires="Net-Deactivate-Fwd.Check-Apps"
33 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000005 not-present"/>
34 + <step name="Check-DFwd-Flows6" requires="Net-Deactivate-Fwd.Check-Apps"
35 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000006 not-present"/>
36 + <step name="Check-DFwd-Flows7" requires="Net-Deactivate-Fwd.Check-Apps"
37 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000007 not-present"/>
38 + <step name="Check-DFwd-Flows8" requires="Net-Deactivate-Fwd.Check-Apps"
39 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000008 not-present"/>
40 + <step name="Check-DFwd-Flows9" requires="Net-Deactivate-Fwd.Check-Apps"
41 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000009 not-present"/>
42 + <step name="Check-DFwd-Flowsa" requires="Net-Deactivate-Fwd.Check-Apps"
43 + exec="onos-check-ipv4-flows ${OC1} of:000000000000000a not-present"/>
44 + <step name="Check-DFwd-Flowsb" requires="Net-Deactivate-Fwd.Check-Apps"
45 + exec="onos-check-ipv4-flows ${OC1} of:000000000000000b not-present"/>
46 + <step name="Check-DFwd-Flowsc" requires="Net-Deactivate-Fwd.Check-Apps"
47 + exec="onos-check-ipv4-flows ${OC1} of:000000000000000c not-present"/>
48 + <step name="Check-DFwd-Flowsd" requires="Net-Deactivate-Fwd.Check-Apps"
49 + exec="onos-check-ipv4-flows ${OC1} of:000000000000000d not-present"/>
50 + <step name="Check-DFwd-Flowse" requires="Net-Deactivate-Fwd.Check-Apps"
51 + exec="onos-check-ipv4-flows ${OC1} of:000000000000000e not-present"/>
52 + <step name="Check-DFwd-Flowsf" requires="Net-Deactivate-Fwd.Check-Apps"
53 + exec="onos-check-ipv4-flows ${OC1} of:000000000000000f not-present"/>
54 + <step name="Check-DFwd-Flows10" requires="Net-Deactivate-Fwd.Check-Apps"
55 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000010 not-present"/>
56 + <step name="Check-DFwd-Flows11" requires="Net-Deactivate-Fwd.Check-Apps"
57 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000011 not-present"/>
58 + <step name="Check-DFwd-Flows12" requires="Net-Deactivate-Fwd.Check-Apps"
59 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000012 not-present"/>
60 + <step name="Check-DFwd-Flows13" requires="Net-Deactivate-Fwd.Check-Apps"
61 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000013 not-present"/>
62 + <step name="Check-DFwd-Flows14" requires="Net-Deactivate-Fwd.Check-Apps"
63 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000014 not-present"/>
64 + <step name="Check-DFwd-Flows15" requires="Net-Deactivate-Fwd.Check-Apps"
65 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000015 not-present"/>
66 + <step name="Check-DFwd-Flows16" requires="Net-Deactivate-Fwd.Check-Apps"
67 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000016 not-present"/>
68 + <step name="Check-DFwd-Flows17" requires="Net-Deactivate-Fwd.Check-Apps"
69 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000017 not-present"/>
70 + <step name="Check-DFwd-Flows18" requires="Net-Deactivate-Fwd.Check-Apps"
71 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000018 not-present"/>
72 + <step name="Check-DFwd-Flows19" requires="Net-Deactivate-Fwd.Check-Apps"
73 + exec="onos-check-ipv4-flows ${OC1} of:0000000000000019 not-present"/>
74 + </group>
75 +</scenario>
...@@ -18,14 +18,8 @@ ...@@ -18,14 +18,8 @@
18 <!-- TODO: parametrize this via recipes --> 18 <!-- TODO: parametrize this via recipes -->
19 <group name="Net-Flow-Objectives"> 19 <group name="Net-Flow-Objectives">
20 20
21 - <!-- Make sure that reactive forwarding is off -->
22 - <step name="Net-Flow-Objectives.Uninstall-Reactive-Forwarding"
23 - exec="onos ${OC1} app deactivate org.onosproject.fwd org.onosproject.ifwd"/>
24 - <step name="Net-Flow-Objectives.Check-Apps" requires="^"
25 - exec="onos-check-apps ${OC1} fwd,ifwd excludes"/>
26 -
27 <!-- Force discovery of hosts --> 21 <!-- Force discovery of hosts -->
28 - <step name="Net-Flow-Objectives.Find-Host-1" requires="^" 22 + <step name="Net-Flow-Objectives.Find-Host-1"
29 exec="onos-mininet sendAndExpect h1 ping -c1 -w1 h4 --expect ."/> 23 exec="onos-mininet sendAndExpect h1 ping -c1 -w1 h4 --expect ."/>
30 <step name="Net-Flow-Objectives.Find-Host-2" requires="^" 24 <step name="Net-Flow-Objectives.Find-Host-2" requires="^"
31 exec="onos-mininet sendAndExpect h4 ping -c1 -w1 h1 --expect ."/> 25 exec="onos-mininet sendAndExpect h4 ping -c1 -w1 h1 --expect ."/>
......
...@@ -16,12 +16,8 @@ ...@@ -16,12 +16,8 @@
16 <scenario name="net-host-intent" description="Network host intent connectivity test"> 16 <scenario name="net-host-intent" description="Network host intent connectivity test">
17 <!-- TODO: parametrize this via recipes --> 17 <!-- TODO: parametrize this via recipes -->
18 <group name="Host-Intent-Connectivity"> 18 <group name="Host-Intent-Connectivity">
19 - <step name="Host-Intent.Uninstall-Reactive-Forwarding"
20 - exec="onos ${OC1} app deactivate org.onosproject.fwd org.onosproject.ifwd"/>
21 - <step name="Host-Intent.Check-Apps" requires="^"
22 - exec="onos-check-apps ${OC1} fwd,ifwd excludes"/>
23 19
24 - <step name="Host-Intent.Find-Host-1" requires="^" 20 + <step name="Host-Intent.Find-Host-1"
25 exec="onos-mininet sendAndExpect h1 ping -c1 -w1 h4 --expect ."/> 21 exec="onos-mininet sendAndExpect h1 ping -c1 -w1 h4 --expect ."/>
26 <step name="Host-Intent.Find-Host-2" requires="^" 22 <step name="Host-Intent.Find-Host-2" requires="^"
27 exec="onos-mininet sendAndExpect h4 ping -c1 -w1 h1 --expect ."/> 23 exec="onos-mininet sendAndExpect h4 ping -c1 -w1 h1 --expect ."/>
......
...@@ -17,13 +17,9 @@ ...@@ -17,13 +17,9 @@
17 description="Network single point to multi point intent connectivity test"> 17 description="Network single point to multi point intent connectivity test">
18 <!-- TODO: parametrize this via recipes --> 18 <!-- TODO: parametrize this via recipes -->
19 <group name="M2S-Intent-Connectivity"> 19 <group name="M2S-Intent-Connectivity">
20 - <step name="M2S-Intent.Uninstall-Reactive-Forwarding"
21 - exec="onos ${OC1} app deactivate org.onosproject.fwd org.onosproject.ifwd"/>
22 - <step name="M2S-Intent.Check-Apps" requires="^"
23 - exec="onos-check-apps ${OC1} fwd,ifwd excludes"/>
24 20
25 <!-- Create a single point to three points intent --> 21 <!-- Create a single point to three points intent -->
26 - <step name="M2S-Intent.Create-Intent-forward" requires="^" 22 + <step name="M2S-Intent.Create-Intent-forward"
27 exec="onos-create-intent ${OC1} forward multi-to-single of:0000000000000014/1 of:0000000000000002/1 of:000000000000000E/1 of:0000000000000011/1"/> 23 exec="onos-create-intent ${OC1} forward multi-to-single of:0000000000000014/1 of:0000000000000002/1 of:000000000000000E/1 of:0000000000000011/1"/>
28 24
29 <!-- Create back links from the 3 points back to the source using a single to multi intent --> 25 <!-- Create back links from the 3 points back to the source using a single to multi intent -->
......
...@@ -17,12 +17,7 @@ ...@@ -17,12 +17,7 @@
17 description="Network point to point intent connectivity test"> 17 description="Network point to point intent connectivity test">
18 <!-- TODO: parametrize this via recipes --> 18 <!-- TODO: parametrize this via recipes -->
19 <group name="P2P-Intent-Connectivity"> 19 <group name="P2P-Intent-Connectivity">
20 - <step name="P2P-Intent.Uninstall-Reactive-Forwarding" 20 + <step name="P2P-Intent.Find-Host-1"
21 - exec="onos ${OC1} app deactivate org.onosproject.fwd org.onosproject.ifwd"/>
22 - <step name="P2P-Intent.Check-Apps" requires="^"
23 - exec="onos-check-apps ${OC1} fwd,ifwd excludes"/>
24 -
25 - <step name="P2P-Intent.Find-Host-1" requires="^"
26 exec="onos-mininet sendAndExpect h1 ping -c1 -w1 h4 --expect ."/> 21 exec="onos-mininet sendAndExpect h1 ping -c1 -w1 h4 --expect ."/>
27 <step name="P2P-Intent.Find-Host-2" requires="^" 22 <step name="P2P-Intent.Find-Host-2" requires="^"
28 exec="onos-mininet sendAndExpect h4 ping -c1 -w1 h1 --expect ."/> 23 exec="onos-mininet sendAndExpect h4 ping -c1 -w1 h1 --expect ."/>
......
...@@ -17,15 +17,8 @@ ...@@ -17,15 +17,8 @@
17 description="Network REST API test"> 17 description="Network REST API test">
18 <!-- TODO: parametrize this via recipes --> 18 <!-- TODO: parametrize this via recipes -->
19 <group name="Net-REST"> 19 <group name="Net-REST">
20 -
21 - <!-- Make sure that reactive forwarding is off -->
22 - <step name="Net-REST.Uninstall-Reactive-Forwarding"
23 - exec="onos ${OC1} app deactivate org.onosproject.fwd org.onosproject.ifwd"/>
24 - <step name="Net-REST.Check-Apps" requires="^"
25 - exec="onos-check-apps ${OC1} fwd,ifwd excludes"/>
26 -
27 <!-- Force discovery of hosts --> 20 <!-- Force discovery of hosts -->
28 - <step name="Net-REST.Find-Host-1" requires="^" 21 + <step name="Net-REST.Find-Host-1"
29 exec="onos-mininet sendAndExpect h1 ping -c1 -w1 h4 --expect ."/> 22 exec="onos-mininet sendAndExpect h1 ping -c1 -w1 h4 --expect ."/>
30 <step name="Net-REST.Find-Host-2" requires="^" 23 <step name="Net-REST.Find-Host-2" requires="^"
31 exec="onos-mininet sendAndExpect h4 ping -c1 -w1 h1 --expect ."/> 24 exec="onos-mininet sendAndExpect h4 ping -c1 -w1 h1 --expect ."/>
......
...@@ -17,13 +17,9 @@ ...@@ -17,13 +17,9 @@
17 description="Network single point to multi point intent connectivity test"> 17 description="Network single point to multi point intent connectivity test">
18 <!-- TODO: parametrize this via recipes --> 18 <!-- TODO: parametrize this via recipes -->
19 <group name="S2M-Intent-Connectivity"> 19 <group name="S2M-Intent-Connectivity">
20 - <step name="S2M-Intent.Uninstall-Reactive-Forwarding"
21 - exec="onos ${OC1} app deactivate org.onosproject.fwd org.onosproject.ifwd"/>
22 - <step name="S2M-Intent.Check-Apps" requires="^"
23 - exec="onos-check-apps ${OC1} fwd,ifwd excludes"/>
24 20
25 <!-- Create a single point to three points intent --> 21 <!-- Create a single point to three points intent -->
26 - <step name="S2M-Intent.Create-Intent-forward" requires="^" 22 + <step name="S2M-Intent.Create-Intent-forward"
27 exec="onos-create-intent ${OC1} forward single-to-multi of:0000000000000011/1 of:0000000000000014/1 of:0000000000000002/1 of:000000000000000E/1"/> 23 exec="onos-create-intent ${OC1} forward single-to-multi of:0000000000000011/1 of:0000000000000014/1 of:0000000000000002/1 of:000000000000000E/1"/>
28 24
29 <!-- Create back links from the 3 points back to the source --> 25 <!-- Create back links from the 3 points back to the source -->
......
...@@ -17,12 +17,18 @@ ...@@ -17,12 +17,18 @@
17 <group name="Net-Smoke"> 17 <group name="Net-Smoke">
18 <import file="${ONOS_SCENARIOS}/net-setup.xml"/> 18 <import file="${ONOS_SCENARIOS}/net-setup.xml"/>
19 19
20 + <import file="${ONOS_SCENARIOS}/net-activate-fwd.xml" namespace="Reactive-Forwarding"/>
21 + <dependency name="Reactive-Forwarding.Net-Activate-Fwd" requires="Net-Setup"/>
22 +
20 <import file="${ONOS_SCENARIOS}/net-pingall.xml" namespace="Reactive-Forwarding"/> 23 <import file="${ONOS_SCENARIOS}/net-pingall.xml" namespace="Reactive-Forwarding"/>
21 - <dependency name="Reactive-Forwarding.Net-Pingall" requires="Net-Setup"/> 24 + <dependency name="Reactive-Forwarding.Net-Pingall" requires="Reactive-Forwarding.Net-Activate-Fwd"/>
22 25
23 <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Reactive-Forwarding"/> 26 <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Reactive-Forwarding"/>
24 <dependency name="Reactive-Forwarding.Net-Link-Down-Up" requires="Net-Setup,~Reactive-Forwarding.Net-Pingall"/> 27 <dependency name="Reactive-Forwarding.Net-Link-Down-Up" requires="Net-Setup,~Reactive-Forwarding.Net-Pingall"/>
25 28
29 + <import file="${ONOS_SCENARIOS}/net-deactivate-fwd.xml" namespace="Reactive-Forwarding"/>
30 + <dependency name="Reactive-Forwarding.Net-Deactivate-Fwd" requires="Reactive-Forwarding.Net-Link-Down-Up"/>
31 +
26 <import file="${ONOS_SCENARIOS}/net-host-intent.xml"/> 32 <import file="${ONOS_SCENARIOS}/net-host-intent.xml"/>
27 <dependency name="Host-Intent-Connectivity" requires="Net-Setup,~Reactive-Forwarding.Net-Link-Down-Up"/> 33 <dependency name="Host-Intent-Connectivity" requires="Net-Setup,~Reactive-Forwarding.Net-Link-Down-Up"/>
28 34
...@@ -36,7 +42,7 @@ ...@@ -36,7 +42,7 @@
36 <import file="${ONOS_SCENARIOS}/net-multi-to-single-intent.xml"/> 42 <import file="${ONOS_SCENARIOS}/net-multi-to-single-intent.xml"/>
37 <dependency name="M2S-Intent-Connectivity" 43 <dependency name="M2S-Intent-Connectivity"
38 requires="S2M-Intent-Connectivity"/> 44 requires="S2M-Intent-Connectivity"/>
39 - 45 +
40 <import file="${ONOS_SCENARIOS}/net-rest.xml"/> 46 <import file="${ONOS_SCENARIOS}/net-rest.xml"/>
41 <dependency name="Net-REST" requires="Net-Setup,P2P-Intent-Connectivity,M2S-Intent-Connectivity"/> 47 <dependency name="Net-REST" requires="Net-Setup,P2P-Intent-Connectivity,M2S-Intent-Connectivity"/>
42 48
......