From a9388f7859586d5d98e815efdcf8d6a85b973bef Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Mon, 5 Jan 2009 03:24:50 +0000
Subject: This patch is stage 1 of the plugin capabilities rework  - define new
 plugin base classes  - switch Plugin.__name__ => Plugin.name

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5004 ce84e21b-d406-0410-9b95-82705330c041
---
 src/lib/Server/Plugins/BB.py | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'src/lib/Server/Plugins/BB.py')

diff --git a/src/lib/Server/Plugins/BB.py b/src/lib/Server/Plugins/BB.py
index 70b90016b..1e5166500 100644
--- a/src/lib/Server/Plugins/BB.py
+++ b/src/lib/Server/Plugins/BB.py
@@ -19,18 +19,16 @@ DOMAIN_SUFFIX = ".mcs.anl.gov" # default is .mcs.anl.gov
 
 PXE_CONFIG = "pxelinux.0" # default is pxelinux.0
 
-class BB(Bcfg2.Server.Plugin.GeneratorPlugin,
-         Bcfg2.Server.Plugin.StructurePlugin,
-         Bcfg2.Server.Plugins.Metadata.Metadata,
+class BB(Bcfg2.Server.Plugins.Metadata.Metadata,
          Bcfg2.Server.Plugin.DirectoryBacked):
     '''BB Plugin handles bb node configuration'''
     
-    __name__ = 'BB'
+    name = 'BB'
     experimental = True
     write_to_disk = True
 
     def __init__(self, core, datastore):
-        Bcfg2.Server.Plugin.GeneratorPlugin.__init__(self, core, datastore)
+        Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
         try:
             Bcfg2.Server.Plugin.DirectoryBacked.__init__(self, self.data, self.core.fam)
         except OSError, ioerr:
@@ -43,8 +41,8 @@ class BB(Bcfg2.Server.Plugin.GeneratorPlugin,
             '/etc/sudoers':self.gen_sudoers,
             '/etc/dhcp3/dhcpd.conf':self.gen_dhcpd}}
         self.nodes = {}
-	self.dhcpd_loaded = False
-	self.need_update = False
+        self.dhcpd_loaded = False
+        self.need_update = False
     
     def viz(self, hosts, bundles, key, colors):
         '''admin mode viz support'''
@@ -266,11 +264,11 @@ class BB(Bcfg2.Server.Plugin.GeneratorPlugin,
         '''Handle events'''
         Bcfg2.Server.Plugin.DirectoryBacked.HandleEvent(self, event)
 	# static.dhcpd.conf hack
-	if 'static.dhcpd.conf' in self.entries:
-	    self.dhcpd_loaded = True
-	if self.need_update and self.dhcpd_loaded:
-	    self.update_dhcpd()
-	    self.need_update = False	
+        if 'static.dhcpd.conf' in self.entries:
+            self.dhcpd_loaded = True
+        if self.need_update and self.dhcpd_loaded:
+            self.update_dhcpd()
+            self.need_update = False	
         # send events to groups.xml back to Metadata plugin
         if event and "groups.xml" == event.filename:
             Bcfg2.Server.Plugins.Metadata.Metadata.HandleEvent(self, event)
@@ -331,6 +329,6 @@ class BB(Bcfg2.Server.Plugin.GeneratorPlugin,
                     except OSError:
                         self.logger.error("failed to find link for mac address %s" % mac)
                     if self.dhcpd_loaded:
-		    	self.update_dhcpd()
-		    else:
-			self.need_update = True			
+                        self.update_dhcpd()
+                    else:
+                        self.need_update = True			
-- 
cgit v1.2.3-1-g7c22