[checkmk-commits] Cleanup: Use Rule dict representation for cloning

Module: check_mk Branch: master Commit: 69c7110c382384d4b2f5cb4d25d1045563fbc171 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69c7110c382384… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 27 17:04:57 2019 +0100 Cleanup: Use Rule dict representation for cloning Change-Id: Id6b49641b98107a024c8782925a288cb6c9d90d0 --- cmk/gui/watolib/rulesets.py | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/cmk/gui/watolib/rulesets.py b/cmk/gui/watolib/rulesets.py index 28834e0..1caa08f 100644 --- a/cmk/gui/watolib/rulesets.py +++ b/cmk/gui/watolib/rulesets.py @@ -571,7 +571,7 @@ class Rule(object): def clone(self): cloned = Rule(self.folder, self.ruleset) - cloned.from_config(self._format_rule()) + cloned.from_config(self.to_dict_config()) return cloned def _initialize(self): @@ -725,28 +725,6 @@ class Rule(object): return result - def _format_rule(self): - if self.ruleset.valuespec(): - rule = [self.value] - elif not self.value: - rule = [NEGATE] - else: - rule = [] - - if self.tag_specs != []: - rule.append(self.tag_specs) - - rule.append(self.host_list) - if self.item_list is not None: - rule.append(self.item_list) - - ro = self._rule_options_to_config() - - if ro: - rule.append(ro) - - return tuple(rule) - # Append rule options, but only if they are not trivial. That way we # keep as close as possible to the original Check_MK in rules.mk so that # command line users will feel at home...