Metadata and other improvements:

* Added support for Client tag in groups.xml
* Added support for nested Group tags in groups.xml
* Added support for negated groups in groups.xml
* Added DatabaseBacked plugin mixin to easily allow plugins to connect
  to a database specified in global database settings in bcfg2.conf
* Added DBMetadata plugin that uses relational DB to store client
  records instead of writing to clients.xml

1 files changed, 10 insertions, 35 deletions

diff --git a/src/lib/Bcfg2/Server/Admin/Client.py b/src/lib/Bcfg2/Server/Admin/Client.py
index 734e9573d..34dfd7550 100644
--- a/src/lib/Bcfg2/Server/Admin/Client.py
+++ b/src/lib/Bcfg2/Server/Admin/Client.py
@@ -4,50 +4,23 @@ from Bcfg2.Server.Plugins.Metadata import MetadataConsistencyError
 
 
 class Client(Bcfg2.Server.Admin.MetadataCore):
-    __shorthelp__ = "Create, delete, or modify client entries"
+    __shorthelp__ = "Create, delete, or list client entries"
     __longhelp__ = (__shorthelp__ + "\n\nbcfg2-admin client add <client> "
-                                    "attr1=val1 attr2=val2"
-                                    "\nbcfg2-admin client update <client> "
-                                    "attr1=val1 attr2=val2"
                                     "\nbcfg2-admin client list"
                                     "\nbcfg2-admin client del <client>\n")
-    __usage__ = ("bcfg2-admin client [options] [add|del|update|list] [attr=val]")
+    __usage__ = ("bcfg2-admin client [options] [add|del|list] [attr=val]")
 
     def __call__(self, args):
         Bcfg2.Server.Admin.MetadataCore.__call__(self, args)
         if len(args) == 0:
             self.errExit("No argument specified.\n"
-                         "Please see bcfg2-admin client help for usage.")
+                         "Usage: %s" % self.usage)
         if args[0] == 'add':
-            attr_d = {}
-            for i in args[2:]:
-                attr, val = i.split('=', 1)
-                if attr not in ['profile', 'uuid', 'password',
-                                'location', 'secure', 'address',
-                                'auth']:
-                    print("Attribute %s unknown" % attr)
-                    raise SystemExit(1)
-                attr_d[attr] = val
             try:
-                self.metadata.add_client(args[1], attr_d)
+                self.metadata.add_client(args[1])
             except MetadataConsistencyError:
                 print("Error in adding client")
                 raise SystemExit(1)
-        elif args[0] in ['update', 'up']:
-            attr_d = {}
-            for i in args[2:]:
-                attr, val = i.split('=', 1)
-                if attr not in ['profile', 'uuid', 'password',
-                                'location', 'secure', 'address',
-                                'auth']:
-                    print("Attribute %s unknown" % attr)
-                    raise SystemExit(1)
-                attr_d[attr] = val
-            try:
-                self.metadata.update_client(args[1], attr_d)
-            except MetadataConsistencyError:
-                print("Error in updating client")
-                raise SystemExit(1)
         elif args[0] in ['delete', 'remove', 'del', 'rm']:
             try:
                 self.metadata.remove_client(args[1])
@@ -55,7 +28,9 @@ class Client(Bcfg2.Server.Admin.MetadataCore):
                 print("Error in deleting client")
                 raise SystemExit(1)
         elif args[0] in ['list', 'ls']:
-            tree = lxml.etree.parse(self.metadata.data + "/clients.xml")
-            tree.xinclude()
-            for node in tree.findall("//Client"):
-                print(node.attrib["name"])
+            for client in self.metadata.list_clients():
+                print(client.hostname)
+        else:
+            print("No command specified")
+            raise SystemExit(1)
+