STC scenarios to run stand alone trellis P4 and HAG scenarios
Change-Id: Ie2da939009d14936f5bd166f8898e8890e7d47fe
diff --git a/tools/test/scenarios/net-setup-trellis-hag.xml b/tools/test/scenarios/net-setup-trellis-hag.xml
index bccca73..9303eb0 100644
--- a/tools/test/scenarios/net-setup-trellis-hag.xml
+++ b/tools/test/scenarios/net-setup-trellis-hag.xml
@@ -16,77 +16,77 @@
<scenario name="net-setup-trellis-hag" description="Trellis HAG network setup steps">
- <group name="Trellis-Net-HAG-Setup">
- <step name="Trellis-Net-HAG-Setup.Push-Topos" exec="onos-push-topos ${OCN}"/>
- <step name="Trellis-Net-HAG-Setup.Push-Routing" exec="onos-push-routing ${OCN}"/>
+ <group name="Net-Trellis-HAG-Setup">
+ <step name="Net-Trellis-HAG-Setup.Push-Topos" exec="onos-push-topos ${OCN}"/>
+ <step name="Net-Trellis-HAG-Setup.Push-Routing" exec="onos-push-routing ${OCN}"/>
- <step name="Trellis-Net-HAG-Setup.Stop-Mininet-If-Needed" env="~" exec="onos-mininet stop"/>
- <step name="Trellis-Net-HAG-Setup.Clean-Mininet-If-Needed" env="~" exec="onos-mininet cleanup" requires="^"/>
- <step name="Trellis-Net-HAG-Setup.Wipe-Out-Data-Before" exec="onos-wipe-out" requires="^"/>
+ <step name="Net-Trellis-HAG-Setup.Stop-Mininet-If-Needed" env="~" exec="onos-mininet stop"/>
+ <step name="Net-Trellis-HAG-Setup.Clean-Mininet-If-Needed" env="~" exec="onos-mininet cleanup" requires="^"/>
+ <step name="Net-Trellis-HAG-Setup.Wipe-Out-Data-Before" exec="onos-wipe-out" requires="^"/>
<!-- Make sure that there is no data in the system -->
- <step name="Trellis-Net-HAG-Setup.Initial-Summary-Check" requires="~Trellis-Net-HAG-Setup.Wipe-Out-Data-Before"
+ <step name="Net-Trellis-HAG-Setup.Initial-Summary-Check" requires="~Net-Trellis-HAG-Setup.Wipe-Out-Data-Before"
exec="onos-check-summary ${OC1} [0-9]* 0 0 0"/>
<!-- Deactivate unneeded apps -->
- <group name="Trellis-Net-HAG-Setup.Deactivate-Apps" requires="Trellis-Net-HAG-Setup.Initial-Summary-Check">
+ <group name="Net-Trellis-HAG-Setup.Deactivate-Apps" requires="Net-Trellis-HAG-Setup.Initial-Summary-Check">
<step name="App-Deactivate-PathPainter"
exec="onos ${OCI} app deactivate org.onosproject.pathpainter"
- requires="Trellis-Net-HAG-Setup.Initial-Summary-Check"/>
+ requires="Net-Trellis-HAG-Setup.Initial-Summary-Check"/>
<step name="App-Deactivate-Mobility"
exec="onos ${OCI} app deactivate org.onosproject.mobility"
- requires="Trellis-Net-HAG-Setup.Initial-Summary-Check"/>
+ requires="Net-Trellis-HAG-Setup.Initial-Summary-Check"/>
<step name="App-Deactivate-ProxyArp"
exec="onos ${OCI} app deactivate org.onosproject.proxyarp"
- requires="Trellis-Net-HAG-Setup.Initial-Summary-Check"/>
+ requires="Net-Trellis-HAG-Setup.Initial-Summary-Check"/>
<step name="App-Deactivate-RouteService"
exec="onos ${OCI} app deactivate org.onosproject.route-service"
- requires="Trellis-Net-HAG-Setup.Initial-Summary-Check"/>
+ requires="Net-Trellis-HAG-Setup.Initial-Summary-Check"/>
</group>
<!-- Active required apps -->
- <group name="Trellis-Net-HAG-Setup.Activate-Apps" requires="Trellis-Net-HAG-Setup.Deactivate-Apps">
+ <group name="Net-Trellis-HAG-Setup.Activate-Apps" requires="Net-Trellis-HAG-Setup.Deactivate-Apps">
<step name="App-Activate-Openflow"
exec="onos ${OCI} app activate org.onosproject.openflow"
- requires="Trellis-Net-HAG-Setup.Deactivate-Apps"/>
+ requires="Net-Trellis-HAG-Setup.Deactivate-Apps"/>
<step name="App-Activate-SegmentRouting"
exec="onos ${OCI} app activate org.onosproject.segmentrouting"
- requires="Trellis-Net-HAG-Setup.Deactivate-Apps"/>
+ requires="Net-Trellis-HAG-Setup.Deactivate-Apps"/>
<step name="App-Activate-Fpm"
exec="onos ${OCI} app activate org.onosproject.fpm"
- requires="Trellis-Net-HAG-Setup.Deactivate-Apps"/>
+ requires="Net-Trellis-HAG-Setup.Deactivate-Apps"/>
<step name="App-Activate-DhcpRelay"
exec="onos ${OCI} app activate org.onosproject.dhcprelay"
- requires="Trellis-Net-HAG-Setup.Deactivate-Apps"/>
+ requires="Net-Trellis-HAG-Setup.Deactivate-Apps"/>
<step name="App-Activate-NetCfgHostProvider"
exec="onos ${OCI} app activate org.onosproject.netcfghostprovider"
- requires="Trellis-Net-HAG-Setup.Deactivate-Apps"/>
+ requires="Net-Trellis-HAG-Setup.Deactivate-Apps"/>
<step name="App-Activate-RouterAdvertisement"
exec="onos ${OCI} app activate org.onosproject.routeradvertisement"
- requires="Trellis-Net-HAG-Setup.Deactivate-Apps"/>
+ requires="Net-Trellis-HAG-Setup.Deactivate-Apps"/>
<step name="App-Activate-Mcast"
exec="onos ${OCI} app activate org.onosproject.mcast"
- requires="Trellis-Net-HAG-Setup.Deactivate-Apps"/>
+ requires="Net-Trellis-HAG-Setup.Deactivate-Apps"/>
</group>
<!-- set up the trellis environment -->
- <step name="Trellis-Net-HAG-Setup.Set-Up-Trellis" exec="set-up-trellis ${OCN}" requires="Trellis-Net-HAG-Setup.Activate-Apps"/>
+ <step name="Net-Trellis-HAG-Setup.Set-Up-Trellis" exec="set-up-trellis ${OCN}" requires="Net-Trellis-HAG-Setup.Activate-Apps"/>
<!-- configure the trellis topology in ONOS -->
- <step name="Trellis-Net-HAG-Setup.Config-Topo"
- requires="Trellis-Net-HAG-Setup.Set-Up-Trellis,Trellis-Net-HAG-Setup.Push-Topos,Trellis-Net-HAG-Setup.Push-Routing"
+ <step name="Net-Trellis-HAG-Setup.Config-Topo"
+ requires="Net-Trellis-HAG-Setup.Set-Up-Trellis,Net-Trellis-HAG-Setup.Push-Topos,Net-Trellis-HAG-Setup.Push-Routing"
exec="onos-netcfg ${OC1} ${routing}/trellis/trellis_hag.json"/>
<!-- Bring up mininet -->
- <step name="Trellis-Net-HAG-Setup.Start-Mininet"
- requires="Trellis-Net-HAG-Setup.Config-Topo,Trellis-Net-HAG-Setup.Push-Topos,Trellis-Net-HAG-Setup.Stop-Mininet-If-Needed"
+ <step name="Net-Trellis-HAG-Setup.Start-Mininet"
+ requires="Net-Trellis-HAG-Setup.Config-Topo,Net-Trellis-HAG-Setup.Push-Topos,Net-Trellis-HAG-Setup.Stop-Mininet-If-Needed"
exec="mininet-trellis ${ONOS_INSTANCES}"/>
- <step name="Trellis-Net-HAG-Setup.Wait-For-Mininet" requires="Trellis-Net-HAG-Setup.Start-Mininet"
+ <step name="Net-Trellis-HAG-Setup.Wait-For-Mininet" requires="Net-Trellis-HAG-Setup.Start-Mininet"
exec="onos-mininet wait 10"/>
<!-- clean up local routing repo if necessary -->
- <step name="Trellis-Net-HAG-Setup.Clean-Routing"
- requires="Trellis-Net-HAG-Setup.Start-Mininet"
+ <step name="Net-Trellis-HAG-Setup.Clean-Routing"
+ requires="Net-Trellis-HAG-Setup.Start-Mininet"
exec="onos-clean-routing ${routing_root}"/>
</group>
</scenario>
diff --git a/tools/test/scenarios/net-setup-trellis-p4.xml b/tools/test/scenarios/net-setup-trellis-p4.xml
index fe3112d..fae54f8 100644
--- a/tools/test/scenarios/net-setup-trellis-p4.xml
+++ b/tools/test/scenarios/net-setup-trellis-p4.xml
@@ -75,14 +75,14 @@
<group name="Trellis-Net-P4-Setup.Verify-Apps" requires="Trellis-Net-P4-Setup.Activate-Apps">
<parallel var="${OC#}">
- <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} drivers.bmv2,pipelines.fabric,generaldeviceprovider includes"
+ <step name="Trellis-Net-P4-Setup.Check-Apps-${#}" exec="onos-check-apps ${OC#} drivers.bmv2,pipelines.fabric,generaldeviceprovider includes"
requires="Trellis-Net-P4-Setup.Activate-Apps"/>
</parallel>
</group>
<group name="Trellis-Net-P4-Setup.Verify-Pipeconfs" requires="Trellis-Net-P4-Setup.Verify-Apps">
<parallel var="${OC#}">
- <step name="Check-Pipeconfs-${#}" exec="onos-check-pipeconfs ${OC#} org.onosproject.pipelines.fabric includes"
+ <step name="Trellis-Net-P4-Setup.Check-Pipeconfs-${#}" exec="onos-check-pipeconfs ${OC#} org.onosproject.pipelines.fabric includes"
requires="Trellis-Net-P4-Setup.Verify-Apps"/>
</parallel>
</group>
diff --git a/tools/test/scenarios/net-trellis-hag-smoke.xml b/tools/test/scenarios/net-trellis-hag-smoke.xml
index 7109457..14fdf8d 100644
--- a/tools/test/scenarios/net-trellis-hag-smoke.xml
+++ b/tools/test/scenarios/net-trellis-hag-smoke.xml
@@ -20,7 +20,7 @@
<import file="${ONOS_SCENARIOS}/net-setup-trellis-hag.xml"/>
- <step name="Check-Summary" requires="Trellis-Net-HAG-Setup.Wait-For-Mininet" delay="15"
+ <step name="Check-Summary" requires="Net-Trellis-HAG-Setup.Wait-For-Mininet" delay="15"
exec="onos-check-summary ${OC1} [0-9]* 10 48 22"/>
<import file="${ONOS_SCENARIOS}/net-trellis-hag-connectivity.xml"/>
diff --git a/tools/test/scenarios/net-trellis-p4-smoke.xml b/tools/test/scenarios/net-trellis-p4-smoke.xml
index b27b5c1..0033aeb 100644
--- a/tools/test/scenarios/net-trellis-p4-smoke.xml
+++ b/tools/test/scenarios/net-trellis-p4-smoke.xml
@@ -18,46 +18,49 @@
<scenario name="net-trellis-p4-smoke"
description="Trellis P4 network connectivity test steps">
- <import file="${ONOS_SCENARIOS}/net-setup-trellis-p4.xml"/>
+ <group name="Net-Trellis-P4-Setup">
- <step name="Net-Trellis-P4-Smoke.Check-Summary"
- requires="Trellis-Net-P4-Setup.Wait-For-Mininet" delay="5"
- exec="onos-check-summary ${OC1} [0-9]* 4 8 0 112"/>
+ <import file="${ONOS_SCENARIOS}/net-setup-trellis-p4.xml"/>
- <import file="${ONOS_SCENARIOS}/net-trellis-p4-devices.xml"/>
- <dependency name="Net-Trellis-P4-Devices"
- requires="Net-Trellis-P4-Smoke.Check-Summary"/>
+ <step name="Net-Trellis-P4-Smoke.Check-Summary"
+ requires="Trellis-Net-P4-Setup.Wait-For-Mininet" delay="5"
+ exec="onos-check-summary ${OC1} [0-9]* 4 8 0 112"/>
- <import file="${ONOS_SCENARIOS}/net-trellis-p4-links.xml"/>
- <dependency name="Net-Trellis-P4-Links"
- requires="Net-Trellis-P4-Smoke.Check-Summary"/>
+ <import file="${ONOS_SCENARIOS}/net-trellis-p4-devices.xml"/>
+ <dependency name="Net-Trellis-P4-Devices"
+ requires="Net-Trellis-P4-Smoke.Check-Summary"/>
- <import file="${ONOS_SCENARIOS}/net-trellis-p4-connectivity.xml"/>
- <dependency name="Net-Trellis-P4-Connectivity-Host-Discovery"
- requires="Net-Trellis-P4-Smoke.Check-Summary"/>
+ <import file="${ONOS_SCENARIOS}/net-trellis-p4-links.xml"/>
+ <dependency name="Net-Trellis-P4-Links"
+ requires="Net-Trellis-P4-Smoke.Check-Summary"/>
- <import file="${ONOS_SCENARIOS}/net-trellis-p4-hosts.xml"/>
- <dependency name="Net-Trellis-P4-Hosts"
- requires="Net-Trellis-P4-Connectivity-Host-Discovery"/>
+ <import file="${ONOS_SCENARIOS}/net-trellis-p4-connectivity.xml"/>
+ <dependency name="Net-Trellis-P4-Connectivity-Host-Discovery"
+ requires="Net-Trellis-P4-Smoke.Check-Summary"/>
- <!-- Check additional flow rules for discovered hosts -->
- <step name="Net-Trellis-P4-Smoke.Check-Summary-2"
- requires="Net-Trellis-P4-Connectivity-Host-Discovery" delay="3"
- exec="onos-check-summary ${OC1} [0-9]* 4 8 4 136"/>
+ <import file="${ONOS_SCENARIOS}/net-trellis-p4-hosts.xml"/>
+ <dependency name="Net-Trellis-P4-Hosts"
+ requires="Net-Trellis-P4-Connectivity-Host-Discovery"/>
- <dependency name="Net-Trellis-P4-Connectivity-Bridging"
- requires="Net-Trellis-P4-Smoke.Check-Summary-2"/>
- <dependency name="Net-Trellis-P4-Connectivity-Routing"
- requires="Net-Trellis-P4-Smoke.Check-Summary-2,~Net-Trellis-P4-Connectivity-Bridging"/>
+ <!-- Check additional flow rules for discovered hosts -->
+ <step name="Net-Trellis-P4-Smoke.Check-Summary-2"
+ requires="Net-Trellis-P4-Connectivity-Host-Discovery" delay="3"
+ exec="onos-check-summary ${OC1} [0-9]* 4 8 4 136"/>
- <import file="${ONOS_SCENARIOS}/net-teardown.xml"/>
- <dependency name="Net-Teardown"
- requires="~Net-Trellis-P4-Devices,~Net-Trellis-P4-Links,~Net-Trellis-P4-Hosts,~Net-Trellis-P4-Connectivity-Bridging,~Net-Trellis-P4-Connectivity-Routing"/>
+ <dependency name="Net-Trellis-P4-Connectivity-Bridging"
+ requires="Net-Trellis-P4-Smoke.Check-Summary-2"/>
+ <dependency name="Net-Trellis-P4-Connectivity-Routing"
+ requires="Net-Trellis-P4-Smoke.Check-Summary-2,~Net-Trellis-P4-Connectivity-Bridging"/>
- <parallel var="${OC#}">
- <step name="Net-Trellis-P4-Smoke-Check-Logs-${#}"
- requires="~Net-Teardown"
- exec="onos-check-logs ${OC#}"/>
- </parallel>
+ <import file="${ONOS_SCENARIOS}/net-teardown.xml"/>
+ <dependency name="Net-Teardown"
+ requires="~Net-Trellis-P4-Devices,~Net-Trellis-P4-Links,~Net-Trellis-P4-Hosts,~Net-Trellis-P4-Connectivity-Bridging,~Net-Trellis-P4-Connectivity-Routing"/>
+
+ <parallel var="${OC#}">
+ <step name="Net-Trellis-P4-Smoke-Check-Logs-${#}"
+ requires="~Net-Teardown"
+ exec="onos-check-logs ${OC#}"/>
+ </parallel>
+ </group>
</scenario>
diff --git a/tools/test/scenarios/smoke-trellis-hag.xml b/tools/test/scenarios/smoke-trellis-hag.xml
new file mode 100644
index 0000000..27eda6b
--- /dev/null
+++ b/tools/test/scenarios/smoke-trellis-hag.xml
@@ -0,0 +1,30 @@
+<!--
+ ~ Copyright 2015-present Open Networking Foundation
+ ~
+ ~ 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="smoke-trellis-hag" description="ONOS Trellis HAG smoke test">
+
+ <import file="${ONOS_SCENARIOS}/prerequisites.xml"/>
+ <import file="${ONOS_SCENARIOS}/net-prerequisites.xml"/>
+ <import file="${ONOS_SCENARIOS}/setup.xml"/>
+
+ <dependency name="Setup" requires="Prerequisites,Net-Prerequisites"/>
+
+ <import file="${ONOS_SCENARIOS}/net-trellis-hag-smoke.xml"/>
+ <dependency name="Net-Trellis-HAG-Setup" requires="Setup"/>
+
+ <import file="${ONOS_SCENARIOS}/wrapup.xml"/>
+ <dependency name="Wrapup" requires="~Setup,~Net-Trellis-HAG-Setup"/>
+
+</scenario>
diff --git a/tools/test/scenarios/smoke-trellis-p4.xml b/tools/test/scenarios/smoke-trellis-p4.xml
new file mode 100644
index 0000000..fdef397
--- /dev/null
+++ b/tools/test/scenarios/smoke-trellis-p4.xml
@@ -0,0 +1,30 @@
+<!--
+ ~ Copyright 2015-present Open Networking Foundation
+ ~
+ ~ 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="smoke-trellis-p4" description="ONOS Trellis P4 smoke test">
+
+ <import file="${ONOS_SCENARIOS}/prerequisites.xml"/>
+ <import file="${ONOS_SCENARIOS}/net-prerequisites.xml"/>
+ <import file="${ONOS_SCENARIOS}/setup.xml"/>
+
+ <dependency name="Setup" requires="Prerequisites,Net-Prerequisites"/>
+
+ <import file="${ONOS_SCENARIOS}/net-trellis-p4-smoke.xml"/>
+ <dependency name="Net-Trellis-P4-Setup" requires="Setup"/>
+
+ <import file="${ONOS_SCENARIOS}/wrapup.xml"/>
+ <dependency name="Wrapup" requires="~Setup,~Net-Trellis-P4-Setup"/>
+
+</scenario>