Update expected tshark output in portLat and switchLat tests
Change-Id: Ib7ba52ac919fe08e527efb3d9c0aeac0f22bc5bf
(cherry picked from commit 2eda181ca05a5e4d7fa348a1cbe6b15180acbf67)
diff --git a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.params b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.params
index 7a08b43..c540850 100644
--- a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.params
+++ b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.params
@@ -33,7 +33,7 @@
</CFG>
<TSHARK>
<tsharkReusltPath>/tmp/tshark_portStatus</tsharkReusltPath>
- <ofpPortStatus>OF 1.3 146</ofpPortStatus>
+ <ofpPortStatus>OpenFlow 146</ofpPortStatus>
</TSHARK>
<SLEEP>
<startup>5</startup>
diff --git a/TestON/tests/SCPF/SCPFportLat/dependencies/portFunc.py b/TestON/tests/SCPF/SCPFportLat/dependencies/portFunc.py
index 4c94193..10dc7ce 100644
--- a/TestON/tests/SCPF/SCPFportLat/dependencies/portFunc.py
+++ b/TestON/tests/SCPF/SCPFportLat/dependencies/portFunc.py
@@ -51,7 +51,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 = int( float( resultText[ 1 ] ) * 1000.0 )
resultFile.close()
diff --git a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.params b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.params
index 134256b..a52690a 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.params
+++ b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.params
@@ -50,15 +50,15 @@
<TSHARK>
<up>
- <TCP>openflow\ \[SYN\]</TCP> #1
- <RQ>OF 1.3 90 of_role_request</RQ> #2
- <RR>OF 1.3 90 of_role_reply</RR> #3
- <Feature>OF 1.3 98 of_features_reply</Feature>#4
+ <TCP>6653\ \[SYN\]</TCP> #1
+ <RQ>OpenFlow 90 Type: OFPT_ROLE_REQUEST</RQ> #2
+ <RR>OpenFlow 90 Type: OFPT_ROLE_REPLY</RR> #3
+ <Feature>OpenFlow 98 Type: OFPT_FEATURES_REPLY</Feature> #4
</up>
<down>
<FA>\[FIN,\ ACK\]</FA>
- <ACK>openflow\ \[ACK\]</ACK>
+ <ACK>6653\ \[ACK\]</ACK>
</down>
</TSHARK>
diff --git a/TestON/tests/SCPF/SCPFswitchLat/dependencies/switchFunc.py b/TestON/tests/SCPF/SCPFswitchLat/dependencies/switchFunc.py
index b9463c2..4c26b59 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/dependencies/switchFunc.py
+++ b/TestON/tests/SCPF/SCPFswitchLat/dependencies/switchFunc.py
@@ -59,7 +59,7 @@
package: Package String
"""
- pacakge = package.split( " " )
+ pacakge = package.strip().split( " " )
dic = {}
for s in pacakge:
try:
@@ -101,7 +101,7 @@
for term in keyTerm:
if term in line:
# Exclude non-openflow FIN packets
- if term == "[FIN, ACK]" and "openflow" not in line:
+ if term == "[FIN, ACK]" and "6653" not in line:
continue
path = '/tmp/Tshark_' + str( keyTerm[ term ] )
with open( path, 'a' ) as outputfile: