From e64d93388e401c2307e95b8b4e19ec65374a58bf Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Fri, 16 Sep 2005 15:52:56 +0000 Subject: spiffy up the chiba generator 2005/09/15 13:01:14-05:00 anl.gov!desai really update to new API (Logical change 1.316) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1288 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/Chiba.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/lib') diff --git a/src/lib/Server/Plugins/Chiba.py b/src/lib/Server/Plugins/Chiba.py index 110ddc190..3376b6125 100644 --- a/src/lib/Server/Plugins/Chiba.py +++ b/src/lib/Server/Plugins/Chiba.py @@ -3,7 +3,7 @@ __revision__ = '$Revision$' from socket import gethostbyname, gaierror from syslog import syslog, LOG_ERR -from Bcfg2.Server.Plugin import Plugin, DirectoryBacked, SingleXMLFileBacked, GeneratorError +from Bcfg2.Server.Plugin import Plugin, DirectoryBacked, SingleXMLFileBacked, PluginExecutionError class ChibaConf(SingleXMLFileBacked): '''This class encapsulates all information needed for all Chiba config ops''' @@ -19,12 +19,11 @@ class Chiba(Plugin): __name__ = 'Chiba' __version__ = '$Id$' __author__ = 'bcfg-dev@mcs.anl.gov' - Entries = {'ConfigFile':{}} def __init__(self, core, datastore): - Generator.__init__(self, core, datastore) + Plugin.__init__(self, core, datastore) self.repo = DirectoryBacked(self.data, self.core.fam) - self.Entries['ConfigFile']['/etc/network/interfaces'] = self.build_interfaces + self.Entries = {'ConfigFile': {'/etc/network/interfaces':self.build_interfaces}} def build_interfaces(self, entry, metadata): '''build network configs for clients''' @@ -35,6 +34,6 @@ class Chiba(Plugin): myriaddr = gethostbyname("%s-myr" % metadata.hostname) except gaierror: syslog(LOG_ERR, "Failed to resolve %s-myr"% metadata.hostname) - raise GeneratorError, ("%s-myr" % metadata.hostname, 'lookup') + raise PluginExecutionError, ("%s-myr" % metadata.hostname, 'lookup') entry.text = self.repo.entries['interfaces-template'].data % myriaddr -- cgit v1.2.3-1-g7c22