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-hosts.xml b/tools/test/scenarios/net-trellis-p4-hosts.xml
index 287cbe7..0ad2c59 100644
--- a/tools/test/scenarios/net-trellis-p4-hosts.xml
+++ b/tools/test/scenarios/net-trellis-p4-hosts.xml
@@ -20,13 +20,13 @@
<group name="Net-Trellis-P4-Hosts">
<step name="Net-Trellis-P4-Hosts.Host-1"
- exec="onos-find-host ${OC1} 00:AA:00:00:00:01 device:bmv2:s204/3 10.0.2.1"/>
+ exec="onos-find-host ${OC1} 00:AA:00:00:00:01 device:s204/3 10.0.2.1"/>
<step name="Net-Trellis-P4-Hosts.Host-2"
- exec="onos-find-host ${OC1} 00:AA:00:00:00:02 device:bmv2:s204/4 10.0.2.2"/>
+ exec="onos-find-host ${OC1} 00:AA:00:00:00:02 device:s204/4 10.0.2.2"/>
<step name="Net-Trellis-P4-Hosts.Host-3"
- exec="onos-find-host ${OC1} 00:AA:00:00:00:03 device:bmv2:s205/3 10.0.3.1"/>
+ exec="onos-find-host ${OC1} 00:AA:00:00:00:03 device:s205/3 10.0.3.1"/>
<step name="Net-Trellis-P4-Hosts.Host-4"
- exec="onos-find-host ${OC1} 00:AA:00:00:00:04 device:bmv2:s205/4 10.0.3.2"/>
+ exec="onos-find-host ${OC1} 00:AA:00:00:00:04 device:s205/4 10.0.3.2"/>
</group>
</scenario>