[dts] [next][PATCH V1 7/14] framework/pktgen: initialize pktgen logger

yufengmx yufengx.mo at intel.com
Sun Apr 28 04:49:04 CEST 2019


initialize pktgen logger

Set packet generator logger name and add check condition for ixia/etgen logger.

Signed-off-by: yufengmx <yufengx.mo at intel.com>
---
 framework/dts.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/framework/dts.py b/framework/dts.py
index b6f91b7..7a1200b 100644
--- a/framework/dts.py
+++ b/framework/dts.py
@@ -1,6 +1,6 @@
 # BSD LICENSE
 #
-# Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
+# Copyright(c) 2010-2019 Intel Corporation. All rights reserved.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,6 @@ import sys
 reload(sys)
 sys.setdefaultencoding('UTF8')
 
-
 requested_tests = None
 result = None
 excel_report = None
@@ -244,8 +243,13 @@ def dts_log_testsuite(duts, tester, suite_obj, log_handler, test_classname):
 
     try:
         if tester.it_uses_external_generator():
-            getattr(tester, 'ixia_packet_gen')
-            tester.ixia_packet_gen.logger.config_suite(test_classname, 'ixia')
+            if tester.is_pktgen and \
+               hasattr(tester, 'pktgen') and \
+               getattr(tester, 'pktgen'):
+                tester.pktgen.logger.config_suite(test_classname, 'pktgen')
+            elif hasattr(tester, 'ixia_packet_gen') and \
+                 getattr(tester, 'ixia_packet_gen'):
+                tester.ixia_packet_gen.logger.config_suite(test_classname, 'ixia')
     except Exception as ex:
         pass
 
@@ -262,8 +266,13 @@ def dts_log_execution(duts, tester, log_handler):
 
     try:
         if tester.it_uses_external_generator():
-            getattr(tester, 'ixia_packet_gen')
-            tester.ixia_packet_gen.logger.config_execution('ixia')
+            if tester.is_pktgen and \
+               hasattr(tester, 'pktgen') and \
+               getattr(tester, 'pktgen'):
+                tester.pktgen.logger.config_execution('pktgen')
+            elif hasattr(tester, 'ixia_packet_gen') and \
+                 getattr(tester, 'ixia_packet_gen'):
+                tester.ixia_packet_gen.logger.config_execution('ixia')
     except Exception as ex:
         pass
 
-- 
1.9.3



More information about the dts mailing list