diff options
author | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-25 14:08:01 +0800 |
---|---|---|
committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-25 16:58:31 +0800 |
commit | 2189e3bfdf1d250fa1201f89249745d4d6aab7f0 (patch) | |
tree | 3a5ab98cdd7632bd80c9181001a635c72a252eef /qtip/ansible_library | |
parent | 6463b6635a8094a0ddcf83605cd231ba46104f72 (diff) |
Rewrite `export_to_file` as decorator
Change-Id: Ibf852038fac986801a3fc2c608a0ddb1572abbde
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'qtip/ansible_library')
-rw-r--r-- | qtip/ansible_library/plugins/action/calculate.py | 10 | ||||
-rw-r--r-- | qtip/ansible_library/plugins/action/collect.py | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/qtip/ansible_library/plugins/action/calculate.py b/qtip/ansible_library/plugins/action/calculate.py index 01c80a02..ee3b8e3a 100644 --- a/qtip/ansible_library/plugins/action/calculate.py +++ b/qtip/ansible_library/plugins/action/calculate.py @@ -38,12 +38,13 @@ class ActionModule(ActionBase): spec = yaml.safe_load(stream) metrics = self._task.args.get('metrics') - export_to = self._task.args.get('export_to') + dest = self._task.args.get('dest') - return calc_qpi(spec, metrics, export_to) + return calc_qpi(spec, metrics, dest=dest) -def calc_qpi(qpi_spec, metrics, dest=None): +@export_to_file +def calc_qpi(qpi_spec, metrics): display.vv("calculate QPI {}".format(qpi_spec['name'])) display.vvv("spec: {}".format(qpi_spec)) @@ -63,9 +64,6 @@ def calc_qpi(qpi_spec, metrics, dest=None): 'metrics': metrics } - if dest is not None: - export_to_file(results, dest) - return results diff --git a/qtip/ansible_library/plugins/action/collect.py b/qtip/ansible_library/plugins/action/collect.py index c54cbe7d..9d3b2a73 100644 --- a/qtip/ansible_library/plugins/action/collect.py +++ b/qtip/ansible_library/plugins/action/collect.py @@ -27,12 +27,13 @@ class ActionModule(ActionBase): string = self._task.args.get('string') patterns = self._task.args.get('patterns') - export_to = self._task.args.get('export_to') + dest = self._task.args.get('dest') - return collect(patterns, string, export_to) + return collect(patterns, string, dest=dest) -def collect(patterns, string, dest=None): +@export_to_file +def collect(patterns, string): """collect all named subgroups of the match into a list keyed by subgroup name """ captured = defaultdict(list) @@ -45,7 +46,4 @@ def collect(patterns, string, dest=None): for (key, value) in match_obj.groupdict().items(): captured[key].append(value) - if dest is not None: - export_to_file(captured, dest) - return captured |