commit aa256a75d817785be5d9f7cb6ade01a1b3e4115e
author Devin Lim <devin@opennetworking.org> Fri Oct 13 13:40:30 2017 -0700
committer Devin Lim <devin@opennetworking.org> Tue Oct 17 15:33:41 2017 -0700
tree bb7c4257ad2d8833c1482995c79881ee6dc08f7c
parent 5eac6973f45b67b83029c2f1067e2ca221570677

[ONOS-7112] investigate SCPFswitchLat failure and fix the issue

Change-Id: Ia06c6f58602f5955ead9a108cf05dd0ca2aac2cc

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 7a159ba..a96fc20 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/dependencies/switchFunc.py
+++ b/TestON/tests/SCPF/SCPFswitchLat/dependencies/switchFunc.py
@@ -131,7 +131,7 @@
 
     """
     if result < int( main.resultRange[ 'Min' ] ) or result > int( main.resultRange[ 'Max' ] ):
-        main.log.debug( str( result ) + " is not meet the requirement" )
+        main.log.warn( str( result ) + " is not meet the requirement" )
         return 0
     return 1
 
@@ -290,8 +290,15 @@
             # get onos metrics timestamps
             try:
                 response = json.loads( main.Cluster.active( i - 1 ).CLI.topologyEventsMetrics() )
+
+                # Just to show the other event times.
+                main.log.info( "ONOS{} device Event timestamp: {}".format(
+                    i, int( response.get( "topologyDeviceEventTimestamp" ).get( "value" ) ) ) )
+                main.log.info( "ONOS{} graph reason Event timestamp: {}".format(
+                    i, int( response.get( "topologyGraphReasonsEventTimestamp" ).get( "value" ) ) ) )
+
                 DeviceTime = getTimestampFromLog( i - 1, searchTerm=main.searchTerm[ switchStatus ] )
-                main.log.info( "ONOS{} device Event timestamp: {}".format( i, "%.2f" % DeviceTime ) )
+                main.log.info( "ONOS{} device from karaf log: {}".format( i, DeviceTime ) )
                 GraphTime = int( response.get( "topologyGraphEventTimestamp" ).get( "value" ) )
                 main.log.info( "ONOS{} Graph Event timestamp: {}".format( i, GraphTime ) )
             except TypeError:
@@ -370,8 +377,14 @@
             # get onos metrics timestamps
             try:
                 response = json.loads( main.Cluster.active( i - 1 ).CLI.topologyEventsMetrics() )
+                # Just to show the other event times.
+                main.log.info( "ONOS{} device Event timestamp: {}".format(
+                    i, int( response.get( "topologyDeviceEventTimestamp" ).get( "value" ) ) ) )
+                main.log.info( "ONOS{} graph reason Event timestamp: {}".format(
+                    i, int( response.get( "topologyGraphReasonsEventTimestamp" ).get( "value" ) ) ) )
+
                 DeviceTime = getTimestampFromLog( i - 1, searchTerm=main.searchTerm[ switchStatus ] )
-                main.log.info( "ONOS{} device Event timestamp: {}".format( i, DeviceTime ) )
+                main.log.info( "ONOS{} device from karaf log: {}".format( i, DeviceTime ) )
                 GraphTime = int( response.get( "topologyGraphEventTimestamp" ).get( "value" ) )
                 main.log.info( "ONOS{} Graph Event timestamp: {}".format( i, GraphTime ) )
             except TypeError: