diff options
Diffstat (limited to 'libs/globals')
| -rw-r--r-- | libs/globals/atfglobals.py | 53 | ||||
| -rwxr-xr-x | libs/globals/testenv.py | 22 | ||||
| -rw-r--r-- | libs/globals/testruninfo.py | 74 |
3 files changed, 49 insertions, 100 deletions
diff --git a/libs/globals/atfglobals.py b/libs/globals/atfglobals.py index ff1faad..f1e6946 100644 --- a/libs/globals/atfglobals.py +++ b/libs/globals/atfglobals.py @@ -16,28 +16,43 @@ import testenv import manager class AtfGlobals: - - def __init__(self): self._testruninfo = None - self._logger = logger.Log() + self._logger = None self._env = None - self._connectionsmanager = manager.ConnectionsManager() - - def getTestrunInfoObj(self): - """Returns TestrunInfo Object + self._connectionsmanager = None + self.logname = "ATFLOG" + self.atfdir = None + self.testruninfo_file = None + self.summarylog_file = "summarylog.out" + self.summarylog_level = 'INFO' + self.detaillog_file = "detaillog.out" + self.detaillog_level = 'DEBUG' + self.stdoutlog_dolog = 'yes' + self.stdoutlog_level = 'INFO' + self.testunits_maindir = "TestUnits" + self.testunit_mainmodule = "testunit" + self.testenv_file = "testenv.cfg" + self.testcaseslist_file = "testcaseslist" + self.glusterd_dir = "/etc/glusterd/*" + self.glusterd_log_paths = ["/var/log/glusterfs/*.log", + "/var/log/glusterfs/bricks/*"] + + + def initLoggerObj(self): + """Instantiation of Logger Object """ - return self._testruninfo - + self._logger = logger.Log(self.logname) + def getLoggerObj(self): """Returns Logger Object """ return self._logger - def getTestenvObj(self): - """Returns Current TestEnvironment Object. + def initConnectionsManagerObj(self): + """Instantiation of ConnectionsManager Object """ - return self._env + self._connectionsmanager = manager.ConnectionsManager() def getConnectionsManagerObj(self): """Returns ConnectionsManager Object @@ -48,21 +63,21 @@ class AtfGlobals: """Instantiation of TestrunInfo Object """ self._testruninfo = testruninfo.TestRunInfo() - - def initLoggerObj(self): - """Instantiation of Logger Object + + def getTestrunInfoObj(self): + """Returns TestrunInfo Object """ - self._logger = logger.Log() + return self._testruninfo def initTestenvObj(self): """Instantiation of Testenv Object """ self._env = testenv.TestEnv() - def initConnectionsManagerObj(self): - """Instantiation of ConnectionsManager Object + def getTestenvObj(self): + """Returns Current TestEnvironment Object. """ - self._connectionsmanager = manager.ConnectionsManager() + return self._env GlobalObj = AtfGlobals() __all__ = ['GlobalObj'] diff --git a/libs/globals/testenv.py b/libs/globals/testenv.py index 9aa8ec8..0720c2c 100755 --- a/libs/globals/testenv.py +++ b/libs/globals/testenv.py @@ -23,7 +23,7 @@ class TestEnv(): self._active_volume = None self._exportdir_tuple = namedtuple('ExportDir', - ['dir', 'fstype', 'device']) + ['dir', 'fstype', 'device', 'options']) self._server_tuple = namedtuple('Server', ['hostname', 'user', 'password', @@ -50,14 +50,19 @@ class TestEnv(): def addExportdir(self, key, dir_, **arguments): """ """ - fstype = device = None + fstype = None + device = None + options = None if (arguments.has_key('fstype') and arguments['fstype']): fstype = arguments['fstype'] if (arguments.has_key('device') and arguments['device']): device = arguments['device'] - - exportdir_obj = self._exportdir_tuple(dir_, fstype, device) + + if (arguments.has_key('options') and arguments['options']): + options = arguments['options'] + + exportdir_obj = self._exportdir_tuple(dir_, fstype, device, options) self._exportdirs[key] = exportdir_obj def getExportdir(self, exportdirkey): @@ -167,7 +172,7 @@ class TestEnv(): path_value = brick_obj.path if re.match("^\/", path_value): - path = path_value + newpath = path_value else: exportdir_obj = self.getExportdir(path_value) if exportdir_obj: @@ -204,11 +209,14 @@ class TestEnv(): brick_keys.extend(self._bricks.keys()) return brick_keys - def addBricksToVolume(self, volumekey="ActiveVolume", *bricks): + def addBricksToVolume(self, *bricks, **arguments): """ """ volume_obj = None - if volumekey == "ActiveVolume": + + if arguments.has_key("volumekey"): + volumekey = arguments[volumekey] + else: volumekey = self._active_volume if not (volumekey and self._volumes.has_key(volumekey)): diff --git a/libs/globals/testruninfo.py b/libs/globals/testruninfo.py index 9b012e8..76137f1 100644 --- a/libs/globals/testruninfo.py +++ b/libs/globals/testruninfo.py @@ -10,10 +10,6 @@ class TestRunInfo(): self._testunits = [] self._keywords = '' self._glusterversion = '' - self._atfdir = '' - self._summaryloginfo = {} - self._detailloginfo = {} - self._stdoutloginfo = {} def addGlusterVersion(self, version): """ @@ -24,77 +20,7 @@ class TestRunInfo(): """ """ return self._glusterversion - - def addSummaryLogInfo(self, filename, loglevel): - """ - """ - if not filename: - filename = "SummaryLog.out" - - if not loglevel: - loglevel = "info" - - self._summaryloginfo['filename'] = filename - self._summaryloginfo['loglevel'] = loglevel - - def getSummaryLogInfo(self): - """ - """ - return self._summaryloginfo - - def addDetailLogInfo(self, filename, loglevel): - """ - """ - if not filename: - filename = "DetailLog.out" - - if not loglevel: - loglevel = "info" - - self._detailloginfo['filename'] = filename - self._detailloginfo['loglevel'] = loglevel - - def getDetailLogInfo(self): - """ - """ - return self._detailloginfo - def addStdoutLogInfo(self, do_log, loglevel): - """ - """ - true_pattern = re.compile('True|Yes', re.IGNORECASE) - false_pattern = re.compile('False|No', re.IGNORECASE) - - if not loglevel: - loglevel = "info" - - if true_pattern.match(do_log): - do_log = True - - elif false_pattern.match(do_log): - do_log = False - - else: - do_log = True - - self._stdoutloginfo['do_log'] = do_log - self._stdoutloginfo['loglevel'] = loglevel - - def getStdoutLogInfo(self): - """ - """ - return self._stdoutloginfo - - def addAtfDir(self, atfdir): - """ - """ - self._atfdir = atfdir - - def getAtfDir(self): - """ - """ - return self._atfdir - def addTestUnits(self, testunit): """ Description: |