From b7993c27a1afe605cf42dfc6dec5c66baca805e2 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Tue, 31 Aug 2004 18:28:17 +0000
Subject: witness the power of this fully functional service control generator

2004/08/31 11:05:53-05:00 anl.gov!desai
fix function usage

2004/08/31 11:03:02-05:00 anl.gov!desai
remove unused function

(Logical change 1.49)


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@289 ce84e21b-d406-0410-9b95-82705330c041
---
 src/lib/Server/Generators/servicemgr.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/Server/Generators/servicemgr.py b/src/lib/Server/Generators/servicemgr.py
index 0fb7ec3e6..840ce02ba 100644
--- a/src/lib/Server/Generators/servicemgr.py
+++ b/src/lib/Server/Generators/servicemgr.py
@@ -1,10 +1,12 @@
 #!/usr/bin/env python
 
+from elementtree.ElementTree import XML
 from Bcfg2.Server.Generator import Generator, SingleXMLFileBacked
 
 class ServiceList(SingleXMLFileBacked):
     def Index(self):
-        SingleXMLFileBacked.Index(self)
+        a = XML(self.data)
+        self.entries = a.getchildren()
         self.services = {}
         for e in self.entries:
             m = (e.tag, e.attrib['name'])
@@ -21,7 +23,8 @@ class ServiceList(SingleXMLFileBacked):
     def GetService(self, entry, metadata):
         s = self.services[entry.attrib['name']]
         useful = filter(lambda x:self.MatchMetadata(x[0], metadata), s)
-        return useful[-1][1]
+        data = useful[-1][1]
+        entry.attrib.update(data.attrib)
         
     def MatchMetadata(self, m, metadata):
         if m[0] == 'Global':
@@ -51,13 +54,11 @@ class servicemgr(Generator):
     __version__ = '$Id$'
     __author__ = 'bcfg-dev@mcs.anl.gov'
 
-    def __setup__(self):
-        self.srvinfo = ServiceList("%s/packages.xml"%(self.data))
-        self.__provides__ = self.srvinfo.__provides__
+    def __init__(self, core, datastore):
+        Generator.__init__(self, core, datastore)
+        self.svrinfo = ServiceList("%s/common/services.xml"%(datastore), self.core.fam)
+        self.__provides__ = self.svrinfo.__provides__
+
 
-    def GetService(self,entry,metadata):
-        # for now sshd is on
-        if entry.attrib['name'] == 'sshd':
-            entry.attrib['status'] = 'on'
 
 
-- 
cgit v1.2.3-1-g7c22