From 331271368a3898b541a5926b30a7efd0bf11c1e2 Mon Sep 17 00:00:00 2001 From: "Rafael.Timmerberg" Date: Fri, 28 Jun 2013 01:34:31 +0200 Subject: [PATCH] test --- lib/config/parser.py | 8 +++++--- minimal.json | 13 +++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/config/parser.py b/lib/config/parser.py index e40a833..1a99b08 100644 --- a/lib/config/parser.py +++ b/lib/config/parser.py @@ -225,6 +225,10 @@ class FullConfigParser(ConfigParser): class_check = lambda processor: isinstance(processor, Processor) self.replace_with_import(self.hostgroups, MOD_PROCESSORS, items_func, class_check) + items_func = lambda member: member.get_tasks() + class_check = lambda task: isinstance(task, Task) + self.replace_with_import(members, MOD_TASKS, items_func, class_check) + services = [] for hg in self.hostgroups: services.extend(hg.get_services()) @@ -233,9 +237,7 @@ class FullConfigParser(ConfigParser): class_check = lambda parser: isinstance(parser, Parser) self.replace_with_import(services, MOD_PARSERS, items_func, class_check) - items_func = lambda member: member.get_tasks() - class_check = lambda task: isinstance(task, Task) - self.replace_with_import(members, MOD_TASKS, items_func, class_check) + #replace object pointer id_list_func = lambda hostgroup: hostgroup.get_members() diff --git a/minimal.json b/minimal.json index cf5d80f..9df0aa6 100644 --- a/minimal.json +++ b/minimal.json @@ -3,7 +3,8 @@ "homer":{ "name": "Homer Simpson", "comment": "Security Inspector", - "tasks": [{"class":"email", "type": "donut", "args": {"rcpt": "homer_j_simpson@burnscorp.sp"}}] + "tasks": [{"class":"email", "type": "donut", "args": {"rcpt": "homer_j_simpson@burnscorp.sp"}}, + {"class":"email", "type": "donut", "args": {"rcpt": "homer_j_simpson@burnscorp.sp"}}] } }, "periods": { @@ -22,14 +23,14 @@ { "class": "ping", "fails": {"donut": 2000}, - "periods":["doh"], + "periods": ["doh"], "threshold": 500 }, { - "class": "ping", - "fails": {"donut": 2000}, - "periods":["doh"], - "threshold": 500 + "class": "ping", + "fails": {"donut": 2000}, + "periods": ["doh"], + "threshold": 500 }, { "class": "tcpconnect",