From a87c59d6f23b4c4fd4e38e380994f2193ca24588 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 25 Nov 2013 10:48:43 -0500
Subject: bcfg2-admin: Restored missing "bcfg2-admin client add ... attrib=val"
 functionality

---
 src/lib/Bcfg2/Server/Admin/Client.py     | 23 ++++++++++++++++++++---
 src/lib/Bcfg2/Server/Plugins/Metadata.py |  5 +++++
 2 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/lib/Bcfg2/Server/Admin/Client.py b/src/lib/Bcfg2/Server/Admin/Client.py
index 187ccfd71..4eb67a9de 100644
--- a/src/lib/Bcfg2/Server/Admin/Client.py
+++ b/src/lib/Bcfg2/Server/Admin/Client.py
@@ -5,6 +5,18 @@ import Bcfg2.Server.Admin
 from Bcfg2.Server.Plugin import MetadataConsistencyError
 
 
+def get_attribs(args):
+    attr_d = {}
+    for i in args[2:]:
+        attr, val = i.split('=', 1)
+        if attr not in ['profile', 'uuid', 'password', 'floating', 'secure',
+                        'address', 'auth']:
+            print("Attribute %s unknown" % attr)
+            raise SystemExit(1)
+        attr_d[attr] = val
+    return attr_d
+
+
 class Client(Bcfg2.Server.Admin.MetadataCore):
     """ Create, delete, or list client entries """
     __usage__ = "[options] [add|del|list] [attr=val]"
@@ -16,14 +28,19 @@ class Client(Bcfg2.Server.Admin.MetadataCore):
                          "Usage: %s" % self.__usage__)
         if args[0] == 'add':
             try:
-                self.metadata.add_client(args[1])
+                self.metadata.add_client(args[1], get_attribs(args))
+            except MetadataConsistencyError:
+                self.errExit("Error adding client: %s" % sys.exc_info()[1])
+        elif args[0] in ['update', 'up']:
+            try:
+                self.metadata.update_client(args[1], get_attribs(args))
             except MetadataConsistencyError:
-                self.errExit("Error in adding client: %s" % sys.exc_info()[1])
+                self.errExit("Error updating client: %s" % sys.exc_info()[1])
         elif args[0] in ['delete', 'remove', 'del', 'rm']:
             try:
                 self.metadata.remove_client(args[1])
             except MetadataConsistencyError:
-                self.errExit("Error in deleting client: %s" %
+                self.errExit("Error deleting client: %s" %
                              sys.exc_info()[1])
         elif args[0] in ['list', 'ls']:
             for client in self.metadata.list_clients():
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index 047dd4f4e..343e14162 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -658,6 +658,11 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
         if attribs is None:
             attribs = dict()
         if self._use_db:
+            if attribs:
+                msg = "Metadata does not support setting client attributes " +\
+                      "with use_database enabled"
+                self.logger.error(msg)
+                raise Bcfg2.Server.Plugin.PluginExecutionError(msg)
             try:
                 client = MetadataClientModel.objects.get(hostname=client_name)
             except MetadataClientModel.DoesNotExist:
-- 
cgit v1.2.3-1-g7c22