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/bin/mininet-p4-trellis b/tools/test/scenarios/bin/mininet-p4-trellis
index b5a3593..db19cc4 100755
--- a/tools/test/scenarios/bin/mininet-p4-trellis
+++ b/tools/test/scenarios/bin/mininet-p4-trellis
@@ -4,7 +4,6 @@
# Starts mininet in the network machine with the Trellis P4 topology
# -----------------------------------------------------------------------------
-set -e
set -x
[[ ! -d "$ONOS_ROOT" ]] && echo "ONOS_ROOT is not defined" >&2 && exit 1
@@ -25,7 +24,7 @@
"
(
- ssh -t -t ${remote} "screen -L -S mininet sudo ${trellisp4Sh}"
+ ssh -t -t ${remote} "screen -L -S mininet ${trellisp4Sh}"
scp ${ONOS_USER}@[${OCN}]:$log /tmp/mininet.log
ssh ${remote} rm -f $log
) &