fix assertion in case of preexisting entry

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

2 files changed, 9 insertions, 9 deletions

diff --git a/src/lib/Server/Metadata.py b/src/lib/Server/Metadata.py
index 36c8e0e59..b4a5afd2a 100644
--- a/src/lib/Server/Metadata.py
+++ b/src/lib/Server/Metadata.py
@@ -110,21 +110,21 @@ class Metadata:
                     self.logger.error("Removing client mapping for %s" % (client))
                     del self.clients[client]
 
-    def set_group(self, client, group):
+    def set_profile(self, client, profile):
         '''Set group parameter for provided client'''
-        self.logger.info("Asserting client %s profile to %s" % (client, group))
+        self.logger.info("Asserting client %s profile to %s" % (client, profile))
         if False in self.states.values():
             raise MetadataRuntimeError
-        if group not in self.public:
-            self.logger.error("Failed to set client %s to private group %s" % (client, group))
+        if profile not in self.public:
+            self.logger.error("Failed to set client %s to private group %s" % (client, profile))
             raise MetadataConsistencyError
         if self.clients.has_key(client):
-            self.logger.info("Changing %s group from %s to %s" % (client, self.clients[client], group))
+            self.logger.info("Changing %s group from %s to %s" % (client, self.clients[client], profile))
             cli = self.clientdata.xpath('/Clients/Client[@name="%s"]' % (client))
-            cli[0].set('group', group)
+            cli[0].set('profile', profile)
         else:
-            lxml.etree.SubElement(self.clientdata.getroot(), 'Client', name=client, profile=group)
-        self.clients[client] = group
+            lxml.etree.SubElement(self.clientdata.getroot(), 'Client', name=client, profile=profile)
+        self.clients[client] = profile
         self.write_back_clients()
 
     def write_back_clients(self):
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 2d9ceb92b..7d2b55f91 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -169,7 +169,7 @@ class Bcfg2Serv(Bcfg2.Server.Component.Component):
         '''Set profile for a client'''
         client = self.resolve_client(address[0])
         try:
-            self.Core.metadata.set_group(client, profile)
+            self.Core.metadata.set_profile(client, profile)
         except MetadataConsistencyError:
             warning = 'metadata consistency error'
             self.logger.warning(warning)