홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
32715627 1 parent 32770ad8

Refactor reactive forwarding test into its own scenario 

Change-Id: I97d3a68409a5e5dae4f59bf7700868d7aa484e4e
Inline Side-by-side
Showing 6 changed files with 42 additions and 32 deletions
...@@ -17,13 +17,10 @@ ...@@ -17,13 +17,10 @@
17 <group name="Net-Fast"> 17 <group name="Net-Fast">
18 <import file="${ONOS_SCENARIOS}/net-setup.xml"/> 18 <import file="${ONOS_SCENARIOS}/net-setup.xml"/>
19 19
20 - <import file="${ONOS_SCENARIOS}/net-pingall.xml" namespace="Reactive-Forwarding"/> 20 + <import file="${ONOS_SCENARIOS}/net-reactive-fwd.xml"/>
21 - <dependency name="Reactive-Forwarding.Net-Pingall" requires="Net-Setup"/> 21 + <dependency name="Net-Reactive-Fwd" requires="Net-Setup"/>
22 -
23 - <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"/>
25 22
26 <import file="${ONOS_SCENARIOS}/net-teardown.xml"/> 23 <import file="${ONOS_SCENARIOS}/net-teardown.xml"/>
27 - <dependency name="Net-Teardown" requires="~Reactive-Forwarding.Net-Link-Down-Up"/> 24 + <dependency name="Net-Teardown" requires="~Net-Reactive-Fwd"/>
28 </group> 25 </group>
29 </scenario> 26 </scenario>
......
...@@ -16,15 +16,12 @@ ...@@ -16,15 +16,12 @@
16 <scenario name="net-pingall" description="Network pingall test"> 16 <scenario name="net-pingall" description="Network pingall test">
17 <!-- TODO: parametrize this via recipes --> 17 <!-- TODO: parametrize this via recipes -->
18 <group name="Net-Pingall"> 18 <group name="Net-Pingall">
19 - <step name="Install-Apps"
20 - exec="onos ${OC1} app activate org.onosproject.openflow org.onosproject.proxyarp org.onosproject.fwd"/>
21 - <step name="Check-Apps" requires="Install-Apps"
22 - exec="onos-check-apps ${OC1} drivers,openflow,proxyarp,fwd includes"/>
23 19
24 <step name="Ping-All" requires="Check-Apps" 20 <step name="Ping-All" requires="Check-Apps"
25 exec="onos-mininet sendAndExpect pingall --expect 600/600 received"/> 21 exec="onos-mininet sendAndExpect pingall --expect 600/600 received"/>
26 22
27 <step name="Check-Summary-For-Hosts" requires="~Ping-All" 23 <step name="Check-Summary-For-Hosts" requires="~Ping-All"
28 exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/> 24 exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/>
25 +
29 </group> 26 </group>
30 </scenario> 27 </scenario>
......
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-reactive-fwd" description="Network reactive forwarding test">
17 + <!-- TODO: parametrize this via recipes -->
18 + <group name="Net-Reactive-Fwd">
19 + <import file="${ONOS_SCENARIOS}/net-activate-fwd.xml" namespace="Net-Reactive-Fwd"/>
20 + <dependency name="Net-Reactive-Fwd.Net-Activate-Fwd" requires="Net-Setup"/>
21 +
22 + <import file="${ONOS_SCENARIOS}/net-pingall.xml" namespace="Net-Reactive-Fwd"/>
23 + <dependency name="Net-Reactive-Fwd.Net-Pingall" requires="Net-Reactive-Fwd.Net-Activate-Fwd"/>
24 +
25 + <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Net-Reactive-Fwd"/>
26 + <dependency name="Net-Reactive-Fwd.Net-Link-Down-Up" requires="Net-Setup,~Net-Reactive-Fwd.Net-Pingall"/>
27 +
28 + <import file="${ONOS_SCENARIOS}/net-deactivate-fwd.xml" namespace="Net-Reactive-Fwd"/>
29 + <dependency name="Net-Reactive-Fwd.Net-Deactivate-Fwd" requires="Net-Reactive-Fwd.Net-Link-Down-Up"/>
30 + </group>
31 +</scenario>
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
16 <scenario name="net-setup-vnets" description="Network (vnets) setup steps"> 16 <scenario name="net-setup-vnets" description="Network (vnets) setup steps">
17 <group name="Net-Setup-Vnets"> 17 <group name="Net-Setup-Vnets">
18 18
19 - <step name="Disable-FwdApp" if="echo $ONOS_APPS | grep -w fwd"
20 - exec="onos ${OCI} onos:app deactivate org.onosproject.fwd"/>
21 -
22 <step name="Get-TenantId" requires="^" unless="${tenantId}" 19 <step name="Get-TenantId" requires="^" unless="${tenantId}"
23 exec="echo @stc tenantId=TestTenant"/> 20 exec="echo @stc tenantId=TestTenant"/>
24 21
......
...@@ -17,27 +17,18 @@ ...@@ -17,27 +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"/> 20 + <import file="${ONOS_SCENARIOS}/net-reactive-fwd.xml"/>
21 - <dependency name="Reactive-Forwarding.Net-Activate-Fwd" requires="Net-Setup"/> 21 + <dependency name="Net-Reactive-Fwd" requires="Net-Setup"/>
22 -
23 - <import file="${ONOS_SCENARIOS}/net-pingall.xml" namespace="Reactive-Forwarding"/>
24 - <dependency name="Reactive-Forwarding.Net-Pingall" requires="Reactive-Forwarding.Net-Activate-Fwd"/>
25 -
26 - <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Reactive-Forwarding"/>
27 - <dependency name="Reactive-Forwarding.Net-Link-Down-Up" requires="Net-Setup,~Reactive-Forwarding.Net-Pingall"/>
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 22
32 <import file="${ONOS_SCENARIOS}/net-host-intent.xml"/> 23 <import file="${ONOS_SCENARIOS}/net-host-intent.xml"/>
33 - <dependency name="Host-Intent-Connectivity" requires="Net-Setup,~Reactive-Forwarding.Net-Link-Down-Up"/> 24 + <dependency name="Host-Intent-Connectivity" requires="Net-Reactive-Fwd"/>
34 25
35 <import file="${ONOS_SCENARIOS}/net-point-intent.xml"/> 26 <import file="${ONOS_SCENARIOS}/net-point-intent.xml"/>
36 - <dependency name="P2P-Intent-Connectivity" requires="Net-Setup,~Reactive-Forwarding.Net-Link-Down-Up,Host-Intent-Connectivity"/> 27 + <dependency name="P2P-Intent-Connectivity" requires="Net-Setup,~Net-Reactive-Fwd,Host-Intent-Connectivity"/>
37 28
38 <import file="${ONOS_SCENARIOS}/net-single-to-multi-intent.xml"/> 29 <import file="${ONOS_SCENARIOS}/net-single-to-multi-intent.xml"/>
39 <dependency name="S2M-Intent-Connectivity" 30 <dependency name="S2M-Intent-Connectivity"
40 - requires="Net-Setup,~Reactive-Forwarding.Net-Link-Down-Up,Host-Intent-Connectivity,P2P-Intent-Connectivity"/> 31 + requires="Net-Setup,~Net-Reactive-Fwd,Host-Intent-Connectivity,P2P-Intent-Connectivity"/>
41 32
42 <import file="${ONOS_SCENARIOS}/net-multi-to-single-intent.xml"/> 33 <import file="${ONOS_SCENARIOS}/net-multi-to-single-intent.xml"/>
43 <dependency name="M2S-Intent-Connectivity" 34 <dependency name="M2S-Intent-Connectivity"
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <scenario name="net-teardown-vnets" description="Network (vnets) teardown steps"> 16 <scenario name="net-teardown-vnets" description="Network (vnets) teardown steps">
17 <group name="Net-Teardown-Vnets"> 17 <group name="Net-Teardown-Vnets">
18 18
19 - <step name="Check-NetworkId-Variable-Exists" 19 + <step name="Check-NetworkId-Variable-Exists"
20 exec="test '${networkId}' != ''"/> 20 exec="test '${networkId}' != ''"/>
21 21
22 <step name="Check-Vnet-Link" requires="^" 22 <step name="Check-Vnet-Link" requires="^"
...@@ -46,14 +46,11 @@ ...@@ -46,14 +46,11 @@
46 <step name="Remove-Vnet" requires="^" 46 <step name="Remove-Vnet" requires="^"
47 exec="onos ${OCI} vnet-remove ${networkId}"/> 47 exec="onos ${OCI} vnet-remove ${networkId}"/>
48 48
49 - <step name="Check-TenantId-Variable-Exists" requires="^" 49 + <step name="Check-TenantId-Variable-Exists" requires="^"
50 exec="test '${tenantId}' != ''"/> 50 exec="test '${tenantId}' != ''"/>
51 51
52 <step name="Remove-Tenant" requires="Check-TenantId-Variable-Exists" 52 <step name="Remove-Tenant" requires="Check-TenantId-Variable-Exists"
53 exec="onos ${OCI} vnet-remove-tenant ${tenantId}"/> 53 exec="onos ${OCI} vnet-remove-tenant ${tenantId}"/>
54 54
55 - <step name="Enable-FwdApp" requires="^" if="echo $ONOS_APPS | grep -w fwd"
56 - exec="onos ${OCI} onos:app activate org.onosproject.fwd"/>
57 -
58 </group> 55 </group>
59 </scenario> 56 </scenario>
......