Refactor reactive forwarding test into its own scenario
Change-Id: I97d3a68409a5e5dae4f59bf7700868d7aa484e4e
diff --git a/tools/test/scenarios/net-fast.xml b/tools/test/scenarios/net-fast.xml
index 1a573d1..12b5097 100644
--- a/tools/test/scenarios/net-fast.xml
+++ b/tools/test/scenarios/net-fast.xml
@@ -17,13 +17,10 @@
<group name="Net-Fast">
<import file="${ONOS_SCENARIOS}/net-setup.xml"/>
- <import file="${ONOS_SCENARIOS}/net-pingall.xml" namespace="Reactive-Forwarding"/>
- <dependency name="Reactive-Forwarding.Net-Pingall" requires="Net-Setup"/>
-
- <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Reactive-Forwarding"/>
- <dependency name="Reactive-Forwarding.Net-Link-Down-Up" requires="Net-Setup,~Reactive-Forwarding.Net-Pingall"/>
+ <import file="${ONOS_SCENARIOS}/net-reactive-fwd.xml"/>
+ <dependency name="Net-Reactive-Fwd" requires="Net-Setup"/>
<import file="${ONOS_SCENARIOS}/net-teardown.xml"/>
- <dependency name="Net-Teardown" requires="~Reactive-Forwarding.Net-Link-Down-Up"/>
+ <dependency name="Net-Teardown" requires="~Net-Reactive-Fwd"/>
</group>
</scenario>
diff --git a/tools/test/scenarios/net-pingall.xml b/tools/test/scenarios/net-pingall.xml
index 9def3a1..2eab5a7 100644
--- a/tools/test/scenarios/net-pingall.xml
+++ b/tools/test/scenarios/net-pingall.xml
@@ -16,15 +16,12 @@
<scenario name="net-pingall" description="Network pingall test">
<!-- TODO: parametrize this via recipes -->
<group name="Net-Pingall">
- <step name="Install-Apps"
- exec="onos ${OC1} app activate org.onosproject.openflow org.onosproject.proxyarp org.onosproject.fwd"/>
- <step name="Check-Apps" requires="Install-Apps"
- exec="onos-check-apps ${OC1} drivers,openflow,proxyarp,fwd includes"/>
<step name="Ping-All" requires="Check-Apps"
exec="onos-mininet sendAndExpect pingall --expect 600/600 received"/>
<step name="Check-Summary-For-Hosts" requires="~Ping-All"
exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/>
+
</group>
</scenario>
diff --git a/tools/test/scenarios/net-reactive-fwd.xml b/tools/test/scenarios/net-reactive-fwd.xml
new file mode 100644
index 0000000..12831a4
--- /dev/null
+++ b/tools/test/scenarios/net-reactive-fwd.xml
@@ -0,0 +1,31 @@
+<!--
+ ~ Copyright 2015-present Open Networking Laboratory
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<scenario name="net-reactive-fwd" description="Network reactive forwarding test">
+ <!-- TODO: parametrize this via recipes -->
+ <group name="Net-Reactive-Fwd">
+ <import file="${ONOS_SCENARIOS}/net-activate-fwd.xml" namespace="Net-Reactive-Fwd"/>
+ <dependency name="Net-Reactive-Fwd.Net-Activate-Fwd" requires="Net-Setup"/>
+
+ <import file="${ONOS_SCENARIOS}/net-pingall.xml" namespace="Net-Reactive-Fwd"/>
+ <dependency name="Net-Reactive-Fwd.Net-Pingall" requires="Net-Reactive-Fwd.Net-Activate-Fwd"/>
+
+ <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Net-Reactive-Fwd"/>
+ <dependency name="Net-Reactive-Fwd.Net-Link-Down-Up" requires="Net-Setup,~Net-Reactive-Fwd.Net-Pingall"/>
+
+ <import file="${ONOS_SCENARIOS}/net-deactivate-fwd.xml" namespace="Net-Reactive-Fwd"/>
+ <dependency name="Net-Reactive-Fwd.Net-Deactivate-Fwd" requires="Net-Reactive-Fwd.Net-Link-Down-Up"/>
+ </group>
+</scenario>
diff --git a/tools/test/scenarios/net-setup-vnets.xml b/tools/test/scenarios/net-setup-vnets.xml
index 55207cc..9393cdb 100644
--- a/tools/test/scenarios/net-setup-vnets.xml
+++ b/tools/test/scenarios/net-setup-vnets.xml
@@ -16,9 +16,6 @@
<scenario name="net-setup-vnets" description="Network (vnets) setup steps">
<group name="Net-Setup-Vnets">
- <step name="Disable-FwdApp" if="echo $ONOS_APPS | grep -w fwd"
- exec="onos ${OCI} onos:app deactivate org.onosproject.fwd"/>
-
<step name="Get-TenantId" requires="^" unless="${tenantId}"
exec="echo @stc tenantId=TestTenant"/>
diff --git a/tools/test/scenarios/net-smoke.xml b/tools/test/scenarios/net-smoke.xml
index 4804927..50653fc 100644
--- a/tools/test/scenarios/net-smoke.xml
+++ b/tools/test/scenarios/net-smoke.xml
@@ -17,27 +17,18 @@
<group name="Net-Smoke">
<import file="${ONOS_SCENARIOS}/net-setup.xml"/>
- <import file="${ONOS_SCENARIOS}/net-activate-fwd.xml" namespace="Reactive-Forwarding"/>
- <dependency name="Reactive-Forwarding.Net-Activate-Fwd" requires="Net-Setup"/>
-
- <import file="${ONOS_SCENARIOS}/net-pingall.xml" namespace="Reactive-Forwarding"/>
- <dependency name="Reactive-Forwarding.Net-Pingall" requires="Reactive-Forwarding.Net-Activate-Fwd"/>
-
- <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Reactive-Forwarding"/>
- <dependency name="Reactive-Forwarding.Net-Link-Down-Up" requires="Net-Setup,~Reactive-Forwarding.Net-Pingall"/>
-
- <import file="${ONOS_SCENARIOS}/net-deactivate-fwd.xml" namespace="Reactive-Forwarding"/>
- <dependency name="Reactive-Forwarding.Net-Deactivate-Fwd" requires="Reactive-Forwarding.Net-Link-Down-Up"/>
+ <import file="${ONOS_SCENARIOS}/net-reactive-fwd.xml"/>
+ <dependency name="Net-Reactive-Fwd" requires="Net-Setup"/>
<import file="${ONOS_SCENARIOS}/net-host-intent.xml"/>
- <dependency name="Host-Intent-Connectivity" requires="Net-Setup,~Reactive-Forwarding.Net-Link-Down-Up"/>
+ <dependency name="Host-Intent-Connectivity" requires="Net-Reactive-Fwd"/>
<import file="${ONOS_SCENARIOS}/net-point-intent.xml"/>
- <dependency name="P2P-Intent-Connectivity" requires="Net-Setup,~Reactive-Forwarding.Net-Link-Down-Up,Host-Intent-Connectivity"/>
+ <dependency name="P2P-Intent-Connectivity" requires="Net-Setup,~Net-Reactive-Fwd,Host-Intent-Connectivity"/>
<import file="${ONOS_SCENARIOS}/net-single-to-multi-intent.xml"/>
<dependency name="S2M-Intent-Connectivity"
- requires="Net-Setup,~Reactive-Forwarding.Net-Link-Down-Up,Host-Intent-Connectivity,P2P-Intent-Connectivity"/>
+ requires="Net-Setup,~Net-Reactive-Fwd,Host-Intent-Connectivity,P2P-Intent-Connectivity"/>
<import file="${ONOS_SCENARIOS}/net-multi-to-single-intent.xml"/>
<dependency name="M2S-Intent-Connectivity"
diff --git a/tools/test/scenarios/net-teardown-vnets.xml b/tools/test/scenarios/net-teardown-vnets.xml
index 69b7c5c..7c3571f 100644
--- a/tools/test/scenarios/net-teardown-vnets.xml
+++ b/tools/test/scenarios/net-teardown-vnets.xml
@@ -16,7 +16,7 @@
<scenario name="net-teardown-vnets" description="Network (vnets) teardown steps">
<group name="Net-Teardown-Vnets">
- <step name="Check-NetworkId-Variable-Exists"
+ <step name="Check-NetworkId-Variable-Exists"
exec="test '${networkId}' != ''"/>
<step name="Check-Vnet-Link" requires="^"
@@ -46,14 +46,11 @@
<step name="Remove-Vnet" requires="^"
exec="onos ${OCI} vnet-remove ${networkId}"/>
- <step name="Check-TenantId-Variable-Exists" requires="^"
+ <step name="Check-TenantId-Variable-Exists" requires="^"
exec="test '${tenantId}' != ''"/>
<step name="Remove-Tenant" requires="Check-TenantId-Variable-Exists"
exec="onos ${OCI} vnet-remove-tenant ${tenantId}"/>
- <step name="Enable-FwdApp" requires="^" if="echo $ONOS_APPS | grep -w fwd"
- exec="onos ${OCI} onos:app activate org.onosproject.fwd"/>
-
</group>
</scenario>