From 14577be963d84982a7c40d0360a9a35fd5046e2a Mon Sep 17 00:00:00 2001
From: Andy Wray <awray@lenovo.com>
Date: Wed, 13 Feb 2019 15:36:59 -0500
Subject: [PATCH 1/2] Add nodegrouplist

---
 confluent_client/bin/nodegrouplist | 61 ++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 confluent_client/bin/nodegrouplist

diff --git a/confluent_client/bin/nodegrouplist b/confluent_client/bin/nodegrouplist
new file mode 100644
index 00000000..46e034d7
--- /dev/null
+++ b/confluent_client/bin/nodegrouplist
@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2015-2017 Lenovo
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+__author__ = 'jjohnson2,alin37,andywray'
+
+import optparse
+import os
+import signal
+import sys
+
+try:
+    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+except AttributeError:
+    pass
+path = os.path.dirname(os.path.realpath(__file__))
+path = os.path.realpath(os.path.join(path, '..', 'lib', 'python'))
+if path.startswith('/opt'):
+    sys.path.append(path)
+
+import confluent.client as client
+
+def main():
+    argparser = optparse.OptionParser(
+    usage="Usage: %prog\n")
+    (options, args) = argparser.parse_args()
+    noderange=""
+    nodelist=""
+    nodelist = '/nodegroups/'
+    session = client.Command()
+    exitcode = 0
+    showtype='all'
+    requestargs=args[1:]
+    nodetype='noderange'
+    if len(args) > 1:
+        exitcode=client.printattributes(session,requestargs,showtype,nodetype,noderange,options)
+    else:
+        for res in session.read(nodelist):
+            if 'error' in res:
+                sys.stderr.write(res['error'] + '\n')
+                exitcode = 1
+            else:
+                print res['item']['href'].replace('/', '')
+
+    sys.exit(exitcode)
+
+if __name__ == '__main__':
+    main()

From 1248894cf3cbcf849855e6683e8f716defef289e Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Thu, 28 Feb 2019 10:24:24 -0500
Subject: [PATCH 2/2] Amend nodegrouplist command

---
 confluent_client/bin/nodegrouplist          |  7 ++++---
 confluent_client/doc/man/nodegrouplist.ronn | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 confluent_client/doc/man/nodegrouplist.ronn

diff --git a/confluent_client/bin/nodegrouplist b/confluent_client/bin/nodegrouplist
index 46e034d7..baeb17a6 100644
--- a/confluent_client/bin/nodegrouplist
+++ b/confluent_client/bin/nodegrouplist
@@ -45,15 +45,16 @@ def main():
     showtype='all'
     requestargs=args[1:]
     nodetype='noderange'
-    if len(args) > 1:
-        exitcode=client.printattributes(session,requestargs,showtype,nodetype,noderange,options)
+    if len(args) > 0:
+        argparser.print_help()
+        sys.exit(1)
     else:
         for res in session.read(nodelist):
             if 'error' in res:
                 sys.stderr.write(res['error'] + '\n')
                 exitcode = 1
             else:
-                print res['item']['href'].replace('/', '')
+                print(res['item']['href'].replace('/', ''))
 
     sys.exit(exitcode)
 
diff --git a/confluent_client/doc/man/nodegrouplist.ronn b/confluent_client/doc/man/nodegrouplist.ronn
new file mode 100644
index 00000000..65604a12
--- /dev/null
+++ b/confluent_client/doc/man/nodegrouplist.ronn
@@ -0,0 +1,14 @@
+nodegroupattrib(8) -- List or change confluent nodegroup attributes
+===================================================================
+
+## SYNOPSIS
+
+`nodegrouplist`  
+
+## DESCRIPTION
+
+`nodegrouplist` lists the currently defined groups in confluent.
+
+## SEE ALSO
+
+nodeattrib(8), nodeattribexpressions(5), nodegroupattrib(8)