linspector/linspector-old
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some more cleanups

Browse source
This commit is contained in:
Johannes Findeisen 2013-11-08 06:31:04 +01:00
commit 001dbefb8e
2 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
linspector/config/hostgroups.py
View file

@ -61,11 +61,6 @@ class HostGroup(object):
if tmp in kwargs: if tmp in kwargs:
self.add_parents(kwargs[tmp]) self.add_parents(kwargs[tmp])
tmp = "processors"
self.processors = []
if tmp in kwargs:
self.add_processors(kwargs[tmp])
def __str__(self): def __str__(self):
return self.name return self.name
@ -91,9 +86,6 @@ class HostGroup(object):
def add_hosts(self, host): def add_hosts(self, host):
self.__add_internal(self.get_hosts(), host) self.__add_internal(self.get_hosts(), host)
def add_processors(self, processor):
self.__add_internal(self.get_processors(), processor)
def add_parents(self, parent): def add_parents(self, parent):
self.__add_internal(self.get_parents(), parent) self.__add_internal(self.get_parents(), parent)
@ -103,9 +95,6 @@ class HostGroup(object):
def get_parents(self): def get_parents(self):
return self.parents return self.parents
def get_processors(self):
return self.processors
def get_services(self): def get_services(self):
return self.__services return self.__services

10
linspector/config/members.py
View file

@ -17,8 +17,6 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
""" """
import re
from logging import getLogger from logging import getLogger
logger = getLogger(__name__) logger = getLogger(__name__)
@ -41,7 +39,7 @@ class Member:
def __init__(self, name="", **kwargs): def __init__(self, name="", **kwargs):
self.name = name self.name = name
tmp = "tasks" tmp = "tasks"
self.__tasks = [] self.tasks = []
if not tmp in kwargs: if not tmp in kwargs:
raise MemberMissingArgumentException(tmp, name) raise MemberMissingArgumentException(tmp, name)
self.add_tasks(kwargs[tmp]) self.add_tasks(kwargs[tmp])
@ -59,7 +57,7 @@ class Member:
return self.__tasks return self.__tasks
def __str__(self): def __str__(self):
ret = "Member Id: " + self.nameid + " Name: " + self.name + " Filters: " + str(self.phone) ret = "Member: " + self.name + " Tasks: "
for f in self.filters: for t in self.tasks:
ret += str(f) ret += str(t)
return ret return ret