add extra support for client profile assertion

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

1 files changed, 12 insertions, 8 deletions

diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index dafc8be1e..2d9ceb92b 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -94,6 +94,7 @@ class Bcfg2Serv(Bcfg2.Server.Component.Component):
             fatal_error(msg)
 
         self.funcs.update({
+            "AssertProfile": self.Bcfg2AssertProfile, 
             "GetConfig": self.Bcfg2GetConfig,
             "GetProbes": self.Bcfg2GetProbes,
             "RecvProbeData": self.Bcfg2RecvProbeData,
@@ -164,17 +165,20 @@ class Bcfg2Serv(Bcfg2.Server.Component.Component):
                 critical_error('error in probe data receipt')
         return True
 
+    def Bcfg2AssertProfile(self, address, profile):
+        '''Set profile for a client'''
+        client = self.resolve_client(address[0])
+        try:
+            self.Core.metadata.set_group(client, profile)
+        except MetadataConsistencyError:
+            warning = 'metadata consistency error'
+            self.logger.warning(warning)
+            raise Fault, (6, warning)
+        return True
+
     def Bcfg2GetConfig(self, address, image=False, profile=False):
         '''Build config for a client'''
         client = self.resolve_client(address[0])
-
-        if image and profile:
-            try:
-                self.Core.metadata.set_group(client, profile)
-            except MetadataConsistencyError:
-                warning = 'metadata consistency error'
-                self.logger.warning(warning)
-                raise Fault, (6, warning)
         return tostring(self.Core.BuildConfiguration(client))
 
     def Bcfg2RecvStats(self, address, stats):