Update expected tshark output in hostLat, scaleTopo and mastershipFailoverLat tests
Change-Id: I15a36ea8fdfd560fb128383f4ce8733a12566914
diff --git a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.params b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.params
index adc0a01..041ec60 100644
--- a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.params
+++ b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.params
@@ -36,7 +36,7 @@
<TSHARK>
<tsharkPath>/tmp/hostLatTshark</tsharkPath>
- <tsharkPacketIn>OF 1.3 150 of_packet_in</tsharkPacketIn>
+ <tsharkPacketIn>OpenFlow 150 Type: OFPT_PACKET_IN</tsharkPacketIn>
</TSHARK>
<TEST>
diff --git a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
index a658e23..967dcff 100644
--- a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
+++ b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
@@ -206,7 +206,7 @@
with open( main.tsharkResultPath, "r" ) as resultFile:
resultText = resultFile.readline()
main.log.info( 'Capture result:' + resultText )
- resultText = resultText.split( ' ' )
+ resultText = resultText.strip().split( ' ' )
if len( resultText ) > 1:
tsharkResultTime = float( resultText[ 1 ] ) * 1000.0
else:
diff --git a/TestON/tests/SCPF/SCPFmastershipFailoverLat/SCPFmastershipFailoverLat.params b/TestON/tests/SCPF/SCPFmastershipFailoverLat/SCPFmastershipFailoverLat.params
index fa17b67..2a95f8d 100644
--- a/TestON/tests/SCPF/SCPFmastershipFailoverLat/SCPFmastershipFailoverLat.params
+++ b/TestON/tests/SCPF/SCPFmastershipFailoverLat/SCPFmastershipFailoverLat.params
@@ -25,7 +25,7 @@
<TSHARK>
<tsharkResultPath>/tmp/tshark_mastership_failover</tsharkResultPath>
- <ofpRoleRequest>OF 1.3 90 of_role_request</ofpRoleRequest>
+ <ofpRoleRequest>OpenFlow 90 Type: OFPT_ROLE_REQUEST</ofpRoleRequest>
</TSHARK>
<SLEEP>
diff --git a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params
index ccec992..0c34b5c 100755
--- a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params
+++ b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params
@@ -38,7 +38,7 @@
<start>New switch connection</start>
<end>Topology DefaultTopology</end>
<Disconnect>Switch disconnected callback</Disconnect>
- <roleRequest>of_role_request</roleRequest>
+ <roleRequest>OpenFlow 90 Type: OFPT_ROLE_REQUEST</roleRequest>
</SearchTerm>
<GIT>