From 06eeffe8e6344ac62b74cae38d2733b4b64900f1 Mon Sep 17 00:00:00 2001 From: Robert Gogolok Date: Sun, 30 Dec 2007 19:53:25 +0000 Subject: bcfg2-admin: use Bcfg2.Settings git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4133 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Admin/__init__.py | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'src/lib/Server/Admin/__init__.py') diff --git a/src/lib/Server/Admin/__init__.py b/src/lib/Server/Admin/__init__.py index 57b9d2a86..dcab5876f 100644 --- a/src/lib/Server/Admin/__init__.py +++ b/src/lib/Server/Admin/__init__.py @@ -4,40 +4,27 @@ __all__ = ['Mode', 'Client', 'Compare', 'Fingerprint', 'Init', 'Minestruct', 'Pull', 'Tidy', 'Viz'] import ConfigParser, lxml.etree, logging +from Bcfg2.Settings import settings class Mode(object): '''Help message has not yet been added for mode''' __shorthelp__ = 'Shorthelp not defined yet' __longhelp__ = 'Longhelp not defined yet' __args__ = [] - def __init__(self, configfile): - self.configfile = configfile - self.__cfp = False - self.log = logging.getLogger('Bcfg2.Server.Admin.Mode') - - def getCFP(self): - if not self.__cfp: - self.__cfp = ConfigParser.ConfigParser() - self.__cfp.read(self.configfile) - return self.__cfp - cfp = property(getCFP) + def __init__(self): + self.log = logging.getLogger('Bcfg2.Server.Admin.Mode') + self.repo_path = settings.SERVER_REPOSITORY def __call__(self, args): - if args[0] == 'help': - print self.__longhelp__ - raise SystemExit(0) + return def errExit(self, emsg): print emsg raise SystemExit(1) - def get_repo_path(self): - '''return repository path''' - return self.cfp.get('server', 'repository') - def load_stats(self, client): - stats = lxml.etree.parse("%s/etc/statistics.xml" % (self.get_repo_path())) + stats = lxml.etree.parse("%s/etc/statistics.xml" % (self.repo_path)) hostent = stats.xpath('//Node[@name="%s"]' % client) if not hostent: self.errExit("Could not find stats for client %s" % (client)) -- cgit v1.2.3-1-g7c22