diff options
Diffstat (limited to 'testsuites/vstf/vstf_scripts/vstf/controller/settings')
11 files changed, 203 insertions, 37 deletions
diff --git a/testsuites/vstf/vstf_scripts/vstf/controller/settings/cpu_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/cpu_settings.py index a25af4c1..9589e119 100644 --- a/testsuites/vstf/vstf_scripts/vstf/controller/settings/cpu_settings.py +++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/cpu_settings.py @@ -18,6 +18,7 @@ LOG = logging.getLogger(__name__) class CpuSettings(sets.Settings): + def __init__(self, path="/etc/vstf/perf/", filename="sw_perf.cpu-settings", mode=sets.SETS_SINGLE): @@ -32,9 +33,22 @@ class CpuSettings(sets.Settings): for item in body: item = item.encode() func_name = "set_%s" % item - setattr(self, func_name, self._setting_file(func_name, self._mset['affctl'], self._fset['affctl'], item)) + setattr( + self, + func_name, + self._setting_file( + func_name, + self._mset['affctl'], + self._fset['affctl'], + item)) func_name = "mset_%s" % item - setattr(self, func_name, self._setting_memory(func_name, self._mset['affctl'], item)) + setattr( + self, + func_name, + self._setting_memory( + func_name, + self._mset['affctl'], + item)) LOG.debug(self.__dict__) @@ -59,8 +73,10 @@ class CpuSettings(sets.Settings): def unit_test(): from vstf.common.log import setup_logging - setup_logging(level=logging.DEBUG, log_file="/var/log/vstf/vstf-cpu-settings.log", clevel=logging.INFO) + setup_logging( + level=logging.DEBUG, + log_file="/var/log/vstf/vstf-cpu-settings.log", + clevel=logging.INFO) if __name__ == '__main__': unit_test() - diff --git a/testsuites/vstf/vstf_scripts/vstf/controller/settings/device_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/device_settings.py index 25f2c5bf..5fe3976f 100644 --- a/testsuites/vstf/vstf_scripts/vstf/controller/settings/device_settings.py +++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/device_settings.py @@ -15,6 +15,7 @@ LOG = logging.getLogger(__name__) class DeviceSettings(sets.Settings): + def __init__(self, path="/etc/vstf/perf/", filename="sw_perf.device-settings", mode=sets.SETS_SINGLE): diff --git a/testsuites/vstf/vstf_scripts/vstf/controller/settings/flows_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/flows_settings.py index 9cd1a1b7..f28d5b5b 100644 --- a/testsuites/vstf/vstf_scripts/vstf/controller/settings/flows_settings.py +++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/flows_settings.py @@ -15,6 +15,7 @@ LOG = logging.getLogger(__name__) class FlowsSettings(sets.Settings): + def __init__(self, path="/etc/vstf/perf/", filename="sw_perf.flownodes-settings", mode=sets.SETS_SINGLE): @@ -27,16 +28,44 @@ class FlowsSettings(sets.Settings): for actor in self._check_actors: actor = actor.encode() func_name = "add_%s" % actor - setattr(self, func_name, self._adding_file(func_name, self._mset, self._fset, actor, self._check_add)) + setattr( + self, + func_name, + self._adding_file( + func_name, + self._mset, + self._fset, + actor, + self._check_add)) func_name = "madd_%s" % actor - setattr(self, func_name, self._adding_memory(func_name, self._mset, actor, self._check_add)) + setattr( + self, + func_name, + self._adding_memory( + func_name, + self._mset, + actor, + self._check_add)) for actor in self._nocheck_actors: actor = actor.encode() func_name = "add_%s" % actor - setattr(self, func_name, self._adding_file(func_name, self._mset, self._fset, actor)) + setattr( + self, + func_name, + self._adding_file( + func_name, + self._mset, + self._fset, + actor)) func_name = "madd_%s" % actor - setattr(self, func_name, self._adding_memory(func_name, self._mset, actor)) + setattr( + self, + func_name, + self._adding_memory( + func_name, + self._mset, + actor)) LOG.debug(self.__dict__.keys()) @@ -70,7 +99,10 @@ class FlowsSettings(sets.Settings): def unit_test(): from vstf.common.log import setup_logging - setup_logging(level=logging.DEBUG, log_file="/var/log/vstf/vstf-flows-settings.log", clevel=logging.INFO) + setup_logging( + level=logging.DEBUG, + log_file="/var/log/vstf/vstf-flows-settings.log", + clevel=logging.INFO) flows_settings = FlowsSettings() LOG.info(flows_settings.settings) @@ -113,7 +145,7 @@ def unit_test(): cpu = { "agent": "192.168.188.16", - "affctl":{ + "affctl": { "policy": 2 } } diff --git a/testsuites/vstf/vstf_scripts/vstf/controller/settings/forwarding_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/forwarding_settings.py index 636ddfda..138337cb 100644 --- a/testsuites/vstf/vstf_scripts/vstf/controller/settings/forwarding_settings.py +++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/forwarding_settings.py @@ -15,6 +15,7 @@ LOG = logging.getLogger(__name__) class ForwardingSettings(sets.Settings): + def __init__(self, path="/etc/vstf/perf/", filename="sw_perf.forwarding-settings", mode=sets.SETS_SINGLE): diff --git a/testsuites/vstf/vstf_scripts/vstf/controller/settings/html_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/html_settings.py index ce87733e..89af7a54 100644 --- a/testsuites/vstf/vstf_scripts/vstf/controller/settings/html_settings.py +++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/html_settings.py @@ -15,13 +15,21 @@ LOG = logging.getLogger(__name__) class HtmlSettings(sets.Settings): - def __init__(self, path="/etc/vstf/", filename="reporters.html-settings", mode=sets.SETS_DEFAULT): + + def __init__( + self, + path="/etc/vstf/", + filename="reporters.html-settings", + mode=sets.SETS_DEFAULT): super(HtmlSettings, self).__init__(path, filename, mode) def unit_test(): from vstf.common.log import setup_logging - setup_logging(level=logging.DEBUG, log_file="/var/log/html-settings.log", clevel=logging.DEBUG) + setup_logging( + level=logging.DEBUG, + log_file="/var/log/html-settings.log", + clevel=logging.DEBUG) html_settings = HtmlSettings() style = { 'table': { @@ -36,13 +44,13 @@ def unit_test(): 'border': '1px solid green', 'padding': '8px', 'word-wrap': 'break-all' - }, + }, 'th': { 'background-color': '#EAF2D3', 'border': '1px solid green', 'padding': '8px' - } + } } html_settings.set_style(style) diff --git a/testsuites/vstf/vstf_scripts/vstf/controller/settings/mail_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/mail_settings.py index db01097f..967aa601 100644 --- a/testsuites/vstf/vstf_scripts/vstf/controller/settings/mail_settings.py +++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/mail_settings.py @@ -18,7 +18,12 @@ LOG = logging.getLogger(__name__) class MailSettings(sets.Settings): - def __init__(self, path="/etc/vstf", filename="reporters.mail.mail-settings", mode=sets.SETS_DEFAULT): + + def __init__( + self, + path="/etc/vstf", + filename="reporters.mail.mail-settings", + mode=sets.SETS_DEFAULT): super(MailSettings, self).__init__(path, filename, mode) def _register_func(self): @@ -30,11 +35,24 @@ class MailSettings(sets.Settings): for item in body: item = item.encode() func_name = "set_%s" % item - setattr(self, func_name, self._setting_file(func_name, self._mset['body'], self._fset['body'], item)) + setattr( + self, + func_name, + self._setting_file( + func_name, + self._mset['body'], + self._fset['body'], + item)) other = {"attach", "content", "subtype"} for item in other: func_name = "mset_%s" % item - setattr(self, func_name, self._setting_memory(func_name, self._mset['body'], item)) + setattr( + self, + func_name, + self._setting_memory( + func_name, + self._mset['body'], + item)) LOG.debug(self.__dict__) @@ -80,7 +98,10 @@ class MailSettings(sets.Settings): def unit_test(): from vstf.common.log import setup_logging - setup_logging(level=logging.DEBUG, log_file="/var/log/vstf/vstf-mail-settings.log", clevel=logging.INFO) + setup_logging( + level=logging.DEBUG, + log_file="/var/log/vstf/vstf-mail-settings.log", + clevel=logging.INFO) mail_settings = MailSettings() mail_settings.sinput() diff --git a/testsuites/vstf/vstf_scripts/vstf/controller/settings/perf_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/perf_settings.py index 610cb4ae..adc8dee4 100644 --- a/testsuites/vstf/vstf_scripts/vstf/controller/settings/perf_settings.py +++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/perf_settings.py @@ -20,6 +20,7 @@ LOG = logging.getLogger(__name__) class PerfSettings(sets.Settings): + def __init__(self, path="/etc/vstf/perf/", filename="sw_perf.batch-settings", mode=sets.SETS_SINGLE): @@ -42,14 +43,23 @@ class PerfSettings(sets.Settings): if not scenario: LOG.warn("not support the case:%s", value["case"]) return - self._adding_file("add", self._mset, self._fset, scenario, check=self._check_add)(value) + self._adding_file( + "add", + self._mset, + self._fset, + scenario, + check=self._check_add)(value) def madd_case(self, case): scenario = self.dbconn.query_scenario(case) if not scenario: LOG.warn("not support the case:%s", case) return - self._adding_memory("madd", self._mset, scenario, check=self._check_add)(case) + self._adding_memory( + "madd", + self._mset, + scenario, + check=self._check_add)(case) @deco.dcheck('sizes') @deco.dcheck("type", choices=cst.TTYPES) @@ -74,7 +84,7 @@ class PerfSettings(sets.Settings): pprint.pprint(self.settings) print "+++++++++++++++++++++++++++++++++++" return True - + @deco.vstf_input('sizes', types=list) @deco.vstf_input("type", types=str, choices=cst.TTYPES) @deco.vstf_input("profile", types=str, choices=cst.PROVIDERS) @@ -98,7 +108,10 @@ def unit_test(): perf_settings.sinput() from vstf.common.log import setup_logging - setup_logging(level=logging.DEBUG, log_file="/var/log/vstf/vstf-perf-settings.log", clevel=logging.DEBUG) + setup_logging( + level=logging.DEBUG, + log_file="/var/log/vstf/vstf-perf-settings.log", + clevel=logging.DEBUG) if __name__ == '__main__': diff --git a/testsuites/vstf/vstf_scripts/vstf/controller/settings/settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/settings.py index 2c712bb2..a01689d5 100644 --- a/testsuites/vstf/vstf_scripts/vstf/controller/settings/settings.py +++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/settings.py @@ -31,7 +31,8 @@ def dict2object(dic): module_name = dic.pop('__module__') module = __import__(module_name) class_ = getattr(module, class_name) - args = dict((key.encode('ascii'), value) for key, value in dic.items()) # get args + args = dict((key.encode('ascii'), value) + for key, value in dic.items()) # get args inst = class_(**args) # create new instance else: inst = dic @@ -52,6 +53,7 @@ def filter_comments(filename, flags="//"): class BaseSettings(object): + def _load(self, fullname): data = filter_comments(fullname) LOG.debug(fullname) @@ -68,7 +70,11 @@ class BaseSettings(object): for litem in ldata: if rdata: for ritem in rdata: - if isinstance(litem, dict) or isinstance(litem, list): + if isinstance( + litem, + dict) or isinstance( + litem, + list): tmp = self._sub(litem, ritem) else: tmp = ritem @@ -104,15 +110,22 @@ class BaseSettings(object): if os.path.exists(filename): os.remove(filename) with open(filename, 'w') as ofile: - content = json.dumps(data, sort_keys=True, indent=4, separators=(',', ':')) + content = json.dumps( + data, + sort_keys=True, + indent=4, + separators=( + ',', + ':')) ofile.write(content) class DefaultSettings(BaseSettings): + def __init__(self, path): self._default = os.path.join(path, 'default') self._user = os.path.join(path, 'user') - + def load(self, filename): dfile = os.path.join(self._default, filename) if os.path.exists(dfile): @@ -137,6 +150,7 @@ class DefaultSettings(BaseSettings): class SingleSettings(BaseSettings): + def __init__(self, path): self._path = path @@ -161,6 +175,7 @@ SETTINGS = [SETS_SINGLE, SETS_DEFAULT] class Settings(object): + def __init__(self, path, filename, mode=SETS_SINGLE): if mode not in SETTINGS: raise Exception("error Settings mode : %s" % (mode)) @@ -257,23 +272,65 @@ class Settings(object): for item in items: item = item.encode() func_name = "set_%s" % item - setattr(self, func_name, self._setting_file(func_name, self._mset, self._fset, item)) + setattr( + self, + func_name, + self._setting_file( + func_name, + self._mset, + self._fset, + item)) func_name = "mset_%s" % item - setattr(self, func_name, self._setting_memory(func_name, self._mset, item)) + setattr( + self, + func_name, + self._setting_memory( + func_name, + self._mset, + item)) elif isinstance(self._fset, list): func_name = "set" - setattr(self, func_name, self._setting_file(func_name, self._mset, self._fset, None)) + setattr( + self, + func_name, + self._setting_file( + func_name, + self._mset, + self._fset, + None)) func_name = "mset" - setattr(self, func_name, self._setting_memory(func_name, self._mset, None)) + setattr( + self, + func_name, + self._setting_memory( + func_name, + self._mset, + None)) func_name = "add" - setattr(self, func_name, self._adding_file(func_name, self._mset, self._fset, None)) + setattr( + self, + func_name, + self._adding_file( + func_name, + self._mset, + self._fset, + None)) func_name = "madd" - setattr(self, func_name, self._adding_memory(func_name, self._mset, None)) + setattr( + self, + func_name, + self._adding_memory( + func_name, + self._mset, + None)) def unit_test(): from vstf.common.log import setup_logging - setup_logging(level=logging.DEBUG, log_file="/var/log/vstf-settings.log", clevel=logging.INFO) + setup_logging( + level=logging.DEBUG, + log_file="/var/log/vstf-settings.log", + clevel=logging.INFO) path = '/etc/vstf' setting = DefaultSettings(path) diff --git a/testsuites/vstf/vstf_scripts/vstf/controller/settings/template_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/template_settings.py index b677c539..2e449fef 100644 --- a/testsuites/vstf/vstf_scripts/vstf/controller/settings/template_settings.py +++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/template_settings.py @@ -16,6 +16,7 @@ LOG = logging.getLogger(__name__) class TemplateSettings(sets.Settings): + def __init__(self, path="/etc/vstf/reporter/", filename="reporters.template-settings", mode=sets.SETS_SINGLE): diff --git a/testsuites/vstf/vstf_scripts/vstf/controller/settings/tester_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/tester_settings.py index 554c8042..5d64d29c 100644 --- a/testsuites/vstf/vstf_scripts/vstf/controller/settings/tester_settings.py +++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/tester_settings.py @@ -16,6 +16,7 @@ LOG = logging.getLogger(__name__) class TesterSettings(sets.Settings): + def __init__(self, path="/etc/vstf/env/", filename="tester.json", mode=sets.SETS_SINGLE): diff --git a/testsuites/vstf/vstf_scripts/vstf/controller/settings/tool_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/tool_settings.py index a84bc59f..aed3306f 100644 --- a/testsuites/vstf/vstf_scripts/vstf/controller/settings/tool_settings.py +++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/tool_settings.py @@ -18,7 +18,12 @@ LOG = logging.getLogger(__name__) class ToolSettings(sets.Settings): - def __init__(self, path="/etc/vstf", filename="sw_perf.tool-settings", mode=sets.SETS_DEFAULT): + + def __init__( + self, + path="/etc/vstf", + filename="sw_perf.tool-settings", + mode=sets.SETS_DEFAULT): super(ToolSettings, self).__init__(path, filename, mode) def _register_func(self): @@ -29,8 +34,15 @@ class ToolSettings(sets.Settings): for item in body: item = item.encode() func_name = "set_%s" % (item) - setattr(self, func_name, - self._setting_file(func_name, self._mset, self._fset, item, check=self._check_keys)) + setattr( + self, + func_name, + self._setting_file( + func_name, + self._mset, + self._fset, + item, + check=self._check_keys)) def _check_keys(self, value): keys = ['threads', 'wait', 'time'] @@ -70,7 +82,10 @@ class ToolSettings(sets.Settings): def unit_test(): from vstf.common.log import setup_logging - setup_logging(level=logging.DEBUG, log_file="/var/log/vstf/tool-settings.log", clevel=logging.INFO) + setup_logging( + level=logging.DEBUG, + log_file="/var/log/vstf/tool-settings.log", + clevel=logging.INFO) tool_settings = ToolSettings() value = { "time": 10, |