Implement metadata connector functionality

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5000 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 7 insertions, 5 deletions

diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index c1d678a76..b190a6e16 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -34,7 +34,8 @@ class Bcfg2Serv(Bcfg2.Component.Component):
     def __init__(self, setup):
         try:
             self.Core = Core(setup['repo'], setup['plugins'], setup['structures'],
-                             setup['generators'], setup['password'], 
+                             setup['generators'], setup['connectors'],
+                             setup['password'], 
                              setup['svn'], setup['encoding'], setup['filemonitor'])
         except CoreInitError, msg:
             logger.critical("Fatal error: %s" % (msg))
@@ -105,7 +106,7 @@ class Bcfg2Serv(Bcfg2.Component.Component):
         resp = Element('probes')
         try:
             name = self.Core.metadata.resolve_client(address)
-            meta = self.Core.metadata.get_metadata(name)
+            meta = self.Core.build_metadata(name)
             
             for plugin in [p for p in self.Core.plugins.values() \
                            if isinstance(p, Bcfg2.Server.Plugin.ProbingPlugin)]:
@@ -123,7 +124,7 @@ class Bcfg2Serv(Bcfg2.Component.Component):
         '''Receive probe data from clients'''
         try:
             name = self.Core.metadata.resolve_client(address)
-            meta = self.Core.metadata.get_metadata(name)
+            meta = self.Core.build_metadata(name)
         except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError:
             warning = 'metadata consistency error'
             self.logger.warning(warning)
@@ -177,7 +178,7 @@ class Bcfg2Serv(Bcfg2.Component.Component):
         # Versioned stats to prevent tied client/server upgrade
         if state.get('version') >= '2.0':
             client = self.Core.metadata.resolve_client(address)
-            meta = self.Core.metadata.get_metadata(client)
+            meta = self.Core.build_metadata(client)
             
             # Update statistics
             self.Core.stats.StoreStatistics(meta, sdata)
@@ -191,7 +192,7 @@ class Bcfg2Serv(Bcfg2.Component.Component):
 
     def Bcfg2GetDecisionList(self, address, mode):
         client = self.Core.metadata.resolve_client(address)
-        meta = self.Core.metadata.get_metadata(client)
+        meta = self.Core.build_metadata(client)
         return self.Core.GetDecisions(meta, mode)
 
 if __name__ == '__main__':
@@ -218,6 +219,7 @@ if __name__ == '__main__':
                     'static'   : Bcfg2.Options.SERVER_STATIC,
                     'encoding' : Bcfg2.Options.ENCODING,
                     'filelog'  : Bcfg2.Options.LOGGING_FILE_PATH,
+                    'connectors': Bcfg2.Options.SERVER_MCONNECT, 
                     })