Fix net-trellis-p4-smoke not working with latest stratum_bmv2
- Fix scenario files to use correct deviceId
- More robust liveness check in bmv2.py
- Use different ports for stratum internal server
- Longer switch startup timeout in bmv2.py
- Ignore number of flow rules when checking summary (make scenario
independent of trellis implementation)
Change-Id: I206e5339d2e78ae9a025caa5ec4862a9d4c24871
diff --git a/tools/test/scenarios/net-trellis-p4-smoke.xml b/tools/test/scenarios/net-trellis-p4-smoke.xml
index 0033aeb..cb80cd7 100644
--- a/tools/test/scenarios/net-trellis-p4-smoke.xml
+++ b/tools/test/scenarios/net-trellis-p4-smoke.xml
@@ -24,7 +24,7 @@
<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"/>
+ exec="onos-check-summary ${OC1} [0-9]* 4 8 0 [0-9]*"/>
<import file="${ONOS_SCENARIOS}/net-trellis-p4-devices.xml"/>
<dependency name="Net-Trellis-P4-Devices"