commit 2a2ea60943ec353a1847433175c130f44188b2eb
author You Wang <you@onlab.us> Thu Sep 01 23:12:23 2016 +0000
committer Gerrit Code Review <gerrit@onlab.us> Thu Sep 01 23:12:23 2016 +0000
tree 21a4e902da933181696653578ec1829a914612d0
parent 98ac97f816cec04827429ac639eb77c4729b0f72
parent 21722ec5056db6dfd67a867d9ea6e957d4913134

Merge "Temporarily fix the negative values in switch up latency test"

TestON/tests/SCPF/SCPFswitchLat/dependencies/switchFunc.py

diff --git a/TestON/tests/SCPF/SCPFswitchLat/dependencies/switchFunc.py b/TestON/tests/SCPF/SCPFswitchLat/dependencies/switchFunc.py
index 77a6c7e..729f84b 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/dependencies/switchFunc.py
+++ b/TestON/tests/SCPF/SCPFswitchLat/dependencies/switchFunc.py
@@ -165,6 +165,11 @@
                 main.log.warn("Error to decode Json object!")
                 break
             try:
+                #FIXME: the Device Event (PORT_ADD) we got from metrics app is not the one generated Graph Event
+                if DeviceTime > GraphTime:
+                    # This fixes the negative latency values. However we are not using the right Device Event
+                    # timestamp. This should be fixed later.
+                    DeviceTime = GraphTime
                 RR_Dtemp = DeviceTime - tempResultDict['RR']
                 D_Gtemp = GraphTime - DeviceTime
                 E_Etemp = GraphTime - tempResultDict['TCP']