commit 34d116cbf92c32127bc583d8dbf5027cc0340123
author Carmelo Cascone <carmelo@opennetworking.org> Wed Mar 13 18:58:41 2019 -0700
committer Carmelo Cascone <carmelo@opennetworking.org> Thu Mar 14 06:10:59 2019 +0000
tree 9495b77ae7936eb6501a7ff0da3060f2c305a3a2
parent b4863b3f40a617d312389227c4f49cd5797cc18a

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

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

diff --git a/tools/test/scenarios/net-trellis-p4-devices.xml b/tools/test/scenarios/net-trellis-p4-devices.xml
index 1b79eab..76e3632 100644
--- a/tools/test/scenarios/net-trellis-p4-devices.xml
+++ b/tools/test/scenarios/net-trellis-p4-devices.xml
@@ -21,17 +21,17 @@
         <group name="Net-Trellis-P4-Devices">
 
             <step name="Net-Trellis-P4-Devices.Device-1"
-                  exec="onos-find-device ${OC1} device:bmv2:s204"/>
+                  exec="onos-find-device ${OC1} device:s204"/>
 
             <step name="Net-Trellis-P4-Devices.Device-2"
-                  exec="onos-find-device ${OC1} device:bmv2:s205"/>
+                  exec="onos-find-device ${OC1} device:s205"/>
 
             <step name="Net-Trellis-P4-Devices.Device-3"
-                  exec="onos-find-device ${OC1} device:bmv2:s226"/>
+                  exec="onos-find-device ${OC1} device:s226"/>
 
             <step name="Net-Trellis-P4-Devices.Device-4"
-                  exec="onos-find-device ${OC1} device:bmv2:s227"/>
+                  exec="onos-find-device ${OC1} device:s227"/>
 
         </group>
 
-</scenario>
\ No newline at end of file
+</scenario>