From 689f862f24f949361603a808250ae3f7ec9f40f6 Mon Sep 17 00:00:00 2001
From: Shwetha-H-Panduranga <shwetha@gluster.com>
Date: Mon, 12 Dec 2011 11:29:47 +0530
Subject: Changes to logger class, Using the logger class in the framework,
 adding new global values, Changes made to argument parser, testruninfo

---
 atfsetup.py | 58 +++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 21 deletions(-)

(limited to 'atfsetup.py')

diff --git a/atfsetup.py b/atfsetup.py
index 8631ab4..f8eb99a 100644
--- a/atfsetup.py
+++ b/atfsetup.py
@@ -1,37 +1,53 @@
 """atf setup
 """
-
+import re
+import os.path
 from atfglobals import GlobalObj
+import parser
 
 def _setup_loggers():
     """
     """
-    testruninfo_obj = GlobalObj.getTestrunInfoObj()
-    logger_obj = GlobalObj.getLoggerObj()
-    
-    summaryloginfo = testruninfo_obj.getSummaryLogInfo()
-    detailloginfo = testruninfo_obj.getDetailLogInfo()
-    stdoutloginfo = testruninfo_obj.getStdoutLogInfo()
-    
-    logger_obj.setSummaryLog(summaryloginfo['filename'],
-                             summaryloginfo['loglevel'])
-    loggerobj.setDetailLog(detailloginfo['filename'],
-                           detailloginfo['loglevel'])
-    loggerobj.setStdoutLog(stdoutloginfo['do_log'],
-                           stdoutloginfo['loglevel'])
+    return_status = 1
+    GlobalObj.initLoggerObj()
+    atfdir = GlobalObj.atfdir
+    summarylog_file = GlobalObj.summarylog_file
+    summarylog_level = GlobalObj.summarylog_level
+    stdout_dolog = GlobalObj.stdout_dolog
+    stdoutlog_level = GlobalObj.stdoutlog_level
+    logger = GlobalObj.getLoggerObj()
+
+    summarylog_abspath = os.path.join(atfdir, summarylog_file)
+    if logger.addSummarylogHandler(summarylog_abspath, summarylog_level):
+        print "IOError: %s" % "Error in Creating SummaryLog"
+        return return_status
+    if re.match("yes", stdout_dolog, re.IGNORECASE):
+        logger.addStdoutlogHandler(stdoutlog_level)
     
-    atfdir = testruninfo_obj.getAtfDir()
-    return_status = logger_obj.createLogger(atfdir)
-    if return_status:
-        print "Unable to create Loggers"
-    return return_status
+    return 0
 
+def _setup_testrun_info():
+    """
+    """
+    testrun_info_file = GlobalObj.testruninfo_file
+    return_status = parser.parse_testrun_info_file(testrun_info_file)
+    return return_status
+    
 def setup():
     """
-    *) Setup SummaryLogs , DetailLogs Handlers
+    # Setup Summary/Detail/Stdout LogHandlers
+    # Parser TestRunInfo file
+    #
     """
     return_status = _setup_loggers()
-    return return_status
+    if return_status:
+        return return_status
+    
+    return_status = _setup_testrun_info()
+    if return_status:
+        return return_status
+    
+    return 0
 
 __all__ = ['setup']
 
-- 
cgit