diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2009-02-02 16:38:01 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2009-02-02 16:38:01 +0000 |
commit | 67ea84767b1c06c9efd0449f435cae103cb03fb0 (patch) | |
tree | b08b4ed7cb02086993034879122f978780fcb71d /src/lib/Server/Core.py | |
parent | 527fa203685fc8c93f6094f8cfe61ff4a39f1e2e (diff) | |
download | bcfg2-67ea84767b1c06c9efd0449f435cae103cb03fb0.tar.gz bcfg2-67ea84767b1c06c9efd0449f435cae103cb03fb0.tar.bz2 bcfg2-67ea84767b1c06c9efd0449f435cae103cb03fb0.zip |
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
Diffstat (limited to 'src/lib/Server/Core.py')
-rw-r--r-- | src/lib/Server/Core.py | 8 |
1 files changed, 5 insertions, 3 deletions
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) |