From 7294aed77c25b8b635c5a1271833493412559726 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Mon, 1 Mar 2004 22:19:11 +0000 Subject: move to using Generator.__provides__ from __build__ 2004/01/20 10:40:13-06:00 anl.gov!desai add datastore usage (Logical change 1.18) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@67 ce84e21b-d406-0410-9b95-82705330c041 --- src/Core.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/Core.py b/src/Core.py index 698dd64a1..72d79a07d 100644 --- a/src/Core.py +++ b/src/Core.py @@ -17,12 +17,14 @@ class PublishedValue(object): self.value=value class Core(object): - def __init__(self, generators): - self.handles = {} + def __init__(self, repository, generators): + self.datastore = repository + self.provides = {'Service':{},'ConfigFile':{},'Packages':{}} self.pubspace = {} self.generators = [] for generator in generators: - self.generators.append(generator(self)) + g = getattr(__import__(generator),generator) + self.generators.append(g(self, self.datastore)) # we need to inventory and setup generators # Process generator requirements for g in self.generators: @@ -30,8 +32,9 @@ class Core(object): if not self.pubspace.has_key(prq): raise GeneratorError, (g.name, prq) g.CompleteSetup() - for f in g.__build__.keys(): - self.handles[f] = g + for etype in g.__provides__.keys(): + for entry in g.__provides__[etype]: + self.provides[etype][entry] = getattr(g,g.__provides__[etype][entry]) def PublishValue(self,owner,key,value): if not self.pubspace.has_key(key): @@ -53,3 +56,7 @@ class Core(object): if self.handles.has_key(filename): return self.handles[filename].Build(filename,client) raise KeyError, filename + + def Get(self,type,name,client): + f = self.provides[type][name] + return f(name,client) -- cgit v1.2.3-1-g7c22