commit 0c6f0a547478015f79080967bf9273d81a9948ba
author Carmelo Cascone <carmelo@opennetworking.org> Thu Dec 13 23:16:10 2018 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Thu Dec 13 23:20:49 2018 -0800
tree 772040667a992b051a7ae2855cf1d1d4386dfa71
parent 6d57f328737d01c14381133e66850f6e5869d614

Working STC trellis-p4 scenario with connectivity test

Change-Id: I3ec166856a6a8a3ee705d392ace74b0677aa7ad5

tools/test/scenarios/net-trellis-p4-smoke.xml

diff --git a/tools/test/scenarios/net-trellis-p4-smoke.xml b/tools/test/scenarios/net-trellis-p4-smoke.xml
index 0ced6c1..b27b5c1 100644
--- a/tools/test/scenarios/net-trellis-p4-smoke.xml
+++ b/tools/test/scenarios/net-trellis-p4-smoke.xml
@@ -15,22 +15,48 @@
   -->
 
 
-
-<scenario name="net-trellis-p4-smoke" description="Trellis P4 network connectivity test steps">
+<scenario name="net-trellis-p4-smoke"
+          description="Trellis P4 network connectivity test steps">
 
     <import file="${ONOS_SCENARIOS}/net-setup-trellis-p4.xml"/>
 
-    <step name="Net-Trellis-P4-Smoke.Check-Summary" requires="Trellis-Net-P4-Setup.Wait-For-Mininet" delay="15"
+    <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-devices.xml"/>
-    <dependency name="Net-Trellis-P4-Devices" requires="Net-Trellis-P4-Smoke.Check-Summary"/>
+    <dependency name="Net-Trellis-P4-Devices"
+                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-connectivity.xml"/>
+    <dependency name="Net-Trellis-P4-Connectivity-Host-Discovery"
+                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"/>
+
+    <!-- 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"/>
+
+    <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"/>
 
     <import file="${ONOS_SCENARIOS}/net-teardown.xml"/>
-    <dependency name="Net-Teardown" requires="Net-Trellis-P4-Smoke.Check-Summary"/>
+    <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"
+        <step name="Net-Trellis-P4-Smoke-Check-Logs-${#}"
+              requires="~Net-Teardown"
               exec="onos-check-logs ${OC#}"/>
     </parallel>