From 67ea84767b1c06c9efd0449f435cae103cb03fb0 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Mon, 2 Feb 2009 16:38:01 +0000 Subject: Split out connector interface to allow for additional data generation based on complete group list git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5055 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Core.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/lib/Server/Core.py') diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index 120835a65..c57e983f8 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -232,10 +232,12 @@ class Core(object): def build_metadata(self, client_name): imd = self.metadata.get_initial_metadata(client_name) for conn in self.connectors: - grps, data = conn.get_additional_metadata(imd) - self.metadata.merge_additional_metadata(imd, conn.name, grps, data) + grps = conn.get_additional_groups(imd) + self.metadata.merge_additional_groups(imd, grps) + for conn in self.connectors: + data = conn.get_additional_data(imd) + self.metadata.merge_additional_data(imd, conn.name, data) return imd - def process_statistics(self, client_name, statistics): meta = self.build_metadata(client_name) -- cgit v1.2.3-1-g7c22