Temporarily back out check_power_state

It blocks ctrl-e mysteriously.

.gitignore

@@ -1,4 +1 @@
-*.pyc
-.*.
-confluent_client/man/man*
-.*.sw*
+.idea

confluent_client/addattribs.py

@@ -1,24 +0,0 @@
-#!/usr/bin/python
-import os
-import sys
-path = os.path.dirname(os.path.realpath(__file__))
-try:
-    sys.path.remove(path)
-except Exception:
-    pass
-path = os.path.realpath(os.path.join(path, '..', 'confluent_server'))
-sys.path.append(path)
-
-import confluent.config.attributes as attr
-import shutil
-
-shutil.copyfile('doc/man/nodeattrib.ronn.tmpl', 'doc/man/nodeattrib.ronn')
-shutil.copyfile('doc/man/nodegroupattrib.ronn.tmpl', 'doc/man/nodegroupattrib.ronn')
-with open('doc/man/nodeattrib.ronn', 'a') as outf:
-    for field in sorted(attr.node):
-        outf.write('\n* `{0}`:\n  {1}\n'.format(field, attr.node[field]['description']))
-with open('doc/man/nodegroupattrib.ronn', 'a') as outf:
-    for field in sorted(attr.node):
-        outf.write('\n* `{0}`:\n  {1}\n'.format(field, attr.node[field]['description']))
-
-

confluent_client/bin/collate

@@ -1,119 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 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.
-
-# This is a utility to bring xcoll (plus enhancements) to confluent
-# the core engine is textgroup.py, this simply provides a CLI to use
-# generically
-
-import optparse
-import os
-import select
-import sys
-
-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.textgroup as tg
-import confluent.client
-
-argparser = optparse.OptionParser(usage="Usage: <other command> | %prog [options]")
-argparser.add_option('-a', '--abbreviate', action='store_true',
-                     help='Attempt to use confluent server to shorten noderanges')
-argparser.add_option('-b', '--base',
-                     help='Use given node as reference for comparison when '
-                          'using -d, instead of using the most common result')
-argparser.add_option('-d', '--diff', action='store_true',
-                     help='Show what differs between most common '
-                          'output group and others')
-argparser.add_option('-w', '--watch', action='store_true',
-                     help='Show intermediate results while running')
-argparser.add_option('-g', '--groupcount', action='store_true',
-                     help='Show count of output groups rather than the actual output')                     
-argparser.add_option('-s', '--skipcommon', action='store_true',
-                     help='Do not print most common result, only non modal '
-                          'groups, useful when combined with -d')
-argparser.add_option('-c', '--count', action='store_true',
-                     help='Also display count of nodes in a given group')
-argparser.add_option('-r', '--reverse', action='store_true',
-                     help='Reverse sort order to show biggest output group '
-                          'last')
-argparser.add_option('-l', '--log', action='store', type='string', dest='log',
-                     help='Log each output to file, using {node} as a placeholder for node.')
-(options, args) = argparser.parse_args()
-if sys.stdin.isatty():
-    argparser.print_help()
-    sys.exit(1)
-
-grouped = tg.GroupedData()
-
-if options.abbreviate:
-    grouped = tg.GroupedData(confluent.client.Command())
-else:
-    grouped = tg.GroupedData()
-
-def print_current():
-    if options.diff:
-        grouped.print_deviants(skipmodal=options.skipcommon, count=options.count,
-                          reverse=options.reverse, basenode=options.base)
-    elif options.groupcount:
-        grouped.generate_byoutput()
-        print(len(grouped.byoutput))
-    else:
-        grouped.print_all(skipmodal=options.skipcommon,
-                               count=options.count,
-                               reverse=options.reverse)
-    sys.stdout.flush()
-
-fullline = sys.stdin.readline()
-printpending = True
-clearpending = False
-holdoff = 0
-while fullline:
-    for line in fullline.split('\n'):
-        if not line:
-            continue
-        if ': ' not in line:
-            line = 'UNKNOWN: ' + line
-        if options.log:
-            node, output = line.split(': ', 1)
-            currlog = options.log.format(node=node, nodename=node)
-            with open(currlog, mode='a')  as log:
-                log.write(output + '\n')
-            continue
-        grouped.add_line(*line.split(': ', 1))
-        if options.watch:
-            if not holdoff:
-                holdoff = os.times()[4] + 0.250
-            if (holdoff < os.times()[4] or
-                    not select.select((sys.stdin,), (), (), 0.250)[0]):
-                # print now, nothing pending
-                holdoff = 0
-                sys.stdout.write('\x1b[2J\x1b[;H')  # clear screen
-                print_current()
-                printpending = False
-                clearpending = True
-            else:
-                printpending = True
-    fullline = sys.stdin.readline()
-
-if printpending:
-    if clearpending:
-        sys.stdout.write('\x1b[2J\x1b[;H')  # clear screen
-    print_current()
-

confluent_client/bin/confetty

@@ -1,8 +1,8 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2014 IBM Corporation
-# Copyright 2015-2018 Lenovo
+# Copyright 2015-2016 Lenovo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -49,7 +49,6 @@ import select
 import shlex
 import signal
 import socket
-import struct
 import sys
 import time
 try:
@@ -76,13 +75,7 @@ import confluent.termhandler as termhandler
 import confluent.tlvdata as tlvdata
 import confluent.client as client
 
-try:
-    unicode
-except NameError:
-    unicode = str
-
 conserversequence = '\x05c'  # ctrl-e, c
-clearpowermessage = False
 
 oldtcattr = None
 fd = sys.stdin
@@ -94,15 +87,6 @@ except NameError:
 netserver = None
 laststate = {}
 
-try:
-    input = raw_input
-except NameError:
-    pass
-
-class BailOut(Exception):
-    def __init__(self, errorcode=0):
-        self.errorcode = errorcode
-
 
 def print_help():
     print("confetty provides a filesystem like interface to confluent.  "
@@ -131,7 +115,6 @@ def print_help():
 
 
 def updatestatus(stateinfo={}):
-    global powerstate, powertime, clearpowermessage
     status = consolename
     info = []
     for statekey in stateinfo:
@@ -146,15 +129,6 @@ def updatestatus(stateinfo={}):
         # error will be repeated if relevant
         # avoid keeping it around as stale
         del laststate['error']
-    if 'state' in stateinfo:  # currently only read power means anything
-        newpowerstate = stateinfo['state']['value']
-        if newpowerstate != powerstate and newpowerstate == 'off':
-            sys.stdout.write("\x1b[2J\x1b[;H[powered off]\r\n")
-            clearpowermessage = True
-        if newpowerstate == 'on' and clearpowermessage:
-            sys.stdout.write("\x1b[2J\x1b[;H")
-            clearpowermessage = False
-        powerstate = newpowerstate
     if 'clientcount' in laststate and laststate['clientcount'] != 1:
         info.append('clients: %d' % laststate['clientcount'])
     if 'bufferage' in stateinfo and stateinfo['bufferage'] is not None:
@@ -169,7 +143,7 @@ def updatestatus(stateinfo={}):
             info.append(time.strftime('%H:%M', time.localtime(showtime)))
     if info:
         status += ' [' + ','.join(info) + ']'
-    if os.environ.get('TERM', '') not in ('linux'):
+    if os.environ['TERM'] not in ('linux'):
         sys.stdout.write('\x1b]0;console: %s\x07' % status)
     sys.stdout.flush()
 
@@ -201,12 +175,12 @@ def recurse_format(datum, levels=0):
 
 
 def prompt():
-    if os.environ.get('TERM', '') not in ('linux'):
+    if os.environ['TERM'] not in ('linux'):
         sys.stdout.write('\x1b]0;confetty: %s\x07' % target)
     try:
-        return input(target + ' -> ')
+        return raw_input(target + ' -> ')
     except KeyboardInterrupt:
-        print("")
+        print ""
         return ""
     except EOFError:  # ctrl-d
         print("exit")
@@ -304,26 +278,20 @@ currchildren = None
 
 
 def print_result(res):
-    global exitcode
     if 'errorcode' in res or 'error' in res:
-        print(res['error'])
-        if 'errorcode' in res:
-            exitcode |= res['errorcode']
+        print res['error']
         return
     if 'databynode' in res:
         print_result(res['databynode'])
         return
-    for key in sorted(res):
+    for key in res.iterkeys():
         notes = []
         if res[key] is None:
             attrstr = '%s=""' % key
         elif type(res[key]) == list:
             attrstr = '%s=%s' % (key, recurse_format(res[key]))
         elif not isinstance(res[key], dict):
-            try:
-                print('{0}: {1}'.format(key, res[key]))
-            except UnicodeEncodeError:
-                print('{0}: {1}'.format(key, repr(res[key])))
+            print '{0}: {1}'.format(key, res[key])
             continue
         elif 'value' in res[key] and res[key]['value'] is not None:
             attrstr = '%s="%s"' % (key, res[key]['value'])
@@ -336,7 +304,7 @@ def print_result(res):
         else:
             sys.stdout.write('{0}: '.format(key))
             if isinstance(res[key], str) or isinstance(res[key], unicode):
-                print(res[key])
+                print res[key]
             else:
                 print_result(res[key])
             continue
@@ -369,9 +337,9 @@ def do_command(command, server):
         return
     argv[0] = argv[0].lower()
     if argv[0] == 'exit':
-        if os.environ.get('TERM', '') not in ('linux'):
+        if os.environ['TERM'] not in ('linux'):
             sys.stdout.write('\x1b]0;\x07')
-        raise Bailout()
+        sys.exit(0)
     elif argv[0] in ('help', '?'):
         return print_help()
     elif argv[0] == 'cd':
@@ -435,10 +403,10 @@ def do_command(command, server):
         for res in session.read(targpath):
             if 'item' in res:  # a link relation
                 if type(res['item']) == dict:
-                    print(res['item']["href"])
+                    print res['item']["href"]
                 else:
                     for item in res['item']:
-                        print(item["href"])
+                        print item["href"]
             else:  # generic attributes to list
                 if 'error' in res:
                     sys.stderr.write(res['error'] + '\n')
@@ -452,10 +420,6 @@ def do_command(command, server):
         currconsole = targpath
         startrequest = {'operation': 'start', 'path': targpath,
                         'parameters': {}}
-        height, width = struct.unpack(
-            'hh', fcntl.ioctl(sys.stdout, termios.TIOCGWINSZ, b'....'))[:2]
-        startrequest['parameters']['width'] = width
-        startrequest['parameters']['height'] = height
         for param in argv[2:]:
             (parmkey, parmval) = param.split("=")
             startrequest['parameters'][parmkey] = parmval
@@ -496,12 +460,8 @@ def createresource(args):
     if keydata is None:
         return
     targpath = fullpath_target(resname)
-    if targpath.startswith('/noderange//'):
-        collection = targpath
-    else:
-        collection, _, resname = targpath.rpartition('/')
-        if 'name' not in keydata:
-            keydata['name'] = resname
+    collection, _, resname = targpath.rpartition('/')
+    keydata['name'] = resname
     makecall(session.create, (collection, keydata))
 
 
@@ -516,13 +476,6 @@ def makecall(callout, args):
             if 'errorcode' in response:
                 exitcode = response['errorcode']
             sys.stderr.write('Error: ' + response['error'] + '\n')
-        if 'databynode' in response:
-            lresponse = response['databynode']
-            for node in lresponse:
-                if 'errorcode' in lresponse[node]:
-                    exitcode = lresponse[node]['errorcode']
-                if 'error' in lresponse[node]:
-                    sys.stderr.write('{0}: Error - {1}\n'.format(node, lresponse[node]['error']))
 
 
 def clearvalues(resource, attribs):
@@ -605,20 +558,11 @@ def fullpath_target(currpath, forcepath=False):
         ntarget += '/'
     return ntarget
 
-def do_resize(a, b):
-    if not inconsole:
-        return
-    height, width = struct.unpack(
-        'hh', fcntl.ioctl(sys.stdout, termios.TIOCGWINSZ, b'....'))[:2]
-    tlvdata.send(session.connection, {'operation': 'resize', 'width': width,
-                                      'height': height})
-
 
 def startconsole(nodename):
     global inconsole
     global consolename
     global didconsole
-    signal.signal(signal.SIGWINCH, do_resize)
     didconsole = True
     consolename = nodename
     tty.setraw(sys.stdin.fileno())
@@ -637,12 +581,11 @@ def quitconfetty(code=0, fullexit=False, fixterm=True):
         if oldtcattr is not None:
             termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, oldtcattr)
     # Request default color scheme, to undo potential weirdness of terminal
-    if sys.stdout.isatty():
-        sys.stdout.write('\x1b[m')
+    sys.stdout.write('\x1b[m')
     if fullexit:
-        if sys.stdout.isatty() and os.environ.get('TERM', '') not in ('linux'):
+        if os.environ['TERM'] not in ('linux'):
             sys.stdout.write('\x1b]0;\x07')
-        raise BailOut(code)
+        sys.exit(code)
     else:
         tlvdata.send(session.connection, {'operation': 'stop',
                                           'path': currconsole})
@@ -766,23 +709,8 @@ def conserver_command(filehandle, localcommand):
         else:
             print("Unknown power state.]\r")
 
-        check_power_state()
-    elif localcommand[0] == 'r':
-        sys.stdout.write('\x1b7\x1b[999;999H\x1b[6n')
-        sys.stdout.flush()
-        reply = ''
-        while 'R' not in reply:
-            try:
-                reply += sys.stdin.read(1)
-            except IOError:
-                pass
-        reply = reply.replace('\x1b[', '')
-        reply = reply.replace('R', '')
-        height, width = reply.split(';')
-        sys.stdout.write('\x1b8')
-        sys.stdout.flush()
-        print('sending stty commands]')
-        return 'stty columns {0}\rstty rows {1}\r'.format(width, height)
+        #check_power_state()
+
     elif localcommand[0] == '?':
         print("help]\r")
         print(".       exit console\r")
@@ -793,7 +721,6 @@ def conserver_command(filehandle, localcommand):
         print("pbs     boot to setup\r")
         print("pbn     boot to network\r")
         print("pb<ent> boot to default\r")
-        print("r       send stty command to resize terminal\r")
         print("<cr> abort command\r")
     elif localcommand[0] == '\x0d':
         print("ignored]\r")
@@ -803,10 +730,7 @@ def conserver_command(filehandle, localcommand):
 
 def get_command_bytes(filehandle, localcommand, cmdlen):
     while len(localcommand) < cmdlen:
-        try:
-            ready, _, _ = select.select((filehandle,), (), (), 1)
-        except select.error:
-            ready = ()
+        ready, _, _ = select.select((filehandle,), (), (), 1)
         if ready:
             localcommand += filehandle.read()
     return localcommand
@@ -819,10 +743,7 @@ def check_escape_seq(currinput, filehandle):
             sys.stdout.flush()
             return conserver_command(
                 filehandle, currinput[len(conserversequence):])
-        try:
-            ready, _, _ = select.select((filehandle,), (), (), 3)
-        except select.error:
-            ready = ()
+        ready, _, _ = select.select((filehandle,), (), (), 3)
         if not ready:  # 3 seconds of no typing
             break
         currinput += filehandle.read()
@@ -835,10 +756,6 @@ parser.add_option("-s", "--server", dest="netserver",
 parser.add_option("-c", "--control", dest="controlpath",
                   help="Path to offer terminal control",
                   metavar="PATH")
-parser.add_option(
-    '-m', '--mintime', default=0,
-    help='Minimum time to run or else pause for input (used to keep a '
-         'terminal from closing quickly on error)')
 opts, shellargs = parser.parse_args()
 
 username = None
@@ -863,160 +780,139 @@ def server_connect():
         passphrase = os.environ['CONFLUENT_PASSPHRASE']
         session.authenticate(username, passphrase)
     while not session.authenticated:
-        username = input("Name: ")
+        username = raw_input("Name: ")
         passphrase = getpass.getpass("Passphrase: ")
         session.authenticate(username, passphrase)
 
-def check_power_state():
-    tlvdata.send(
-        session.connection,
-        {'operation': 'retrieve',
-         'path': '/nodes/' + consolename + '/power/state'})
-    return
 
+try:
+    server_connect()
+except EOFError, KeyboardInterrupt:
+    sys.exit(0)
+except socket.gaierror:
+    sys.stderr.write('Could not connect to confluent\n')
+    sys.exit(1)
+# clear on start can help with readable of TUI, but it
+# can be annoying, so for now don't do it.
+# sys.stdout.write('\x1b[H\x1b[J')
+# sys.stdout.flush()
 
 if sys.stdout.isatty():
     import readline
 
+    readline.parse_and_bind("tab: complete")
+    readline.parse_and_bind("set bell-style none")
+    dl = readline.get_completer_delims().replace('-', '')
+    readline.set_completer_delims(dl)
+    readline.set_completer(completer)
 
-def main():
-    global inconsole
-    try:
-        server_connect()
-    except (EOFError, KeyboardInterrupt) as _:
-        raise BailOut(0)
-    except socket.gaierror:
-        sys.stderr.write('Could not connect to confluent\n')
-        raise BailOut(1)
-    # clear on start can help with readable of TUI, but it
-    # can be annoying, so for now don't do it.
-    # sys.stdout.write('\x1b[H\x1b[J')
-    # sys.stdout.flush()
-    global powerstate, powertime, clearpowermessage
+doexit = False
+inconsole = False
+pendingcommand = ""
+session_node = get_session_node(shellargs)
+if session_node is not None:
+    consoleonly = True
+    do_command("start /nodes/%s/console/session" % session_node, netserver)
+    doexit = True
+elif shellargs:
+    command = " ".join(shellargs)
+    do_command(command, netserver)
+    quitconfetty(fullexit=True, fixterm=False)
+
+powerstate = None
+powertime = None
 
 
-    if sys.stdout.isatty():
-
-        readline.parse_and_bind("tab: complete")
-        readline.parse_and_bind("set bell-style none")
-        dl = readline.get_completer_delims().replace('-', '')
-        readline.set_completer_delims(dl)
-        readline.set_completer(completer)
-
-    doexit = False
-    inconsole = False
-    pendingcommand = ""
-    session_node = get_session_node(shellargs)
-    if session_node is not None:
-        consoleonly = True
-        do_command("start /nodes/%s/console/session" % session_node, netserver)
-        doexit = True
-    elif shellargs:
-        command = " ".join(shellargs)
-        do_command(command, netserver)
-        quitconfetty(fullexit=True, fixterm=False)
-
-    powerstate = None
-    powertime = None
-
-    while inconsole or not doexit:
-        if inconsole:
-            try:
-                rdylist, _, _ = select.select(
-                    (sys.stdin, session.connection), (), (), 10)
-            except select.error:
-                rdylist = ()
-            for fh in rdylist:
-                if fh == session.connection:
-                    # this only should get called in the
-                    # case of a console session
-                    # each command should slurp up all relevant
-                    # recv potential
-                    #fh.read()
-                    try:
-                        data = tlvdata.recv(fh)
-                    except Exception:
-                        data = None
-                    if type(data) == dict:
-                        updatestatus(data)
-                        continue
-                    if data is not None:
-                        data = client.stringify(data)
-                        if clearpowermessage:
-                            sys.stdout.write("\x1b[2J\x1b[;H")
-                            clearpowermessage = False
-                        try:
-                            sys.stdout.write(data)
-                        except IOError:  # Some times circumstances are bad
-                            # resort to byte at a time...
-                            for d in data:
-                                sys.stdout.write(d)
-                        now = time.time()
-                        if ('showtime' not in laststate or
-                                (now // 60) != laststate['showtime'] // 60):
-                            # don't bother churning if minute does not change
-                            laststate['showtime'] = now
-                            updatestatus()
-                        sys.stdout.flush()
-                    else:
-                        deadline = 5
-                        connected = False
-                        while not connected and deadline > 0:
-                            try:
-                                server_connect()
-                                connected = True
-                            except Exception:
-                                pass
-                            if not connected:
-                                time.sleep(1)
-                                deadline -=1
-                        if connected:
-                            do_command(
-                                "start /nodes/%s/console/session skipreplay=True" % consolename,
-                                netserver)
-                        else:
-                            doexit = True
-                            inconsole = False
-                            sys.stdout.write("\r\n[remote disconnected]\r\n")
-                        break
-                else:
-                    try:
-                        myinput = fh.read()
-                        myinput = check_escape_seq(myinput, fh)
-                        if myinput:
-                            tlvdata.send(session.connection, myinput)
-                    except IOError:
-                        pass
-            if powerstate is None or powertime < time.time() - 10:  # Check powerstate every 10 seconds
-                powertime = time.time()
-                powerstate = True
-                check_power_state()
+def check_power_state():
+    global powerstate, powertime
+    for rsp in session.read('/nodes/' + consolename + '/power/state'):
+        if type(rsp) == dict and 'state' in rsp:
+            newpowerstate = rsp['state']['value']
+            powertime = time.time()
+            if newpowerstate != powerstate and newpowerstate == 'off':
+                sys.stdout.write("\x1b[2J\x1b[;H[powered off]\r\n")
+            powerstate = newpowerstate
+        elif type(rsp) == dict and '_requestdone' in rsp:
+            break
+        elif type(rsp) == dict:
+            updatestatus(rsp)
         else:
-            currcommand = prompt()
+            sys.stdout.write(rsp)
+            sys.stdout.flush()
+
+
+while inconsole or not doexit:
+    if inconsole:
+        rdylist, _, _ = select.select(
+            (sys.stdin, session.connection), (), (), 60)
+        for fh in rdylist:
+            if fh == session.connection:
+                # this only should get called in the
+                # case of a console session
+                # each command should slurp up all relevant
+                # recv potential
+                #fh.read()
+                try:
+                    data = tlvdata.recv(fh)
+                except Exception:
+                    data = None
+                if type(data) == dict:
+                    updatestatus(data)
+                    continue
+                if data is not None:
+                    try:
+                        sys.stdout.write(data)
+                    except IOError:  # Some times circumstances are bad
+                        # resort to byte at a time...
+                        for d in data:
+                            sys.stdout.write(d)
+                    now = time.time()
+                    if ('showtime' not in laststate or
+                            (now // 60) != laststate['showtime'] // 60):
+                        # don't bother churning if minute does not change
+                        laststate['showtime'] = now
+                        updatestatus()
+                    sys.stdout.flush()
+                else:
+                    deadline = 5
+                    connected = False
+                    while not connected and deadline > 0:
+                        try:
+                            server_connect()
+                            connected = True
+                        except (socket.gaierror, socket.error):
+                            pass
+                        if not connected:
+                            time.sleep(1)
+                            deadline -=1
+                    if connected:
+                        do_command(
+                            "start /nodes/%s/console/session skipreplay=True" % consolename,
+                            netserver)
+                    else:
+                        doexit = True
+                        inconsole = False
+                        sys.stdout.write("\r\n[remote disconnected]\r\n")
+                    break
+            else:
+                try:
+                    myinput = fh.read()
+                    myinput = check_escape_seq(myinput, fh)
+                    if myinput:
+                        tlvdata.send(session.connection, myinput)
+                except IOError:
+                    pass
+        #if powerstate is None or powertime < time.time() - 60:  # Check powerstate every 60 seconds
+        #    check_power_state()
+    else:
+        currcommand = prompt()
+        try:
+            do_command(currcommand, netserver)
+        except socket.error:
             try:
+                server_connect()
                 do_command(currcommand, netserver)
             except socket.error:
-                try:
-                    server_connect()
-                    do_command(currcommand, netserver)
-                except socket.error:
-                    doexit = True
-                    sys.stdout.write('Lost connection to server')
-    quitconfetty(fullexit=True)
-
-if __name__ == '__main__':
-    errcode = 0
-    deadline = 0
-    if opts.mintime:
-        deadline = os.times()[4] + float(opts.mintime)
-    try:
-        main()
-    except BailOut as e:
-        errcode = e.errorcode
-    finally:
-        if deadline and os.times()[4] < deadline:
-            sys.stderr.write('[Exited early, hit enter to continue]')
-            sys.stdin.readline()
-        if errcode == 0:
-            errcode = exitcode
-        sys.exit(errcode)
+                doexit = True
+                sys.stdout.write('Lost connection to server')
+quitconfetty(fullexit=True)

confluent_client/bin/confluent2ansible

@@ -1,71 +0,0 @@
-#!/usr/bin/python2
-import optparse
-import signal
-import sys
-import os
-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
-import confluent.sortutil as sortutil
-
-
-def lookupdata(data, key):
-    ret = data.get(key, {}).get('value', '')
-    if ret is None:
-        ret = ''
-    return ret
-
-def main():
-    argparser = optparse.OptionParser(
-    usage='''\n       %prog noderange -o ansible.hosts
-             \n ''')
-    argparser.add_option('-o', '--output',
-                         help='Ansible hosts file')
-    (options, args) = argparser.parse_args()
-    try:
-        noderange = args[0]
-    except IndexError:
-        argparser.print_help()
-        sys.exit(1)
-    if not options.output:
-        sys.stderr.write('Output file must be specified by -o\n')
-        sys.exit(1)
-    sess = client.Command()
-    databynode = {}
-    for res in sess.read('/noderange/{0}/attributes/all'.format(noderange)):
-        for node in res.get('databynode', {}):
-            if node not in databynode:
-                databynode[node] = {}
-            databynode[node].update(res['databynode'][node])
-    nodesbygroup = {}
-    with open(options.output, 'w') as importfile:
-        needempty = False
-        for node in sortutil.natural_sort(databynode):
-            data = databynode[node]
-            if not data.get('groups', []):
-                importfile.write(node + '\n')
-                needempty = True
-            for g in data.get('groups', []):
-                if g not in nodesbygroup:
-                    nodesbygroup[g] = set([node])
-                else:
-                    nodesbygroup[g].add(node)
-        if needempty:
-            importfile.write('\n')
-        for group in sortutil.natural_sort(nodesbygroup):
-            importfile.write('[{0}]\n'.format(group))
-            for node in sortutil.natural_sort(nodesbygroup[group]):
-                importfile.write('{0}\n'.format(node))
-            importfile.write('\n')
-
-
-if __name__ == '__main__':
-    main()

confluent_client/bin/confluent2lxca

@@ -1,76 +0,0 @@
-#!/usr/bin/python2
-import csv
-import optparse
-import signal
-import sys
-import os
-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
-import confluent.sortutil as sortutil
-
-headers = '# Type,Serial Number,Current IP,Current username,Current password,New password,Recovery password,Switch enable password,New IPv4,IPv4 Subnet mask,IPv4 Default gateway,IPv4 DNS1,IPv4 DNS2,New IPv6,IPv6 Prefix,IPv6 Default gateway,IPv6 DNS1,IPv6 DNS2,Domain,Host name,Display name,Rack,Lowest Rack Unit,Height,Force,Stored credentials ID,Managed authentication,Group Name'.split(',')
-
-def lookupdata(data, key):
-    ret = data.get(key, {}).get('value', '')
-    if ret is None:
-        ret = ''
-    return ret
-
-def main():
-    argparser = optparse.OptionParser(
-    usage='''\n       %prog noderange -o bulkimport.csv
-             \n ''')
-    argparser.add_option('-o', '--output',
-                         help='File to write for bulk import into xClarity Administrator')
-    (options, args) = argparser.parse_args()
-    try:
-        noderange = args[0]
-    except IndexError:
-        argparser.print_help()
-        sys.exit(1)
-    if not options.output:
-        sys.stderr.write('Output file must be specified by -o\n')
-        sys.exit(1)
-    if 'XCCUSER' not in os.environ or 'XCCPASS' not in os.environ:
-        sys.stderr.write('Must specify XCCUSER and XCCPASS in environment variables\n')
-        sys.exit(1)
-    xccuser = os.environ['XCCUSER']
-    xccpass = os.environ['XCCPASS']
-    sess = client.Command()
-    databynode = {}
-    for res in sess.read('/noderange/{0}/attributes/all'.format(noderange)):
-        for node in res.get('databynode', {}):
-            if node not in databynode:
-                databynode[node] = {}
-            databynode[node].update(res['databynode'][node])
-    for res in sess.read(
-            '/noderange/{0}/configuration/management_controller/net_interfaces/management'.format(
-                    noderange)):
-        for node in res.get('databynode', {}):
-            currip = res['databynode'][node].get('ipv4_address', {}).get(
-                'value', '')
-            if currip:
-                databynode[node]['hardwaremanagement.manager'] = {
-                    'value': currip.split('/', 1)[0]}
-    with open(options.output, 'w') as importfile:
-        bulkimport = csv.writer(importfile)
-        bulkimport.writerow(headers)
-        for node in sortutil.natural_sort(databynode):
-            data = databynode[node]
-            row = ['server', lookupdata(data, 'id.serial'), lookupdata(data, 'hardwaremanagement.manager'), xccuser, xccpass, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', node, lookupdata(data, 'location.rack'), lookupdata(data, 'location.u'), '', '', '','', '']
-            bulkimport.writerow(row)
-
-
-
-
-if __name__ == '__main__':
-    main()

confluent_client/bin/confluent2xcat

@@ -1,103 +0,0 @@
-#!/usr/bin/python2
-import csv
-import optparse
-import signal
-import sys
-import os
-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
-import confluent.sortutil as sortutil
-
-
-def lookupdata(data, key):
-    ret = data.get(key, {}).get('value', '')
-    if ret is None:
-        ret = ''
-    return ret
-
-def main():
-    argparser = optparse.OptionParser(
-    usage='''\n       %prog noderange -o xcatnodes.def
-             \n ''')
-    argparser.add_option('-o', '--output',
-                         help='xCAT stanza file')
-    argparser.add_option('-m', '--macs',
-                         help='xCAT macs.csv to write')
-    (options, args) = argparser.parse_args()
-    try:
-        noderange = args[0]
-    except IndexError:
-        argparser.print_help()
-        sys.exit(1)
-    if not (options.output or options.macs):
-        sys.stderr.write('Output file must be specified by -o or -m\n')
-        sys.exit(1)
-    sess = client.Command()
-    databynode = {}
-    for res in sess.read('/noderange/{0}/attributes/all'.format(noderange)):
-        for node in res.get('databynode', {}):
-            if node not in databynode:
-                databynode[node] = {}
-            databynode[node].update(res['databynode'][node])
-    if options.output:
-        with open(options.output, 'w') as importfile:
-            for node in sortutil.natural_sort(databynode):
-                xcatattrs = collect_attribute_data(databynode, node)
-                importfile.write('{0}:\n'.format(node))
-                importfile.write('   objtype=node\n')
-                importfile.write('   arch=x86_64\n')
-                importfile.write('   netboot=xnba\n')
-                importfile.write('   mgt=ipmi\n')
-                for attr in xcatattrs:
-                    if xcatattrs[attr] is None:
-                        continue
-                    importfile.write('   {0}={1}\n'.format(attr,
-                                                           xcatattrs[attr]))
-                importfile.write('\n')
-    if options.macs:
-        with open(options.macs, 'w') as importfile:
-            macsv = csv.writer(importfile)
-            macsv.writerow(['#node', 'mac'])
-            for node in sortutil.natural_sort(databynode):
-                xcatattrs = collect_attribute_data(databynode, node)
-                macsv.writerow([node, xcatattrs['mac']])
-
-
-
-def collect_attribute_data(databynode, node):
-    data = databynode[node]
-    xcatattrs = {}
-    xcatattrs['groups'] = ','.join(data.get('groups', []))
-    xcatattrs['bmc'] = data.get('hardwaremanagement.manager', {}).get(
-        'value', None)
-    xcatattrs['mpa'] = data.get('enclosure.manager', {}).get(
-        'value', None)
-    xcatattrs['slotid'] = data.get('enclosure.bay', {}).get(
-        'value', None)
-    gotmac = False
-    for key in data:
-        if key.startswith('net.') and 'hwaddr' in key:
-            currmac = data[key].get('value', None)
-            if currmac:
-                if gotmac:
-                    sys.stderr.write(
-                        'Ignoring {0} and using only {1} for mac, '
-                        'multiple macs not supported by '
-                        'confluent2xcat\n'.format(key, gotmac))
-                    continue
-                gotmac = key
-                xcatattrs['mac'] = currmac
-    return xcatattrs
-
-
-if __name__ == '__main__':
-    main()

confluent_client/bin/dir2img

@@ -1,19 +0,0 @@
-#!/bin/sh
-# This will take a given directory and make a 'big floppy image'
-# out of it, suitable for nodemedia upload.
-
-if [ -z "$1" -o -z "$2" ]; then
-        echo "Usage: $0 <directory> <imagefile>"
-        exit 1
-fi
-# Get the needed payload side
-SIZE=$(du -sB 512 $1|awk '{print $1}')
-ENTRIES=$(find $1 |wc -l)
-# Also, each file and directory has overhead, pad size by 32kb per file,
-# which should be overkill but other values proved to be inadequate
-# A deeper understanding of VFAT would probably allow for more precise value
-SIZE=$((SIZE + ENTRIES * 64))
-dd if=/dev/zero of=$2 bs=512 count=$SIZE
-# Make a big single sided floppy with many many tracks, saves on complex math
-mformat -i $2 -d 1 -t $SIZE -s 1 -h 1 ::
-mcopy -i $2 -s $1/* ::

confluent_client/bin/nodeattrib

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -17,7 +17,6 @@
 
 __author__ = 'alin37'
 
-from getpass import getpass
 import optparse
 import os
 import signal
@@ -36,23 +35,14 @@ if path.startswith('/opt'):
 import confluent.client as client
 
 argparser = optparse.OptionParser(
-    usage='''\n       %prog [-b] noderange [list of attributes or 'all']  \
+    usage='''\n       %prog [-b] noderange [list of attributes]  \
              \n       %prog -c noderange <list of attributes>  \
-             \n       %prog -e noderange <attribute names to set>  \
              \n       %prog noderange attribute1=value1 attribute2=value,...
              \n ''')
 argparser.add_option('-b', '--blame', action='store_true',
                      help='Show information about how attributes inherited')
-argparser.add_option('-e', '--environment', action='store_true',
-                     help='Set attributes, but from environment variable of '
-                          'same name')
 argparser.add_option('-c', '--clear', action='store_true',
                      help='Clear attributes')
-argparser.add_option('-p', '--prompt', action='store_true',
-                     help='Prompt for attribute values interactively')
-argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Prompt if trying to set attributes on more '
-                          'than specified number of nodes')
 (options, args) = argparser.parse_args()
 
 
@@ -65,7 +55,6 @@ try:
 except IndexError:
     argparser.print_help()
     sys.exit(1)
-client.check_globbing(noderange)
 session = client.Command()
 exitcode = 0
 
@@ -73,25 +62,8 @@ exitcode = 0
 nodetype="noderange"
 
 if len(args) > 1:
-    if "=" in args[1] or options.clear or options.environment or options.prompt:
-        if "=" in args[1] and options.clear:
-            print("Can not clear and set at the same time!")
-            argparser.print_help()
-            sys.exit(1)
-        argassign = None
-        if options.prompt:
-            argassign = {}
-            for arg in args[1:]:
-                oneval = 1
-                twoval = 2
-                while oneval != twoval:
-                    oneval = getpass('Enter value for {0}: '.format(arg))
-                    twoval = getpass('Confirm value for {0}: '.format(arg))
-                    if oneval != twoval:
-                        print('Values did not match.')
-                argassign[arg] = twoval
-        session.stop_if_noderange_over(noderange, options.maxnodes)
-        exitcode=client.updateattrib(session,args,nodetype, noderange, options, argassign)
+    if "=" in args[1] or options.clear:
+        exitcode=client.updateattrib(session,args,nodetype, noderange, options)
     try:
         # setting user output to what the user inputs
         if args[1] == 'all':
@@ -130,6 +102,6 @@ else:
             sys.stderr.write(res['error'] + '\n')
             exitcode = 1
         else:
-            print(res['item']['href'].replace('/', ''))
+            print res['item']['href'].replace('/', '')
 
-sys.exit(exitcode)
+sys.exit(exitcode)

confluent_client/bin/nodebmcreset

@@ -1,66 +0,0 @@
-#!/usr/bin/python2
-# 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.
-
-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
-
-argparser = optparse.OptionParser(usage="Usage: %prog <noderange>")
-argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Number of nodes to affect before prompting for confirmation')
-(options, args) = argparser.parse_args()
-try:
-    noderange = args[0]
-except IndexError:
-    argparser.print_help()
-    sys.exit(1)
-client.check_globbing(noderange)
-session = client.Command()
-exitcode = 0
-
-errorNodes = set([])
-session.stop_if_noderange_over(noderange, options.maxnodes)
-success = session.simple_noderange_command(noderange, 'configuration/management_controller/reset', 'reset', key='state', errnodes=errorNodes)   # = 0 if successful
-if success != 0:
-    sys.exit(success)
-
-# Determine which nodes were successful and print them
-
-allNodes = set([])
-
-for node in session.read('/noderange/{0}/nodes/'.format(noderange)):
-    allNodes.add(node['item']['href'].replace("/", ""))
-
-goodNodes = allNodes - errorNodes
-
-for node in goodNodes:
-    print(node + ": BMC Reset Successful")
-
-
-sys.exit(success)

confluent_client/bin/nodeboot

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015 Lenovo
@@ -35,17 +35,10 @@ argparser = optparse.OptionParser()
 argparser.add_option('-b', '--bios', dest='biosmode',
                      action='store_true', default=False,
                      help='Request BIOS style boot (rather than UEFI)')
-argparser.add_option('-u', '--uefi', dest='uefimode',
-                     action='store_true', default=False,
-                     help='Request UEFI style boot (rather than BIOS)')
 argparser.add_option('-p', '--persist', dest='persist', action='store_true',
                      default=False,
                      help='Request the boot device be persistent rather than '
                           'one time')
-argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Specify a maximum number of '
-                          'nodes to boot, '
-                          'prompting if over the threshold')                        
 
 (options, args) = argparser.parse_args()
 
@@ -56,10 +49,9 @@ except IndexError:
         'Usage: {0} <noderange> [default|cd|network|setup|hd]\n'.format(
             sys.argv[0]))
     sys.exit(1)
-client.check_globbing(noderange)
 bootdev = None
-if len(args) > 1:
-    bootdev = args[1]
+if len(sys.argv) > 2:
+    bootdev = sys.argv[2]
     if bootdev in ('net', 'pxe'):
         bootdev = 'network'
 session = client.Command()
@@ -69,13 +61,11 @@ if options.biosmode:
 else:
     bootmode = 'uefi'
 
-errnodes = set([])
-session.stop_if_noderange_over(noderange, options.maxnodes)
 rc = session.simple_noderange_command(noderange, '/boot/nextdevice', bootdev,
                                      bootmode=bootmode,
-                                     persistent=options.persist,
-                                     errnodes=errnodes)
-if errnodes:
-    noderange = noderange + ',-(' + ','.join(errnodes) + ')'
-rc |= session.simple_noderange_command(noderange, '/power/state', 'boot')
-sys.exit(rc)
+                                     persistent=options.persist)
+
+if rc:
+    sys.exit(rc)
+else:
+    sys.exit(session.simple_noderange_command(noderange, '/power/state', 'boot'))

confluent_client/bin/nodeconfig

@@ -1,310 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 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.
-
-
-import os
-import signal
-import optparse
-import shlex
-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
-
-class NullOpt(object):
-    blame = None
-    clear = None
-
-
-def bailout(msg, code=1):
-    sys.stderr.write(msg + '\n')
-    sys.exit(code)
-
-
-argparser = optparse.OptionParser(usage="Usage: %prog [options] noderange [option|option=value]")
-argparser.add_option('-c', '--comparedefault', dest='comparedefault',
-                     action='store_true', default=False,
-                     help='Compare given settings to default or list settings '
-                          'that are non default')
-argparser.add_option('-b', '--batch', dest='batch', metavar='settings.batch',
-                     default=False, help='Provide settings in a batch file')
-argparser.add_option('-d', '--detail', dest='detail',
-                     action='store_true', default=False,
-                     help='Provide verbose information as available, such as '
-                          'help text and possible valid values')
-argparser.add_option('-e', '--extra', dest='extra',
-                     action='store_true', default=False,
-                     help='Access extra configuration.  Extra configuration is generally '
-                           'reserved for unpopular or redundant options that may be slow to '
-                           'read.  Notably the IMM category on Lenovo settings is considered '
-                           'to be extra configuration')
-argparser.add_option('-x', '--exclude', dest='exclude',
-                     action='store_true', default=False,
-                     help='Treat positional arguments as items to not '
-                          'examine, compare, or restore default')
-argparser.add_option('-a', '--advanced', dest='advanced',
-                     action='store_true', default=False,
-                     help='Include advanced settings, which are normally not '
-                          'intended to be used without direction from the '
-                          'relevant server vendor.')
-argparser.add_option('-r', '--restoredefault', default=False,
-                     dest='restoredefault', metavar="COMPONENT",
-                     help='Restore the configuration of the node '
-                          'to factory default for given component. '
-                          'Currently only uefi is supported')
-argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Specify a maximum number of '
-                          'nodes to configure, '
-                          'prompting if over the threshold')
-(options, args) = argparser.parse_args()
-
-cfgpaths = {
-    'bmc.ipv4_address': (
-        'configuration/management_controller/net_interfaces/management',
-        'ipv4_address'),
-    'bmc.ipv4_method': (
-        'configuration/management_controller/net_interfaces/management',
-        'ipv4_configuration'),
-    'bmc.ipv4_gateway': (
-        'configuration/management_controller/net_interfaces/management',
-        'ipv4_gateway'),
-    'bmc.hostname': (
-        'configuration/management_controller/hostname', 'hostname'),
-}
-
-autodeps = {
-    'bmc.ipv4_address': (('bmc.ipv4_method', 'static'),)
-}
-
-try:
-    noderange = args[0]
-except IndexError:
-    argparser.print_help()
-    sys.exit(1)
-client.check_globbing(noderange)
-setmode = None
-assignment = {}
-queryparms = {}
-printsys = []
-printbmc = []
-printextbmc = []
-printallbmc = False
-setsys = {}
-forceset = False
-needval = None
-
-if len(args) == 1 or options.exclude:
-    if not options.exclude:
-        printsys = 'all'
-    for candidate in cfgpaths:
-        path, attrib = cfgpaths[candidate]
-        path = '/noderange/{0}/{1}'.format(noderange, path)
-        if path not in queryparms:
-            queryparms[path] = {}
-        queryparms[path][attrib] = candidate
-
-
-def _assign_value():
-    if key not in cfgpaths:
-        setsys[key] = value
-    for depkey, depval in autodeps.get(key, []):
-        assignment[depkey] = depval
-    assignment[key] = value
-
-
-def parse_config_line(arguments):
-    global setmode, printallbmc, forceset, key, value, needval, candidate, path, attrib
-    for param in arguments:
-        if param == 'show':
-            continue  # forgive muscle memory of pasu users
-        if param == 'set':
-            setmode = True
-            forceset = True
-            continue
-        if needval:
-            key = needval
-            needval = None
-            value = param
-            _assign_value()
-            continue
-        if '=' in param or param[-1] == ':' or forceset:
-            if setmode is None:
-                setmode = True
-            if setmode != True:
-                bailout('Cannot do set and query in same command')
-            if '=' in param:
-                key, _, value = param.partition('=')
-                _assign_value()
-            elif param[-1] == ':':
-                needval = param[:-1]
-            else:
-                needval = param
-        else:
-            if setmode is None:
-                setmode = False
-            if setmode != False:
-                bailout('Cannot do set and query in same command')
-            if '.' not in param:
-                if param == 'bmc':
-                    printallbmc = True
-                matchedparms = False
-                for candidate in cfgpaths:
-                    if candidate.startswith('{0}.'.format(param)):
-                        matchedparms = True
-                        if not options.exclude:
-                            path, attrib = cfgpaths[candidate]
-                            path = '/noderange/{0}/{1}'.format(noderange, path)
-                            if path not in queryparms:
-                                queryparms[path] = {}
-                            queryparms[path][attrib] = candidate
-                        else:
-                            try:
-                                del queryparms[path]
-                            except KeyError:
-                                pass
-                if param.lower() == 'imm':
-                    printextbmc.append(param)
-                    options.extra = True
-                elif not matchedparms:
-                    printsys.append(param)
-            elif param not in cfgpaths:
-                if param.startswith('bmc.'):
-                    printbmc.append(param.replace('bmc.', ''))
-                elif param.lower().startswith('imm'):
-                    options.extra = True
-                    printextbmc.append(param)
-                else:
-                    printsys.append(param)
-            else:
-                path, attrib = cfgpaths[param]
-                path = '/noderange/{0}/{1}'.format(noderange, path)
-                if path not in queryparms:
-                    queryparms[path] = {}
-                queryparms[path][attrib] = param
-
-if options.batch:
-    printsys = []
-    argfile = open(options.batch, 'r')
-    argset = argfile.readline()
-    while argset:
-        try:
-            argset = argset[:argset.index('#')]
-        except ValueError:
-            pass
-        argset = argset.strip()
-        if argset:
-            parse_config_line(shlex.split(argset))
-        argset = argfile.readline()
-else:
-    parse_config_line(args[1:])
-session = client.Command()
-rcode = 0
-if options.restoredefault:
-    session.stop_if_noderange_over(noderange, options.maxnodes)
-    if options.restoredefault.lower() in (
-        'sys', 'system', 'uefi', 'bios'):
-        for fr in session.update(
-                '/noderange/{0}/configuration/system/clear'.format(noderange),
-                {'clear': True}):
-            rcode |= client.printerror(fr)
-        sys.exit(rcode)
-    elif options.restoredefault.lower() in (
-        'bmc', 'imm', 'xcc'):
-        for fr in session.update(
-                '/noderange/{0}/configuration/management_controller/clear'.format(noderange),
-                {'clear': True}):
-            rcode |= client.printerror(fr)
-        sys.exit(rcode)
-    else:
-        sys.stderr.write(
-            'Unrecognized component to restore defaults: {0}\n'.format(
-                options.restoredefault))
-        sys.exit(1)
-if setmode:
-    session.stop_if_noderange_over(noderange, options.maxnodes)
-    if options.exclude:
-        sys.stderr.write('Cannot use exclude and assign at the same time\n')
-        sys.exit(1)
-    updatebypath = {}
-    attrnamebypath = {}
-    for key in assignment:
-        if key not in cfgpaths:
-            if key.startswith('bmc.'):
-                path = 'configuration/management_controller/extended/all'
-                attrib = key.replace('bmc.', '')
-            else:
-                path = 'configuration/system/all'
-                attrib = key
-        else:
-            path, attrib = cfgpaths[key]
-        if path not in updatebypath:
-            updatebypath[path] = {}
-            attrnamebypath[path] = {}
-        updatebypath[path][attrib] = assignment[key]
-        attrnamebypath[path][attrib] = key
-    # well, we want to expand things..
-    # check ipv4, if requested change method to static
-    for path in updatebypath:
-        for fr in session.update('/noderange/{0}/{1}'.format(noderange, path),
-                                updatebypath[path]):
-            rcode |= client.printerror(fr)
-            for node in fr.get('databynode', []):
-                r = fr['databynode'][node]
-                rcode |= client.printerror(r, node)
-                if 'value' not in r:
-                    continue
-                keyval = r['value']
-                key, val = keyval.split('=')
-                if key in attrnamebypath[path]:
-                    key = attrnamebypath[path][key]
-                print('{0}: {1}: {2}'.format(node, key, val))
-else:
-    for path in queryparms:
-        if options.comparedefault:
-            continue
-        rc = client.print_attrib_path(path, session, list(queryparms[path]),
-                                      NullOpt(), queryparms[path])
-        if rc:
-            sys.exit(rc)
-    if printsys == 'all' or printextbmc or printbmc or printallbmc:
-        if printbmc or not printextbmc:
-         rcode = client.print_attrib_path(
-                        '/noderange/{0}/configuration/management_controller/extended/all'.format(noderange),
-                        session, printbmc, options, attrprefix='bmc.')
-        if options.extra:
-            rcode |= client.print_attrib_path(
-                    '/noderange/{0}/configuration/management_controller/extended/extra'.format(noderange),
-                    session, printextbmc, options)
-    if printsys or options.exclude:
-        if printsys == 'all':
-            printsys = []
-        if (options.comparedefault or printsys == []) and not options.advanced:
-            path = '/noderange/{0}/configuration/system/all'.format(noderange)
-        else:
-            path = '/noderange/{0}/configuration/system/advanced'.format(
-                noderange)
-        rcode = client.print_attrib_path(path, session, printsys,
-                                         options)
-sys.exit(rcode)

confluent_client/bin/nodeconsole

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015 Lenovo
@@ -17,14 +17,7 @@
 
 import optparse
 import os
-import subprocess
 import sys
-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
-import confluent.sortutil as sortutil
 
 confettypath = os.path.join(os.path.dirname(sys.argv[0]), 'confetty')
 argparser = optparse.OptionParser(
@@ -33,46 +26,9 @@ argparser = optparse.OptionParser(
            "ctrl-'e', then release ctrl, then 'c', then '?' for a full list. "
            "For example, ctrl-'e', then 'c', then '.' will exit the current "
            "console")
-argparser.add_option('-t', '--tile', action='store_true', default=False,
-                     help='Tile console windows in the terminal')
 (options, args) = argparser.parse_args()
 if len(args) != 1:
     argparser.print_help()
     sys.exit(1)
-if options.tile:
-    null = open('/dev/null', 'w')
-    nodes = []
-    sess = client.Command()
-    for res in sess.read('/noderange/{0}/nodes/'.format(args[0])):
-        node = res.get('item', {}).get('href', '/').replace('/', '')
-        if not node:
-            sys.stderr.write(res.get('error', repr(res)) + '\n')
-            sys.exit(1)
-        nodes.append(node)
-    initial = True
-    pane = 0
-    sessname = 'nodeconsole_{0}'.format(os.getpid())
-    for node in sortutil.natural_sort(nodes):
-        panename = '{0}:{1}'.format(sessname, pane)
-        if initial:
-            initial = False
-            subprocess.call(
-                ['tmux', 'new-session', '-d', '-s',
-                 sessname, '-x', '800', '-y',
-                 '800', '{0} -m 5 start /nodes/{1}/console/session'.format(
-                    confettypath, node)])
-        else:
-            subprocess.call(['tmux', 'select-pane', '-t', sessname])
-            subprocess.call(['tmux', 'set-option', '-t', panename, 'pane-border-status', 'top'], stderr=null)
-            subprocess.call(
-                    ['tmux', 'split', '-h', '-t', sessname,
-                 '{0} -m 5 start /nodes/{1}/console/session'.format(
-                     confettypath, node)])
-            subprocess.call(['tmux', 'select-layout', '-t', sessname, 'tiled'], stdout=null)
-            pane += 1
-    subprocess.call(['tmux', 'select-pane', '-t', sessname])
-    subprocess.call(['tmux', 'set-option', '-t', panename, 'pane-border-status', 'top'], stderr=null)
-    os.execlp('tmux', 'tmux', 'attach', '-t', sessname)
-else:
-    os.execl(confettypath, confettypath, 'start',
-             '/nodes/{0}/console/session'.format(args[0]))
+os.execl(confettypath, confettypath, 'start',
+         '/nodes/{0}/console/session'.format(args[0]))

confluent_client/bin/nodedefine

@@ -1,58 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 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.
-
-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
-
-argparser = optparse.OptionParser(
-    usage='''\n       %prog noderange attribute1=value1 attribute2=value,...
-             \n ''')
-(options, args) = argparser.parse_args()
-requestargs=None
-try:
-    noderange = args[0]
-except IndexError:
-    argparser.print_help()
-    sys.exit(1)
-client.check_globbing(noderange)
-session = client.Command()
-exitcode = 0
-attribs = {'name': noderange}
-for arg in args[1:]:
-    key, val = arg.split('=', 1)
-    attribs[key] = val
-for r in session.create('/noderange/', attribs):
-    if 'error' in r:
-        sys.stderr.write(r['error'] + '\n')
-        exitcode |= 1
-    if 'created' in r:
-        print('{0}: created'.format(r['created']))
-sys.exit(exitcode)

confluent_client/bin/nodediscover

@@ -1,362 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 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.
-
-import csv
-import optparse
-import os
-import sys
-import time
-
-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
-import confluent.sortutil as sortutil
-
-defcolumns = ['Node', 'Model', 'Serial', 'UUID', 'Mac Address', 'Type',
-              'Current IP Addresses']
-columnmapping = {
-    'Node': 'nodename',
-    'Model': 'modelnumber',
-    'Serial': 'serialnumber',
-    'UUID': 'uuid',
-    'Type': 'types',
-    'Current IP Addresses': 'ipaddrs',
-    'IP': 'ipaddrs',
-    'Bay': 'bay',
-    'Mac Address': 'macs',
-    'Mac': 'macs',
-    'Switch': 'switch',
-    'Port': 'port',
-    'Advertised IP': 'otheripaddrs',
-    'Other IP': 'otheripaddrs',
-}
-
-
-def print_disco(options, session, currmac, outhandler, columns):
-    procinfo = {}
-    for tmpinfo in session.read('/discovery/by-mac/{0}'.format(currmac)):
-
-        procinfo.update(tmpinfo)
-    if 'Switch' in columns or 'Port' in columns:
-        for tmpinfo in session.read(
-                '/networking/macs/by-mac/{0}'.format(currmac)):
-            if 'ports' in tmpinfo:
-                # The api sorts so that the most specific available value
-                # is last
-                procinfo.update(tmpinfo['ports'][-1])
-    record = []
-    for col in columns:
-        rawcol = columnmapping[col]
-        rawval = procinfo.get(rawcol, '')
-        if isinstance(rawval, list):
-            record.append(','.join(rawval))
-        else:
-            record.append(str(rawval))
-    outhandler.add_row(record)
-
-
-def process_header(header):
-    # normalize likely header titles
-    fields = []
-    broken = False
-    for datum in header:
-        datum = datum.lower()
-        if datum.startswith('node') or datum.startswith('name'):
-            fields.append('node')
-        elif datum in ('nodegroup', 'nodegroups', 'group', 'groups'):
-            fields.append('groups')
-        elif datum.startswith('mac') or datum.startswith('ether'):
-            fields.append('mac')
-        elif datum.startswith('serial') or datum in ('sn', 's/n'):
-            fields.append('serial')
-        elif datum == 'uuid':
-            fields.append('uuid')
-        elif datum in ('bmc', 'imm', 'xcc'):
-            fields.append('hardwaremanagement.manager')
-        elif datum in ('bmc gateway', 'xcc gateway', 'imm gateway'):
-            fields.append('net.bmc.ipv4_gateway')
-        elif datum in ('bmc_gateway', 'xcc_gateway', 'imm_gateway'):
-            fields.append('net.bmc.ipv4_gateway')
-        elif datum in ('bmcuser', 'username', 'user'):
-            fields.append('secret.hardwaremanagementuser')
-        elif datum in ('bmcpass', 'password', 'pass'):
-            fields.append('secret.hardwaremanagementpassword')
-        else:
-            print("Unrecognized column name {0}".format(datum))
-            broken = True
-    if broken:
-        sys.exit(1)
-    return tuple(fields)
-
-
-def datum_complete(datum):
-    if 'node' not in datum or not datum['node']:
-        sys.stderr.write('Nodename is a required field')
-        return False
-    provided = set(datum)
-    required = set(['serial', 'uuid', 'mac'])
-    for field in provided & required:
-        if datum[field]:
-            break
-    else:
-        sys.stderr.write('One of the fields "Serial Number", "UUID", or '
-                   '"MAC Address" must be provided')
-        return False
-    return True
-
-
-searchkeys = set(['mac', 'serial', 'uuid'])
-
-
-def search_record(datum, options, session):
-    for searchkey in searchkeys:
-        options.__dict__[searchkey] = None
-    for searchkey in searchkeys & set(datum):
-        options.__dict__[searchkey] = datum[searchkey]
-    return list(list_matching_macs(options, session))
-
-
-def datum_to_attrib(datum):
-    for key in ('serial', 'uuid', 'mac'):
-        try:
-            del datum[key]
-        except KeyError:
-            pass
-    datum['name'] = datum['node']
-    del datum['node']
-    return datum
-
-unique_fields = frozenset(['serial', 'mac', 'uuid'])
-
-def import_csv(options, session):
-    nodedata = []
-    unique_data = {}
-    with open(options.importfile, 'r') as datasrc:
-        records = csv.reader(datasrc)
-        fields = process_header(next(records))
-        for field in fields:
-            if field in unique_fields:
-                unique_data[field] = set([])
-        broken = False
-        for record in records:
-            currfields = list(fields)
-            nodedatum = {}
-            for datum in record:
-                currfield = currfields.pop(0)
-                if currfield in unique_fields:
-                    if datum in unique_data[currfield]:
-                        sys.stderr.write(
-                            "Import contains duplicate values "
-                            "({0} with value {1}\n".format(currfield, datum)
-                        )
-                        sys.exit(1)
-                    unique_data[currfield].add(datum)
-                nodedatum[currfield] = datum
-            if not datum_complete(nodedatum):
-                sys.exit(1)
-            if not search_record(nodedatum, options, session) and not broken:
-                blocking_scan(session)
-            if not search_record(nodedatum, options, session):
-                sys.stderr.write(
-                    "Could not match the following data: " +
-                    repr(nodedatum) + '\n')
-                broken = True
-            nodedata.append(nodedatum)
-    if broken:
-        sys.exit(1)
-    for datum in nodedata:
-        maclist = search_record(datum, options, session)
-        datum = datum_to_attrib(datum)
-        nodename = datum['name']
-        for res in session.create('/nodes/', datum):
-            if 'error' in res:
-                sys.stderr.write(res['error'] + '\n')
-                continue
-            elif 'created' in res:
-                print('Defined ' + res['created'])
-            else:
-                print(repr(res))
-        for mac in maclist:
-            for res in session.update('/discovery/by-mac/{0}'.format(mac),
-                                      {'node': nodename}):
-                if 'error' in res:
-                    sys.stderr.write(res['error'] + '\n')
-                    continue
-                elif 'assigned' in res:
-                    print('Discovered ' + res['assigned'])
-                else:
-                    print(repr(res))
-
-
-def list_discovery(options, session):
-    orderby = None
-    if options.fields:
-        columns = []
-        for field in options.fields.split(','):
-            for cdt in columnmapping:
-                if cdt.lower().replace(
-                        ' ', '') == field.lower().replace(' ', ''):
-                    columns.append(cdt)
-    else:
-        columns = defcolumns
-    if options.order:
-        for field in columns:
-            if options.order.lower() == field.lower():
-                orderby = field
-    outhandler = client.Tabulator(columns)
-    for mac in list_matching_macs(options, session):
-        print_disco(options, session, mac, outhandler, columns)
-    if options.csv:
-        outhandler.write_csv(sys.stdout, orderby)
-    else:
-        for row in outhandler.get_table(orderby):
-            print(row)
-
-def clear_discovery(options, session):
-    for mac in list_matching_macs(options, session):
-        for res in session.delete('/discovery/by-mac/{0}'.format(mac)):
-            if 'deleted' in res:
-                print('Cleared info for {0}'.format(res['deleted']))
-            else:
-                print(repr(res))
-
-def list_matching_macs(options, session, node=None, checknode=True):
-    path = '/discovery/'
-    if node:
-        path += 'by-node/{0}/'.format(node)
-    elif checknode and options.node:
-        path += 'by-node/{0}/'.format(options.node)
-    if options.model:
-        path += 'by-model/{0}/'.format(options.model)
-    if options.serial:
-        path += 'by-serial/{0}/'.format(options.serial)
-    if options.uuid:
-        path += 'by-uuid/{0}/'.format(options.uuid)
-    if options.type:
-        path += 'by-type/{0}/'.format(options.type)
-    if options.state:
-        if options.state == 'unknown':
-            options.state = 'unidentified'
-        path += 'by-state/{0}/'.format(options.state).lower()
-    if options.mac:
-        path += 'by-mac/{0}'.format(options.mac)
-        result = list(session.read(path))[0]
-        if 'error' in result:
-            return []
-        return [options.mac.replace(':', '-')]
-    else:
-        path += 'by-mac/'
-        return [x['item']['href'] for x in session.read(path)]
-
-def assign_discovery(options, session, needid=True):
-    abort = False
-    if options.importfile:
-        return import_csv(options, session)
-    if not options.node:
-        sys.stderr.write("Node (-n) must be specified for assignment\n")
-        abort = True
-    if needid and not (options.serial or options.uuid or options.mac):
-        sys.stderr.write(
-            "UUID (-u), serial (-s), or ether address (-e) required for "
-            "assignment\n")
-        abort = True
-    if abort:
-        sys.exit(1)
-    matches = list_matching_macs(options, session, None if needid else options.node, False)
-    if not matches:
-        # Do a rescan to catch missing requested data
-        blocking_scan(session)
-        matches = list_matching_macs(options, session, None if needid else options.node, False)
-    if not matches:
-        sys.stderr.write("No matching discovery candidates found\n")
-        sys.exit(1)
-    for res in session.update('/discovery/by-mac/{0}'.format(matches[0]),
-                   {'node': options.node}):
-        if 'assigned' in res:
-            print('Assigned: {0}'.format(res['assigned']))
-        else:
-            print(repr(res))
-
-def blocking_scan(session):
-    list(session.update('/discovery/rescan', {'rescan': 'start'}))
-    while(list(session.read('/discovery/rescan'))[0].get('scanning', False)):
-        time.sleep(0.5)
-    list(session.update('/networking/macs/rescan', {'rescan': 'start'}))
-
-
-def main():
-    parser = optparse.OptionParser(
-        usage='Usage: %prog [list|assign|rescan|clear] [options]')
-    # -a for 'address' maybe?
-    # order by
-    # show state (discovered or..
-    # nodediscover approve?
-    # flush to clear old data out?  (e.g. no good way to age pxe data)
-    # also delete discovery datum... more targeted
-    # defect: -t lenovo-imm returns all
-    parser.add_option('-m', '--model', dest='model',
-                      help='Operate with nodes matching the specified model '
-                       'number', metavar='MODEL')
-    parser.add_option('-d', '--discoverystate', dest='state',
-                      help='The discovery state of the entries (discovered, '
-                           'identified, and unidentified)')
-    parser.add_option('-s', '--serial', dest='serial',
-                      help='Operate against the system matching the specified '
-                           'serial number', metavar='SERIAL')
-    parser.add_option('-u', '--uuid', dest='uuid',
-                      help='Operate against the system matching the specified '
-                           'UUID', metavar='UUID')
-    parser.add_option('-n', '--node', help='Operate with the given nodename')
-    parser.add_option('-e', '--ethaddr', dest='mac',
-                      help='Operate against the system with the specified MAC '
-                           'address', metavar='MAC')
-    parser.add_option('-t', '--type', dest='type',
-                      help='Operate against the system of the specified type',
-                      metavar='TYPE')
-    parser.add_option('-c', '--csv', dest='csv',
-                      help='Use CSV formatted output', action='store_true')
-    parser.add_option('-i', '--import', dest='importfile',
-                      help='Import bulk assignment data from given CSV file',
-                      metavar='IMPORT.CSV')
-    parser.add_option('-f', '--fields', dest='fields',
-                      help='Select fields for output',
-                      metavar='FIELDS')
-    parser.add_option('-o', '--order', dest='order',
-                      help='Order output by given field', metavar='ORDER')
-    (options, args) = parser.parse_args()
-    if len(args) == 0 or args[0] not in ('list', 'assign', 'reassign', 'rescan', 'clear'):
-        parser.print_help()
-        sys.exit(1)
-    session = client.Command()
-    if args[0] == 'list':
-        list_discovery(options, session)
-    if args[0] == 'clear':
-        clear_discovery(options, session)
-    if args[0] == 'assign':
-        assign_discovery(options, session)
-    if args[0] == 'reassign':
-        assign_discovery(options, session, False)
-    if args[0] == 'rescan':
-        blocking_scan(session)
-        print("Rescan complete")
-
-
-if __name__ == '__main__':
-    main()

confluent_client/bin/nodeeventlog

@@ -1,7 +1,7 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2015-2019 Lenovo
+# 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.
@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import codecs
 from datetime import datetime as dt
 import optparse
 import os
@@ -33,32 +32,19 @@ if path.startswith('/opt'):
 
 import confluent.client as client
 
-if sys.version_info[0] < 3:
-    sys.stdout = codecs.getwriter('utf8')(sys.stdout)
-
 argparser = optparse.OptionParser(
     usage="Usage: %prog [options] noderange [clear]")
-argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Specify a maximum number of '
-                          'nodes to clear if clearing log, '
-                          'prompting if over the threshold')            
 (options, args) = argparser.parse_args()
 try:
     noderange = args[0]
 except IndexError:
     argparser.print_help()
     sys.exit(1)
-client.check_globbing(noderange)
+
 deletemode = False
-if len(args) > 2:
-    argparser.print_help()
-    sys.exit(1)
-if len(args) == 2:
-    if args[1] == 'clear':
+if len(sys.argv) == 3:
+    if sys.argv[2] == 'clear':
         deletemode = True
-    else:
-        argparser.print_help()
-        sys.exit(1)
 
 session = client.Command()
 exitcode = 0
@@ -69,8 +55,6 @@ def format_event(evt):
         display = dt.strptime(evt['timestamp'], '%Y-%m-%dT%H:%M:%S')
         retparts.append(display.strftime('%m/%d/%Y %H:%M:%S'))
     dscparts = []
-    if evt.get('log_id', None):
-        retparts.append(evt['log_id'] + ':')
     if 'component_type' in evt and evt['component_type'] is not None:
         dscparts.append(evt['component_type'])
     if 'component' in evt and evt['component'] is not None:
@@ -84,15 +68,11 @@ def format_event(evt):
             pass
         dscparts.append(evttext)
     retparts.append(' - '.join(dscparts))
-    msg = evt.get('message')
-    if not msg:
-        msg = ''
-    return ' '.join(retparts) + msg
+    return ' '.join(retparts)
 
 
 if deletemode:
     func = session.delete
-    session.stop_if_noderange_over(noderange, options.maxnodes)
 else:
     func = session.read
 for rsp in func('/noderange/{0}/events/hardware/log'.format(noderange)):
@@ -109,4 +89,4 @@ for rsp in func('/noderange/{0}/events/hardware/log'.format(noderange)):
             if 'events' in thisdata:
                evtdata = thisdata['events']
                for evt in evtdata:
-                   print('{0}: {1}'.format(node, format_event(evt)))
+                   print '{0}: {1}'.format(node, format_event(evt))

confluent_client/bin/nodefirmware

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2016-2017 Lenovo
@@ -19,7 +19,6 @@ import optparse
 import os
 import signal
 import sys
-import time
 
 try:
     signal.signal(signal.SIGPIPE, signal.SIG_DFL)
@@ -31,20 +30,32 @@ if path.startswith('/opt'):
     sys.path.append(path)
 
 import confluent.client as client
-import confluent.screensqueeze as sq
+
 
 exitcode = 0
 
+def printerror(res, node=None):
+    global exitcode
+    if 'errorcode' in res:
+        exitcode = res['errorcode']
+    if 'error' in res:
+        if node:
+            sys.stderr.write('{0}: {1}\n'.format(node, res['error']))
+        else:
+            sys.stderr.write('{0}\n'.format(res['error']))
+        if 'errorcode' not in res:
+            exitcode = 1
+
 
 def printfirm(node, prefix, data):
-    if 'model' in data and data['model']:
+    if 'model' in data:
         prefix += ' ' + data['model']
     builddesc = []
-    if 'build' in data and data['build']:
+    if 'build' in data:
         builddesc.append(data['build'])
-    if 'date' in data and data['date']:
+    if 'date' in data:
         builddesc.append(data['date'])
-    if 'version' in data and data['version']:
+    if 'version' in data:
         version = data['version']
         if builddesc:
             version += ' ({0})'.format(' '.join(builddesc))
@@ -52,120 +63,28 @@ def printfirm(node, prefix, data):
         version = ' '.join(builddesc)
     print('{0}: {1}: {2}'.format(node, prefix, version))
 
-components = ['all']
 
-argparser = optparse.OptionParser(
-    usage="Usage: "
-          "%prog <noderange> [list][update [--backup <file>]]|[<components>]")
-argparser.add_option('-b', '--backup', action='store_true',
-                     help='Target a backup bank rather than primary')
-argparser.add_option('-m', '--maxnodes', type='int',
-                     help='When updating, prompt if more than the specified '
-                          'number of servers will be affected')
-             
+argparser = optparse.OptionParser(usage="Usage: %prog <noderange>")
 (options, args) = argparser.parse_args()
-upfile = None
 try:
     noderange = args[0]
-    if len(args) > 1:
-        if args[1] == 'update':
-            upfile = args[2]
-        else:
-            if args[1] == 'list':
-                comps = args[2:]
-            else:
-                comps = args[1:]
-            components = []
-            for arg in comps:
-                components += arg.split(',')
-            if not components:
-                components = ['all']
-
 except IndexError:
     argparser.print_help()
     sys.exit(1)
-client.check_globbing(noderange)
-
-def get_update_progress(session, url):
-    for res in session.read(url):
-        status = res['phase']
-        percent = res['progress']
-        detail = res['detail']
-        if status == 'error':
-            text = 'error!'
-        else:
-            text = '{0}: {1:3.0f}%'.format(status, percent)
-    return text, status, detail
-
-def update_firmware(session, filename):
-    global exitcode
-    session.stop_if_noderange_over(noderange, options.maxnodes)
-    output = sq.ScreenPrinter(noderange, session)
-    nodeurls = {}
-    filename = os.path.abspath(filename)
-    resource = '/noderange/{0}/inventory/firmware/updates/active'.format(
-        noderange)
-    upargs = {'filename': filename}
-    if options.backup:
-        upargs['bank'] = 'backup'
-    noderrs = {}
-    for res in session.create(resource, upargs):
-        if 'created' not in res:
-            for nodename in res.get('databynode', ()):
-                output.set_output(nodename, 'error!')
-                noderrs[nodename] = res['databynode'][nodename].get(
-                    'error', 'Unknown Error')
-            continue
-        watchurl = res['created']
-        currnode = watchurl.split('/')[1]
-        nodeurls[currnode] = '/' + watchurl
-    while nodeurls:
-        for node in list(nodeurls):
-            progress, status, err = get_update_progress(
-                session, nodeurls[node])
-            if status == 'error':
-                exitcode = 1
-                noderrs[node] = err
-            if status in ('error', 'complete', 'pending'):
-                list(session.delete(nodeurls[node]))
-                del nodeurls[node]
-            output.set_output(node, progress)
-        time.sleep(2)
-    allerrnodes = ','.join(noderrs)
-    if noderrs:
-        sys.stderr.write(
-            'Nodes had errors updating ({0})!\n'.format(allerrnodes))
-    for node in noderrs:
-        sys.stderr.write('{0}: {1}\n'.format(node, noderrs[node]))
-
-def show_firmware(session):
-    global exitcode
-    firmware_shown = False
-    for component in components:
-        for res in session.read(
-                '/noderange/{0}/inventory/firmware/all/{1}'.format(
-                    noderange, component)):
-            exitcode |= client.printerror(res)
-            if 'databynode' not in res:
-                continue
-            for node in res['databynode']:
-                exitcode |= client.printerror(res['databynode'][node], node)
-                if 'firmware' not in res['databynode'][node]:
-                    continue
-                for inv in res['databynode'][node]['firmware']:
-                    for prefix in inv:
-                        firmware_shown = True
-                        printfirm(node, prefix, inv[prefix])
-    if not firmware_shown and not exitcode:
-        argparser.print_help()
-
-
 try:
     session = client.Command()
-    if upfile is None:
-        show_firmware(session)
-    else:
-        update_firmware(session, upfile)
+    for res in session.read('/noderange/{0}/inventory/firmware/all/all'.format(
+            noderange)):
+        printerror(res)
+        if 'databynode' not in res:
+            continue
+        for node in res['databynode']:
+            printerror(res['databynode'][node], node)
+            if 'firmware' not in res['databynode'][node]:
+                continue
+            for inv in res['databynode'][node]['firmware']:
+                for prefix in inv:
+                    printfirm(node, prefix, inv[prefix])
 except KeyboardInterrupt:
     print('')
-sys.exit(exitcode)
+sys.exit(exitcode)

confluent_client/bin/nodegroupattrib

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -17,7 +17,6 @@
 
 __author__ = 'alin37'
 
-from getpass import getpass
 import optparse
 import os
 import signal
@@ -36,20 +35,14 @@ import confluent.client as client
 
 argparser = optparse.OptionParser(
     usage='''\n       %prog [options]   \
-             \n       %prog [options] nodegroup [list of attributes|all]  \
-             \n       %prog [options] nodegroup nodes=value1,value2   \
-             \n       %prog -e nodegroup <attribute names to set>  \
-             \n       %prog [options] nodegroup nodes=value1,value2
+             \n       %prog [options] nodegroup [list of attributes]  \
+             \n       %prog [options] nodegroup group=value1,value2   \
+             \n       %prog [options] nodegroup group=value1,value2
              \n ''')
 argparser.add_option('-b', '--blame', action='store_true',
                      help='Show information about how attributes inherited')
-argparser.add_option('-e', '--environment', action='store_true',
-                     help='Set attributes, but from environment variable of '
-                          'same name')
 argparser.add_option('-c', '--clear', action='store_true',
                      help='Clear variables')
-argparser.add_option('-p', '--prompt', action='store_true',
-                     help='Prompt for attribute values interactively')
 (options, args) = argparser.parse_args()
 
 
@@ -63,7 +56,6 @@ try:
     nodelist = '/{0}/{1}/'.format(nodetype,nodegroups)
 except IndexError:
     nodelist = '/nodegroups/'
-client.check_globbing(nodegroups)
 session = client.Command()
 exitcode = 0
 
@@ -71,23 +63,7 @@ exitcode = 0
 
 if len(args) > 1:
     showtype = 'all'
-    if "=" in args[1] and options.clear:
-        print("Can not clear and set at the same time!")
-        argparser.print_help()
-        sys.exit(1)
-    argassign = None
-    if options.prompt:
-        argassign = {}
-        for arg in args[1:]:
-            oneval = 1
-            twoval = 2
-            while oneval != twoval:
-                oneval = getpass('Enter value for {0}: '.format(arg))
-                twoval = getpass('Confirm value for {0}: '.format(arg))
-                if oneval != twoval:
-                    print('Values did not match.')
-            argassign[arg] = twoval
-    exitcode=client.updateattrib(session,args,nodetype, nodegroups, options, argassign)
+    exitcode=client.updateattrib(session,args,nodetype, nodegroups, options)
     try:
         # setting user output to what the user inputs
         if args[1] == 'all':
@@ -97,7 +73,7 @@ if len(args) > 1:
 
         requestargs=args[1:]
     except Exception as e:
-        print(str(e))
+        print str(e)
 
 if exitcode != 0:
     sys.exit(exitcode)
@@ -123,6 +99,6 @@ else:
             sys.stderr.write(res['error'] + '\n')
             exitcode = 1
         else:
-            print(res['item']['href'].replace('/', ''))
+            print res['item']['href'].replace('/', '')
 
-sys.exit(exitcode)
+sys.exit(exitcode)

confluent_client/bin/nodegroupdefine

@@ -1,58 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 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.
-
-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
-
-argparser = optparse.OptionParser(
-    usage='''\n       %prog noderange attribute1=value1 attribute2=value,...
-             \n ''')
-(options, args) = argparser.parse_args()
-requestargs=None
-try:
-    noderange = args[0]
-except IndexError:
-    argparser.print_help()
-    sys.exit(1)
-client.check_globbing(noderange)
-session = client.Command()
-exitcode = 0
-attribs = {'name': noderange}
-for arg in args[1:]:
-    key, val = arg.split('=', 1)
-    attribs[key] = val
-for r in session.create('/nodegroups/', attribs):
-    if 'error' in r:
-        sys.stderr.write(r['error'] + '\n')
-        exitcode |= 1
-    if 'created' in r:
-        print('{0}: created'.format(r['created']))
-sys.exit(exitcode)

confluent_client/bin/nodegrouplist

@@ -1,62 +0,0 @@
-#!/usr/bin/python2
-# 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) > 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('/', ''))
-
-    sys.exit(exitcode)
-
-if __name__ == '__main__':
-    main()

confluent_client/bin/nodegroupremove

@@ -1,52 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 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.
-
-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
-
-argparser = optparse.OptionParser(
-    usage='''\n       %prog noderange
-             \n ''')
-(options, args) = argparser.parse_args()
-if len(args) != 1:
-    argparser.print_help()
-    sys.exit(1)
-noderange = args[0]
-client.check_globbing(noderange)
-session = client.Command()
-exitcode = 0
-for r in session.delete('/nodegroups/{0}'.format(noderange)):
-    if 'error' in r:
-        sys.stderr.write(r['error'] + '\n')
-        exitcode |= 1
-    if 'deleted' in r:
-        print('{0}: deleted'.format(r['deleted']))
-sys.exit(exitcode)

confluent_client/bin/nodegrouprename

@@ -1,63 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2019 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 <group> <new group name>\n")
-    (options, args) = argparser.parse_args()
-    noderange=""
-    nodelist=""
-    nodelist = '/nodegroups/'
-    session = client.Command()
-    exitcode = 0
-    requestargs=args[1:]
-    nodetype='noderange'
-    if len(args) != 2:
-        argparser.print_help()
-        sys.exit(1)
-    else:
-        for res in session.update(
-            '/nodegroups/{0}/attributes/rename'.format(args[0]),
-            {'rename': args[1]}):
-            if 'error' in res:
-                sys.stderr.write(res['error'] + '\n')
-                exitcode = 1
-            else:
-                print('{0}: {1}'.format(res['oldname'], res['newname']))
-
-    sys.exit(exitcode)
-
-if __name__ == '__main__':
-    main()

confluent_client/bin/nodehealth

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
@@ -32,8 +32,7 @@ if path.startswith('/opt'):
 
 import confluent.client as client
 
-if sys.version_info[0] < 3:
-    sys.stdout = codecs.getwriter('utf8')(sys.stdout)
+sys.stdout = codecs.getwriter('utf8')(sys.stdout)
 
 argparser = optparse.OptionParser(usage="Usage: %prog <noderange>")
 (options, args) = argparser.parse_args()
@@ -42,16 +41,8 @@ try:
 except IndexError:
     argparser.print_help()
     sys.exit(1)
-client.check_globbing(noderange)
 
 
-codemappings = {
-    'ok': 0,
-    'warning': 1,
-    'critical': 2,
-    'failed': 2,
-}
-
 def main():
     global session, exitcode, healthbynode, healthexplanations, health, node, sensor, explanation
     session = client.Command()
@@ -74,11 +65,9 @@ def main():
             if 'error' in health[node]:
                 sys.stderr.write('{0}: Error: {1}\n'.format(
                     node, health[node]['error']))
-                exitcode = 3
+                exitcode |= 1
             if 'health' in health[node]:
                 healthbynode[node] = health[node]['health']['value']
-                if codemappings[healthbynode[node]] > exitcode:
-                    exitcode = codemappings[healthbynode[node]]
             if 'sensors' in health[node]:
                 healthexplanations[node] = []
                 for sensor in health[node]['sensors']:
@@ -104,5 +93,5 @@ try:
     main()
 except KeyboardInterrupt:
     print('')
-sys.exit(exitcode)
+    sys.exit(0)
 

confluent_client/bin/nodeidentify

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
@@ -31,17 +31,20 @@ if path.startswith('/opt'):
 
 import confluent.client as client
 
-argparser = optparse.OptionParser(usage="Usage: %prog <noderange> [on|off|blink]")
+argparser = optparse.OptionParser(usage="Usage: %prog <noderange> [on|off]")
 (options, args) = argparser.parse_args()
 try:
     noderange = args[0]
 except IndexError:
     argparser.print_help()
     sys.exit(1)
-client.check_globbing(noderange)
+
 identifystate = None
 if len(sys.argv) > 2:
     identifystate = sys.argv[2]
+else:
+	argparser.print_help()
+	sys.exit(1)
 session = client.Command()
 exitcode = 0
 sys.exit(

confluent_client/bin/nodeinventory

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2016-2017 Lenovo
@@ -15,11 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import codecs
-import json
 import optparse
 import os
-import re
 import signal
 import sys
 
@@ -34,11 +31,6 @@ if path.startswith('/opt'):
 
 import confluent.client as client
 
-if sys.version_info[0] < 3:
-    sys.stdout = codecs.getwriter('utf8')(sys.stdout)
-
-filters = []
-
 
 def pretty(text):
     if text == 'pcislot':
@@ -48,20 +40,15 @@ def pretty(text):
     return text
 
 def print_mem_info(node, prefix, meminfo):
+    capacity = meminfo['capacity_mb'] / 1024
     memdescfmt = '{0}GB PC'
     if meminfo['memory_type'] == 'DDR3 SDRAM':
         memdescfmt += '3-{1} '
-    elif 'DDR4' in meminfo['memory_type']:
+    elif meminfo['memory_type'] == 'DDR4 SDRAM':
         memdescfmt += '4-{1} '
-    else:
-        print('{0}: {1}: Unrecognized Memory'.format(node, prefix))
-        return
-    if meminfo.get('ecc', False):
+    if meminfo['ecc']:
         memdescfmt += 'ECC '
-    capacity = meminfo['capacity_mb'] / 1024
-    modtype = meminfo.get('module_type', None)
-    if modtype:
-        memdescfmt += modtype
+    memdescfmt += meminfo['module_type']
     memdesc = memdescfmt.format(capacity, meminfo['speed'])
     print('{0}: {1} description: {2}'.format(node, prefix, memdesc))
     print('{0}: {1} manufacturer: {2}'.format(
@@ -69,11 +56,10 @@ def print_mem_info(node, prefix, meminfo):
     print('{0}: {1} model: {2}'.format(node, prefix, meminfo['model']))
     print('{0}: {1} serial number: {2}'.format(node, prefix,
                                                meminfo['serial']))
-    if 'manufacture_date' in meminfo:
-        print('{0}: {1} manufacture date: {2}'.format(node, prefix,
-                                                      meminfo['manufacture_date']))
-        print('{0}: {1} manufacture location: {2}'.format(
-            node, prefix, meminfo['manufacture_location']))
+    print('{0}: {1} manufacture date: {2}'.format(node, prefix,
+                                                  meminfo['manufacture_date']))
+    print('{0}: {1} manufacture location: {2}'.format(
+        node, prefix, meminfo['manufacture_location']))
 
 exitcode = 0
 
@@ -90,41 +76,19 @@ def printerror(res, node=None):
             exitcode = 1
 
 
-url = '/noderange/{0}/inventory/hardware/all/all'
-usedprefixes = set([])
-
-argparser = optparse.OptionParser(
-    usage="Usage: %prog <noderange> [serial|model|uuid|mac]")
-argparser.add_option('-j', '--json', action='store_true', help='Output JSON')
+argparser = optparse.OptionParser(usage="Usage: %prog <noderange>")
 (options, args) = argparser.parse_args()
 try:
-    noderange = args[0]
+    noderange = sys.argv[1]
 except IndexError:
     argparser.print_help()
     sys.exit(1)
-client.check_globbing(noderange)
-if len(args) > 1:
-    if args[1] == 'firm':
-        os.execlp('nodefirmware', 'nodefirmware', noderange)
-    else:
-        url = '/noderange/{0}/inventory/hardware/all/system'
-        for arg in args:
-            for arg in arg.split(','):
-                if arg == 'serial':
-                    filters.append(re.compile('serial number'))
-                elif arg == 'model':
-                    filters.append(re.compile('^model'))
-                    filters.append(re.compile('product name'))
-                elif arg == 'uuid':
-                    filters.append(re.compile('uuid'))
-                elif arg == 'mac':
-                    filters.append(re.compile('mac address'))
-                    url = '/noderange/{0}/inventory/hardware/all/all'
+if len(args) > 1 and args[1] == 'firm':
+    os.execlp('nodefirmware', 'nodefirmware', noderange)
 try:
-    if options.json:
-        databynode = {}
     session = client.Command()
-    for res in session.read(url.format(noderange)):
+    for res in session.read('/noderange/{0}/inventory/hardware/all/all'.format(
+            noderange)):
         printerror(res)
         if 'databynode' not in res:
             continue
@@ -134,19 +98,8 @@ try:
                 continue
             for inv in res['databynode'][node]['inventory']:
                 prefix = inv['name']
-                idx = 2
-                while (node, prefix) in usedprefixes:
-                    prefix = '{0} {1}'.format(inv['name'], idx)
-                    idx += 1
-                usedprefixes.add((node, prefix))
                 if not inv['present']:
-                    if not filters:
-                        if options.json:
-                            if node not in databynode:
-                                databynode[node] = {}
-                            databynode[node][prefix] = inv
-                        else:
-                            print('{0}: {1}: Not Present'.format(node, prefix))
+                    print '{0}: {1}: Not Present'.format(node, prefix)
                     continue
                 info = inv['information']
                 info.pop('board_extra', None)
@@ -154,34 +107,14 @@ try:
                 info.pop('chassis_extra', None)
                 info.pop('product_extra', None)
                 if 'memory_type' in info:
-                    if not filters:
-                        if options.json:
-                            if node not in databynode:
-                                databynode[node] = {}
-                            databynode[node][prefix] = inv
-                            continue
-                        print_mem_info(node, prefix, info)
+                    print_mem_info(node, prefix, info)
                     continue
                 for datum in info:
-                    if filters:
-                        for filter in filters:
-                            if filter.match(datum.lower()):
-                                break
-                        else:
-                            continue
                     if info[datum] is None:
                         continue
-                    if options.json:
-                        if node not in databynode:
-                            databynode[node] = {}
-                        databynode[node][prefix] = inv
-                        break
                     print(u'{0}: {1} {2}: {3}'.format(node, prefix,
                                                      pretty(datum),
                                                      info[datum]))
-    if options.json:
-        print(json.dumps(databynode, sort_keys=True, indent=4,
-                         separators=(',', ': ')))
 except KeyboardInterrupt:
     print('')
-sys.exit(exitcode)
+sys.exit(exitcode)

confluent_client/bin/nodelicense

@@ -1,145 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2019 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.
-
-import optparse
-import os
-import signal
-import sys
-import time
-
-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
-
-exitcode = 0
-
-argparser = optparse.OptionParser(
-    usage="Usage: "
-          "%prog <noderange> [list][install <file>|save <directory>|delete <name>]")
-argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Specify a maximum number of '
-                          'nodes to delete licenses from, '
-                          'prompting if over the threshold')                  
-(options, args) = argparser.parse_args()
-upfile = None
-downdir = None
-delete = False
-try:
-    noderange = args[0]
-    if len(args) > 1:
-        if args[1] == 'install':
-            upfile = args[2]
-        elif args[1] == 'save':
-            downdir = args[2]
-        elif args[1] == 'delete':
-            delete = args[2]
-        elif args[1] != 'list':
-            argparser.print_help()
-            sys.exit(1)        
-except IndexError:
-    argparser.print_help()
-    sys.exit(1)
-client.check_globbing(noderange)
-
-
-def install_license(session, filename):
-    global exitcode
-    resource = '/noderange/{0}/configuration/' \
-               'management_controller/licenses/'.format(noderange)
-    filename = os.path.abspath(filename)
-    instargs = {'filename': filename}
-    for res in session.create(resource, instargs):
-        for node in res.get('databynode', []):
-            if 'error' in res['databynode'][node]:
-                sys.stderr.write('{0}: {1}\n'.format(
-                    node, res['databynode'][node]['error']))
-                sys.exit(res['databynode'][node].get('errorcode', 1))        
-    show_licenses(session)
-
-
-def save_licenses(session, dirname):
-    global exitcode
-    resource = '/noderange/{0}/configuration/' \
-               'management_controller/save_licenses'.format(noderange)
-    filename = os.path.abspath(dirname)
-    instargs = {'dirname': filename}
-    for res in session.create(resource, instargs):
-        for node in res.get('databynode', {}):
-            fname = res['databynode'][node].get('filename', None)
-            if fname:
-                print('{0}: Saved license to {1}'.format(node, fname))
-            elif 'error' in res['databynode'][node]:
-                sys.stderr.write('{0}: {1}\n'.format(node, res['databynode'][node]['error']))
-            else:
-                sys.stderr.write('{0}: {1}\n'.format(node, repr(res['databynode'][node])))
-
-
-def show_licenses(session):
-    global exitcode
-    for res in session.read(
-            '/noderange/{0}/configuration/management_controller/licenses/'
-            'all'.format(noderange)):
-        for node in res.get('databynode', {}):
-            for license in res['databynode'][node].get('License', []):
-                msg = '{0}: {1}'.format(node, license.get('feature',
-                                                          'Unknown'))
-                if license.get('state', 'Active') != 'Active':
-                    msg += ' ({0})'.format(license['state'])
-                print(msg)
-
-
-def delete_license(session, licname):
-    global exitcode
-    licstodel = []
-    for res in list(session.read(
-            '/noderange/{0}/configuration/management_controller/licenses/'
-            'all'.format(noderange))):
-        for node in res.get('databynode', {}):
-            for license in res['databynode'][node].get('License', []):
-                if license.get('feature', None) == licname:
-                    prefix = '/nodes/{0}/configuration/management_controller/licenses/'.format(node)
-                    for currlic in list(session.read(prefix)):
-                        currlic = currlic.get('item', {}).get('href', 'all')
-                        if currlic == 'all':
-                            continue
-                        currname = list(session.read(prefix + currlic))[0]
-                        currname = currname.get('License', [{}])[0].get('feature', None)
-                        if currname == licname:
-                            list(session.delete(prefix + currlic))
-    show_licenses(session)
-
-try:
-    session = client.Command()
-    if upfile:
-        install_license(session, upfile)
-    elif downdir:
-        save_licenses(session, downdir)
-    elif delete:
-        session.stop_if_noderange_over(noderange, options.maxnodes)
-        delete_license(session, delete)
-    else:
-        show_licenses(session)
-except KeyboardInterrupt:
-    print('')
-sys.exit(exitcode)

confluent_client/bin/nodelist

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
@@ -47,7 +47,6 @@ def main():
         nodelist = '/noderange/{0}/nodes/'.format(noderange)
     except IndexError:
         nodelist = '/nodes/'
-    client.check_globbing(noderange)
     session = client.Command()
     exitcode = 0
     showtype='all'
@@ -61,7 +60,7 @@ def main():
                 sys.stderr.write(res['error'] + '\n')
                 exitcode = 1
             else:
-                print(res['item']['href'].replace('/', ''))
+                print res['item']['href'].replace('/', '')
 
     sys.exit(exitcode)
 

confluent_client/bin/nodemedia

@@ -1,191 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2018 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.
-
-import optparse
-import os
-import signal
-import sys
-import time
-
-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
-import confluent.screensqueeze as sq
-
-exitcode = 0
-
-
-def get_update_progress(session, url):
-    for res in session.read(url):
-        status = res['phase']
-        percent = res['progress']
-        detail = res['detail']
-        if status == 'error':
-            text = 'error!'
-        else:
-            text = '{0}: {1:3.0f}%'.format(status, percent)
-    return text, status, detail
-
-
-def printerror(res, node=None):
-    global exitcode
-    if 'errorcode' in res:
-        exitcode = res['errorcode']
-    if 'error' in res:
-        if node:
-            sys.stderr.write('{0}: {1}\n'.format(node, res['error']))
-        else:
-            sys.stderr.write('{0}\n'.format(res['error']))
-        if 'errorcode' not in res:
-            exitcode = 1
-    for node in res.get('databynode', ()):
-        printerror(res['databynode'][node], node)
-
-
-def attach_media(noderange, media):
-    global exitcode
-    session = client.Command()
-    if ':' not in media:
-        sys.stderr.write('Full URL required for attach\n')
-        sys.exit(1)
-    resource = '/noderange/{0}/media/attach'.format(noderange)
-    for res in session.update(resource, {'url': media}):
-        printerror(res)
-    list_media(noderange, media)
-
-
-def list_media(noderange, media):
-    session = client.Command()
-    resource = '/noderange/{0}/media/current'.format(noderange)
-    for res in session.read(resource):
-        printerror(res)
-        for node in res.get('databynode', []):
-            url = res['databynode'][node].get('url', None)
-            name =  res['databynode'][node].get('name', None)
-            if (url and not url.startswith('file:') and
-                    not res['databynode'][node].get('secure', False)):
-                name += ' (insecure)'
-            if not name:
-                continue
-            print('{0}: {1}'.format(node, url + '/' + name if url else name))
-
-
-def detach_media(noderange, media):
-    global exitcode
-    session = client.Command()
-    resource = '/noderange/{0}/media/detach'.format(noderange)
-    for res in session.update(resource, {'detachall': 1}):
-        printerror(res)
-
-
-def upload_media(noderange, media):
-    global exitcode
-    if not os.path.exists(media):
-        sys.stderr.write('Unable to locate requested file {0}\n'.format(
-            media))
-        sys.exit(404)
-    session = client.Command()
-    output = sq.ScreenPrinter(noderange, session)
-    filename = os.path.abspath(media)
-    resource = '/noderange/{0}/media/uploads/'.format(noderange)
-    upargs = {'filename': filename}
-    noderrs = {}
-    nodeurls = {}
-    for res in session.create(resource, upargs):
-        if 'created' not in res:
-            for nodename in res.get('databynode', ()):
-                output.set_output(nodename, 'error!')
-                noderrs[nodename] = res['databynode'][nodename].get(
-                    'error', 'Unknown Error')
-            continue
-        watchurl = res['created']
-        currnode = watchurl.split('/')[1]
-        nodeurls[currnode] = '/' + watchurl
-    while nodeurls:
-        for node in list(nodeurls):
-            progress, status, err = get_update_progress(
-                session, nodeurls[node])
-            if status == 'error':
-                exitcode = 1
-                noderrs[node] = err
-            if status in ('error', 'complete', 'pending'):
-                list(session.delete(nodeurls[node]))
-                del nodeurls[node]
-            output.set_output(node, progress)
-        time.sleep(2)
-    allerrnodes = ','.join(noderrs)
-    if noderrs:
-        sys.stderr.write(
-            'Nodes had errors receiving media ({0})!\n'.format(allerrnodes))
-    for node in noderrs:
-        sys.stderr.write('{0}: {1}\n'.format(node, noderrs[node]))
-    list_media(noderange, media)
-
-funmap = {
-    'upload': upload_media,
-    'attach': attach_media,
-    'detachall': detach_media,
-    'list': list_media,
-}
-
-
-class OptParser(optparse.OptionParser):
-
-    def format_epilog(self, formatter):
-        return self.expand_prog_name(self.epilog)
-
-def main():
-    argparser = OptParser(
-        usage="Usage: %prog <noderange> [list|upload|attach|detachall] "
-              "<filename>|all|<url>",
-        epilog='\nupload will take the specified file and upload it to the '
-               'BMC.\n\n'
-               'attach will instruct the BMC to connect a remote media to the '
-               'specified url.\n\ndetachall will remove *ALL* uploaded and '
-               'attached urls from the BMC\n\nlist shows currently mounted '
-               'media.\n\nSee `man %prog` for more info.\n')
-    (options, args) = argparser.parse_args()
-    media = None
-    try:
-        noderange = args[0]
-        operation = args[1]
-        arglength = 2
-        if operation in ('attach', 'upload'):
-            media = args[2]
-            arglength = 3
-        if len(args) > arglength:
-            argparser.print_help()
-            sys.exit(1)
-    except IndexError:
-        argparser.print_help()
-        sys.exit(1)
-    client.check_globbing(noderange)
-    try:
-        handler = funmap[operation]
-    except KeyError:
-        argparser.print_help()
-        sys.exit(1)
-    handler(noderange, media)
-if __name__ == '__main__':
-    main()

confluent_client/bin/nodepower

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
@@ -34,27 +34,19 @@ import confluent.client as client
 argparser = optparse.OptionParser(
     usage="Usage: %prog [options] noderange "
           "([status|on|off|shutdown|boot|reset])")
-argparser.add_option('-p', '--showprevious', dest='previous',
-                     action='store_true', default=False,
-                     help='Show previous power state')
-argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Specify a maximum number of '
-                          'nodes to change power state, '
-                          'prompting if over the threshold')
-
 (options, args) = argparser.parse_args()
 try:
     noderange = args[0]
 except IndexError:
     argparser.print_help()
     sys.exit(1)
-client.check_globbing(noderange)
+
 setstate = None
-if len(args) > 1:
+if len(sys.argv) > 2:
     if setstate == 'softoff':
         setstate = 'shutdown'
-    elif not args[1] in ('stat', 'state', 'status'):
-        setstate = args[1]
+    elif not sys.argv[2] in ('stat', 'state', 'status'):
+        setstate = sys.argv[2]
 
 if setstate not in (None, 'on', 'off', 'shutdown', 'boot', 'reset'):
     argparser.print_help()
@@ -62,19 +54,5 @@ if setstate not in (None, 'on', 'off', 'shutdown', 'boot', 'reset'):
 session = client.Command()
 exitcode = 0
 session.add_precede_key('oldstate')
-
-if options.previous:
-    # get previous states
-    prev = {}
-    for rsp in session.read("/noderange/{0}/power/state".format(noderange)):
-        # gets previous (current) states
-
-        databynode = rsp["databynode"]
-
-        for node in databynode:
-            prev[node] = databynode[node]["state"]["value"]
-
-    # add dictionary to session
-    session.add_precede_dict(prev)
-
-sys.exit(session.simple_noderange_command(noderange, '/power/state', setstate, promptover=options.maxnodes))
+sys.exit(
+    session.simple_noderange_command(noderange, '/power/state', setstate))

confluent_client/bin/noderemove

@@ -1,57 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 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.
-
-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
-
-argparser = optparse.OptionParser(
-    usage='''\n       %prog noderange
-             \n ''')
-argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Specify a maximum number of '
-                          'nodes to delete, '
-                          'prompting if over the threshold')      
-(options, args) = argparser.parse_args()
-if len(args) != 1:
-    argparser.print_help()
-    sys.exit(1)
-noderange = args[0]
-client.check_globbing(noderange)
-session = client.Command()
-exitcode = 0
-session.stop_if_noderange_over(noderange, options.maxnodes)
-for r in session.delete('/noderange/{0}'.format(noderange)):
-    if 'error' in r:
-        sys.stderr.write(r['error'] + '\n')
-        exitcode |= 1
-    if 'deleted' in r:
-        print('{0}: deleted'.format(r['deleted']))
-sys.exit(exitcode)

confluent_client/bin/noderename

@@ -1,52 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2019 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.
-
-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
-
-argparser = optparse.OptionParser(usage="Usage: %prog <noderange> <newname>")
-(options, args) = argparser.parse_args()
-try:
-    noderange = args[0]
-except IndexError:
-    argparser.print_help()
-    sys.exit(1)
-client.check_globbing(noderange)
-identifystate = None
-if len(sys.argv) > 2:
-    newname = sys.argv[2]
-else:
-    argparser.print_help()
-    sys.exit(1)
-session = client.Command()
-exitcode = 0
-sys.exit(
-    session.simple_noderange_command(noderange, 'attributes/rename', newname))
-

confluent_client/bin/nodereseat

@@ -1,66 +0,0 @@
-#!/usr/bin/python2
-# 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.
-
-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
-
-argparser = optparse.OptionParser(usage="Usage: %prog <noderange>")
-argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Specify a maximum number of '
-                          'nodes to reseat, '
-                          'prompting if over the threshold')   
-(options, args) = argparser.parse_args()
-try:
-    noderange = args[0]
-except IndexError:
-    argparser.print_help()
-    sys.exit(1)
-client.check_globbing(noderange)
-session = client.Command()
-exitcode = 0
-
-errorNodes = set([])
-session.stop_if_noderange_over(noderange, options.maxnodes)
-success = session.simple_noderange_command(noderange, 'power/reseat', 'reseat', key='reseat', errnodes=errorNodes)   # = 0 if successful
-
-# Determine which nodes were successful and print them
-
-allNodes = set([])
-
-for node in session.read('/noderange/{0}/nodes/'.format(noderange)):
-    allNodes.add(node['item']['href'].replace("/", ""))
-
-goodNodes = allNodes - errorNodes
-
-for node in goodNodes:
-    print(node + ": Reseat successful")
-
-
-sys.exit(success)

confluent_client/bin/nodersync

@@ -1,159 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2016-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.
-
-from collections import deque
-import optparse
-import os
-import select
-import shlex
-import signal
-import subprocess
-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
-import confluent.screensqueeze as sq
-import confluent.sortutil as sortutil
-
-
-def run():
-    argparser = optparse.OptionParser(
-        usage="Usage: %prog location noderange:location",
-    )
-    argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Specify a maximum number of '
-                          'nodes to run rsync to, '
-                          'prompting if over the threshold')   
-    argparser.add_option('-f', '-c', '--count', type='int', default=168,
-                         help='Number of nodes to concurrently rsync')
-    # among other things, FD_SETSIZE limits.  Besides, spawning too many
-    # processes can be unkind for the unaware on memory pressure and such...
-    argparser.disable_interspersed_args()
-    (options, args) = argparser.parse_args()
-    if len(args) < 2 or ':' not in args[-1]:
-        argparser.print_help()
-        sys.exit(1)
-    concurrentprocs = options.count
-    noderange, targpath = args[-1].split(':', 1)
-    client.check_globbing(noderange)
-    c = client.Command()
-    cmdstr = ' '.join(args[:-1])
-    cmdstr = 'rsync -av --info=progress2 ' + cmdstr
-    cmdstr += ' {node}:' + targpath
-
-    currprocs = 0
-    all = set([])
-    pipedesc = {}
-    pendingexecs = deque()
-    exitcode = 0
-    c.stop_if_noderange_over(noderange, options.maxnodes)
-    for exp in c.create('/noderange/{0}/attributes/expression'.format(noderange),
-            {'expression': cmdstr}):
-        if 'error' in exp:
-            sys.stderr.write(exp['error'] + '\n')
-            exitcode |= exp.get('errorcode', 1)
-        ex = exp.get('databynode', ())
-        for node in ex:
-            cmd = ex[node]['value']
-            if not isinstance(cmd, bytes) and not isinstance(cmd, str):
-                cmd = cmd.encode('utf-8')
-            cmdv = shlex.split(cmd)
-            if currprocs < concurrentprocs:
-                currprocs += 1
-                run_cmdv(node, cmdv, all, pipedesc)
-            else:
-                pendingexecs.append((node, cmdv))
-    if not all or exitcode:
-        sys.exit(exitcode)
-    rdy, _, _ = select.select(all, [], [], 10)
-    nodeerrs = {}
-    pernodeout = {}
-    pernodefile = {}
-    output = sq.ScreenPrinter(noderange, c)
-
-    while all:
-        for r in rdy:
-            desc = pipedesc[r]
-            node = desc['node']
-            data = True
-            while data and select.select([r], [], [], 0)[0]:
-                data = r.read(1)
-                if data:
-                    if desc['type'] == 'stdout':
-                        if node not in pernodeout:
-                            pernodeout[node] = ''
-                        pernodeout[node] += client.stringify(data)
-                        if '\n' in pernodeout[node]:
-                            currout, pernodeout[node] = pernodeout[node].split('\n', 1)
-                            if currout:
-                                pernodefile[node] = os.path.basename(currout)
-                        if '\r' in pernodeout[node]:
-                            currout, pernodeout[node] = pernodeout[node].split('\r', 1)
-                            if currout:
-                                currout = currout.split()
-                                try:
-                                    currout = currout[1]
-                                    output.set_output(node, '{0}:{1}'.format(pernodefile[node], currout))
-                                except IndexError:
-                                    pernodefile = currout[0]
-                                    pass
-                    else:
-                        output.set_output(node, 'error!')
-                        if node not in nodeerrs:
-                            nodeerrs[node] = ''
-                        nodeerrs[node] += client.stringify(data)
-                else:
-                    pop = desc['popen']
-                    ret = pop.poll()
-                    if ret is not None:
-                        exitcode = exitcode | ret
-                        all.discard(r)
-                        r.close()
-                        if node not in nodeerrs:
-                            output.set_output(node, 'complete')
-                        if desc['type'] == 'stdout' and pendingexecs:
-                            node, cmdv = pendingexecs.popleft()
-                            run_cmdv(node, cmdv, all, pipedesc)
-        if all:
-            rdy, _, _ = select.select(all, [], [], 10)
-    for node in nodeerrs:
-        for line in nodeerrs[node].split('\n'):
-            sys.stderr.write('{0}: {1}\n'.format(node, line))
-    sys.exit(exitcode)
-
-
-def run_cmdv(node, cmdv, all, pipedesc):
-    nopen = subprocess.Popen(
-        cmdv, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    pipedesc[nopen.stdout] = {'node': node, 'popen': nopen,
-                              'type': 'stdout'}
-    pipedesc[nopen.stderr] = {'node': node, 'popen': nopen,
-                              'type': 'stderr'}
-    all.add(nopen.stdout)
-    all.add(nopen.stderr)
-
-
-if __name__ == '__main__':
-    run()

confluent_client/bin/noderun

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2016-2017 Lenovo
@@ -34,31 +34,21 @@ if path.startswith('/opt'):
     sys.path.append(path)
 
 import confluent.client as client
-import confluent.sortutil as sortutil
 
 
 def run():
-    argparser = optparse.OptionParser(
-        usage="Usage: %prog [options] noderange commandexpression",
-        epilog="Expressions are the same as in attributes, e.g. "
-               "'ipmitool -H {hardwaremanagement.manager}' will be expanded.")
-    argparser.add_option('-f', '-c', '--count', type='int', default=168,
-                         help='Number of commands to run at a time')
-    argparser.add_option('-n', '--nonodeprefix', action='store_true',
-                         help='Do not prefix output with node names')
-    argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Specify a maximum number of '
-                          'nodes to run the command with, '
-                          'prompting if over the threshold')                           
+    concurrentprocs = 168
     # among other things, FD_SETSIZE limits.  Besides, spawning too many
     # processes can be unkind for the unaware on memory pressure and such...
+    argparser = optparse.OptionParser(
+        usage="Usage: %prog node commandexpression",
+        epilog="Expressions are the same as in attributes, e.g. "
+               "'ipmitool -H {hardwaremanagement.manager}' will be expanded.")
     argparser.disable_interspersed_args()
     (options, args) = argparser.parse_args()
     if len(args) < 2:
         argparser.print_help()
         sys.exit(1)
-    concurrentprocs = options.count
-    client.check_globbing(args[0])
     c = client.Command()
     cmdstr = " ".join(args[1:])
 
@@ -66,65 +56,40 @@ def run():
     all = set([])
     pipedesc = {}
     pendingexecs = deque()
-    exitcode = 0
-    c.stop_if_noderange_over(args[0], options.maxnodes)
+
     for exp in c.create('/noderange/{0}/attributes/expression'.format(args[0]),
                         {'expression': cmdstr}):
-        if 'error' in exp:
-            sys.stderr.write(exp['error'] + '\n')
-            exitcode |= exp.get('errorcode', 1)
-        ex = exp.get('databynode', ())
+        ex = exp['databynode']
         for node in ex:
-            cmd = ex[node]['value']
-            if not isinstance(cmd, bytes) and not isinstance(cmd, str):
-                cmd = cmd.encode('utf-8')
+            cmd = ex[node]['value'].encode('utf-8')
             cmdv = shlex.split(cmd)
             if currprocs < concurrentprocs:
                 currprocs += 1
                 run_cmdv(node, cmdv, all, pipedesc)
             else:
                 pendingexecs.append((node, cmdv))
-    if not all or exitcode:
-        sys.exit(exitcode)
+
+    exitcode = 0
     rdy, _, _ = select.select(all, [], [], 10)
     while all:
-        pernodeout = {}
         for r in rdy:
+            data = r.readline()
             desc = pipedesc[r]
-            node = desc['node']
-            data = True
-            while data and select.select([r], [], [], 0)[0]:
-                data = r.readline()
-                if data:
-                    if desc['type'] == 'stdout':
-                        if node not in pernodeout:
-                            pernodeout[node] = []
-                        pernodeout[node].append(data)
-                    else:
-                        data = client.stringify(data)
-                        if options.nonodeprefix:
-                            sys.stderr.write(data)
-                        else:
-                            sys.stderr.write('{0}: {1}'.format(node, data))
-                        sys.stderr.flush()
+            if data:
+                node = desc['node']
+                if desc['type'] == 'stdout':
+                    sys.stdout.write('{0}: {1}'.format(node,data))
                 else:
-                    pop = desc['popen']
-                    ret = pop.poll()
-                    if ret is not None:
-                        exitcode = exitcode | ret
-                        all.discard(r)
-                        r.close()
-                        if desc['type'] == 'stdout' and pendingexecs:
-                            node, cmdv = pendingexecs.popleft()
-                            run_cmdv(node, cmdv, all, pipedesc)
-        for node in sortutil.natural_sort(pernodeout):
-            for line in pernodeout[node]:
-                line = client.stringify(line)
-                if options.nonodeprefix:
-                    sys.stdout.write(line)
-                else:
-                    sys.stdout.write('{0}: {1}'.format(node, line))
-        sys.stdout.flush()
+                    sys.stderr.write('{0}: {1}'.format(node, data))
+            else:
+                pop = desc['popen']
+                ret = pop.poll()
+                if ret is not None:
+                    exitcode = exitcode | ret
+                    all.discard(r)
+                    if desc['type'] == 'stdout' and pendingexecs:
+                        node, cmdv = pendingexecs.popleft()
+                        run_cmdv(node, cmdv, all, pipedesc)
         if all:
             rdy, _, _ = select.select(all, [], [], 10)
     sys.exit(exitcode)
@@ -142,4 +107,4 @@ def run_cmdv(node, cmdv, all, pipedesc):
 
 
 if __name__ == '__main__':
-    run()
+    run()

confluent_client/bin/nodesensors

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
@@ -36,7 +36,6 @@ import confluent.client as client
 
 sensorcollections = {
     'all': 'sensors/hardware/all/all',
-    'energy': 'sensors/hardware/energy/all',
     'temperature': 'sensors/hardware/temperature/all',
     'temp': 'sensors/hardware/temperature/all',
     'power': 'sensors/hardware/power/all',
@@ -65,7 +64,6 @@ if options.numreadings:
         options.interval = 1
 try:
     noderange = args[0]
-    client.check_globbing(noderange)
 except IndexError:
     argparser.print_help()
     sys.exit(1)
@@ -80,6 +78,7 @@ for sensorgroup in args[1:]:
                 sensors.append('sensors/hardware/all/' + sensor)
 if not sensors:
     sensors = ['sensors/hardware/all/all']
+
 session = client.Command()
 exitcode = 0
 sensorheaders = {}
@@ -114,8 +113,7 @@ def sensorpass(showout=True, appendtime=False):
                         continue
                     for redundant_state in ('Non-Critical', 'Critical'):
                         try:
-                            if sensedata.get('states', False):
-                                sensedata['states'].remove(redundant_state)
+                            sensedata['states'].remove(redundant_state)
                         except ValueError:
                             pass
                     resultdata[node][sensedata['name']] = sensedata
@@ -127,18 +125,15 @@ def sensorpass(showout=True, appendtime=False):
                     if showout:
                         if sensedata['value'] is None:
                             showval = ''
-                        elif isinstance(sensedata['value'], float):
-                            showval = u' {0:.5f} '.format(sensedata['value'])
                         else:
                             showval = u' {0} '.format(sensedata['value'])
                         if sensedata['units'] not in (None, u''):
                             showval += sensedata['units']
-                        if sensedata.get('health', 'ok') != 'ok':
+                        if sensedata['health'] != 'ok':
                             datadescription = [sensedata['health']]
                         else:
                             datadescription = []
-                        if sensedata.get('states', False):
-                            datadescription.extend(sensedata['states'])
+                        datadescription.extend(sensedata['states'])
                         if datadescription:
                             if showval == '':
                                 showval += u' {0}'.format(
@@ -149,19 +144,15 @@ def sensorpass(showout=True, appendtime=False):
                         if appendtime:
                             showval += ' @' + time.strftime(
                                 '%Y-%m-%dT%H:%M:%S')
-                        printval = u'{0}: {1}:{2}'.format(
-                            node, sensedata['name'], showval)
-                        if not isinstance(printval, str):
-                            printval = printval.encode('utf-8')
-                        print(printval)
-                        sys.stdout.flush()
+                        print(u'{0}: {1}:{2}'.format(
+                            node, sensedata['name'], showval).encode('utf-8'))
     return resultdata
 
 
 def format_csv(csvwriter, orderedsensors, resdata, showtime=True):
     for nodekey in resdata:
         if showtime:
-            if isinstance(showtime, int):
+            if showtime.is_integer():
                 rowdata = [time.strftime('%Y-%m-%dT%H:%M:%S'), nodekey]
             else:
                 rowdata = [time.strftime('%Y-%m-%dT%H:%M:%S.') +
@@ -188,7 +179,6 @@ def format_csv(csvwriter, orderedsensors, resdata, showtime=True):
             except KeyError:
                 rowdata.append('N/A')
         csvwriter.writerow(rowdata)
-        sys.stdout.flush()
 
 
 def main():
@@ -202,11 +192,7 @@ def main():
             orderedsensors.append(name)
         orderedsensors.sort()
         for name in orderedsensors:
-            headername = sensorheaders[name]
-            if (not isinstance(headername, str) and
-                    not isinstance(headername, bytes)):
-                headername = headername.encode('utf-8')
-            headernames.append(headername)
+            headernames.append(sensorheaders[name].encode('utf-8'))
     if options.csv:
         linebyline = False
         csvwriter = csv.writer(sys.stdout)
@@ -230,7 +216,7 @@ def main():
                     sys.exit(exitcode)
             sleeptime = nextstart - os.times()[4]
             if sleeptime > 0:
-                time.sleep(sleeptime)
+                time.sleep(nextstart - os.times()[4])
     else:
         if options.csv:
             format_csv(csvwriter, orderedsensors, resdata, showtime=False)

confluent_client/bin/nodesetboot

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015 Lenovo
@@ -43,21 +43,17 @@ argparser.add_option('-p', '--persist', dest='persist', action='store_true',
 argparser.add_option('-u', '--uefi', dest='uefi', action='store_true',
                      default=True,
                      help='Request UEFI style boot (rather than BIOS)')
-argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Specify a maximum number of '
-                          'nodes to modify next boot device, '
-                          'prompting if over the threshold')                        
+
 (options, args) = argparser.parse_args()
 
 try:
     noderange = args[0]
-    client.check_globbing(noderange)
 except IndexError:
     argparser.print_help()
     sys.exit(1)
 bootdev = None
-if len(args) > 1:
-    bootdev = args[1]
+if len(sys.argv) > 2:
+    bootdev = sys.argv[2]
     if bootdev in ('net', 'pxe'):
         bootdev = 'network'
 session = client.Command()
@@ -66,7 +62,6 @@ if options.biosmode:
     bootmode = 'bios'
 else:
     bootmode = 'uefi'
-session.stop_if_noderange_over(noderange, options.maxnodes)
 sys.exit(session.simple_noderange_command(noderange, '/boot/nextdevice', bootdev,
                                      bootmode=bootmode,
-                                     persistent=options.persist))
+                                     persistent=options.persist))

confluent_client/bin/nodeshell

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2016-2017 Lenovo
@@ -19,6 +19,7 @@ from collections import deque
 import optparse
 import os
 import select
+import shlex
 import signal
 import subprocess
 import sys
@@ -33,99 +34,62 @@ if path.startswith('/opt'):
     sys.path.append(path)
 
 import confluent.client as client
-import confluent.sortutil as sortutil
 
 
 def run():
-
-    argparser = optparse.OptionParser(
-        usage="Usage: %prog [options] noderange commandexpression",
-        epilog="Expressions are the same as in attributes, e.g. "
-               "'ipmitool -H {hardwaremanagement.manager}' will be expanded.")
-    argparser.add_option('-f', '-c', '--count', type='int', default=168,
-                         help='Number of commands to run at a time')
-    argparser.add_option('-n', '--nonodeprefix', action='store_true',
-                         help='Do not prefix output with node names')
-    argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Specify a maximum number of '
-                          'nodes to run remote ssh command to, '
-                          'prompting if over the threshold')   
+    concurrentprocs = 168
     # among other things, FD_SETSIZE limits.  Besides, spawning too many
     # processes can be unkind for the unaware on memory pressure and such...
+    argparser = optparse.OptionParser(
+        usage="Usage: %prog node commandexpression",
+        epilog="Expressions are the same as in attributes, e.g. "
+               "'ipmitool -H {hardwaremanagement.manager}' will be expanded.")
     argparser.disable_interspersed_args()
     (options, args) = argparser.parse_args()
     if len(args) < 2:
         argparser.print_help()
         sys.exit(1)
-    client.check_globbing(args[0])
-    concurrentprocs = options.count
-    c = client.Command()    
+    c = client.Command()
     cmdstr = " ".join(args[1:])
 
     currprocs = 0
     all = set([])
     pipedesc = {}
     pendingexecs = deque()
-    exitcode = 0
 
-    c.stop_if_noderange_over(args[0], options.maxnodes)
     for exp in c.create('/noderange/{0}/attributes/expression'.format(args[0]),
                         {'expression': cmdstr}):
-        if 'error' in exp:
-            sys.stderr.write(exp['error'] + '\n')
-            exitcode |= exp.get('errorcode', 1)
-        ex = exp.get('databynode', ())
+        ex = exp['databynode']
         for node in ex:
-            cmd = ex[node]['value']
-            if not isinstance(cmd, str) and not isinstance(cmd, bytes):
-                cmd = cmd.encode('utf-8')
-            cmdv = ['ssh', node, cmd]
+            cmd = ex[node]['value'].encode('utf-8')
+            cmdv = ['ssh', node] + shlex.split(cmd)
             if currprocs < concurrentprocs:
                 currprocs += 1
                 run_cmdv(node, cmdv, all, pipedesc)
             else:
                 pendingexecs.append((node, cmdv))
-    if not all or exitcode:
-        sys.exit(exitcode)
+
+    exitcode = 0
     rdy, _, _ = select.select(all, [], [], 10)
     while all:
-        pernodeout = {}
         for r in rdy:
+            data = r.readline()
             desc = pipedesc[r]
-            node = desc['node']
-            data = True
-            while data and select.select([r], [], [], 0)[0]:
-                data = r.readline()
-                if data:
-                    if desc['type'] == 'stdout':
-                        if node not in pernodeout:
-                            pernodeout[node] = []
-                        pernodeout[node].append(data)
-                    else:
-                        data = client.stringify(data)
-                        if options.nonodeprefix:
-                            sys.stderr.write(data)
-                        else:
-                            sys.stderr.write('{0}: {1}'.format(node, data))
-                        sys.stderr.flush()
+            if data:
+                node = desc['node']
+                if desc['type'] == 'stdout':
+                    sys.stdout.write('{0}: {1}'.format(node,data))
                 else:
-                    pop = desc['popen']
-                    ret = pop.poll()
-                    if ret is not None:
-                        exitcode = exitcode | ret
-                        all.discard(r)
-                        r.close()
-                        if desc['type'] == 'stdout' and pendingexecs:
-                            node, cmdv = pendingexecs.popleft()
-                            run_cmdv(node, cmdv, all, pipedesc)
-        for node in sortutil.natural_sort(pernodeout):
-            for line in pernodeout[node]:
-                line = client.stringify(line)
-                if options.nonodeprefix:
-                    sys.stdout.write(line)
-                else:
-                    sys.stdout.write('{0}: {1}'.format(node, line))
-        sys.stdout.flush()
+                    sys.stderr.write('{0}: {1}'.format(node, data))
+            else:
+                pop = desc['popen']
+                ret = pop.poll()
+                if ret is not None:
+                    exitcode = exitcode | ret
+                    all.discard(r)
+                    if desc['type'] == 'stdout' and pendingexecs:
+                        node, cmdv = pendingexecs.popleft()
+                        run_cmdv(node, cmdv, all, pipedesc)
         if all:
             rdy, _, _ = select.select(all, [], [], 10)
     sys.exit(exitcode)
@@ -143,4 +107,4 @@ def run_cmdv(node, cmdv, all, pipedesc):
 
 
 if __name__ == '__main__':
-    run()
+    run()

confluent_client/bin/nodestorage

@@ -1,237 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2018 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.
-
-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
-exitcode = 0
-
-class OptParser(optparse.OptionParser):
-
-    def format_epilog(self, formatter):
-        return self.expand_prog_name(self.epilog)
-
-def mbtohuman(mb):
-    if mb > 1000000:
-        return '{0:.3f} TB'.format(mb/1000000.0)
-    if mb > 1000:
-        return '{0:.3f} GB'.format(mb/1000.0)
-    return '{0:.3f} MB'.format(mb)
-
-def showstorage(noderange, options, args):
-    global exitcode
-    session = client.Command()
-    disks = {}
-    arrays = {}
-    volumes = {}
-    scfg = session.read('/noderange/{0}/configuration/storage/all'.format(
-        noderange))
-    _print_cfg(scfg)
-
-
-def _print_cfg(scfg):
-    global exitcode
-    storagebynode = {}
-    for e in scfg:
-        if 'error' in e:
-            sys.stderr.write(e['error'] + '\n')
-            exitcode = e.get('errorcode', 1)
-        for node in e.get('databynode', {}):
-            curr = e['databynode'][node]
-            if 'error' in curr:
-                if 'no available drives' in curr['error']:
-                    curr['error'] += ' (drives must be in unconfigured state to be available, they must not be in jbod or online state)'
-                sys.stderr.write('{0}: {1}\n'.format(node, curr['error']))
-                exitcode = curr.get('errorcode', 1)
-                continue
-            if node not in storagebynode:
-                storagebynode[node] = {'disks': [], 'arrays': [],
-                                       'volumes': []}
-            storagebynode[node][curr['type'] + 's'].append(curr)
-    for node in storagebynode:
-        for disk in sorted(storagebynode[node]['disks'],
-                           key=lambda x: x['name']):
-            print('{0}: Disk {1} Description: {2}'.format(
-                node, disk['name'], disk['description']))
-            print('{0}: Disk {1} State: {2}'.format(node, disk['name'],
-                                                    disk['state']))
-            print('{0}: Disk {1} FRU: {2}'.format(node, disk['name'],
-                                                  disk['fru']))
-            print('{0}: Disk {1} Serial Number: {2}'.format(node, disk['name'],
-                                                            disk['serial']))
-            if disk['array']:
-                print('{0}: Disk {1} Array: {2}'.format(node, disk['name'],
-                                                        disk['array']))
-        for arr in storagebynode[node]['arrays']:
-            print('{0}: Array {1} Available Capacity: {2}'.format(
-                node, arr['id'], mbtohuman(arr['available'])))
-            print('{0}: Array {1} Total Capacity: {2}'.format(
-                node, arr['id'], mbtohuman(arr['capacity'])))
-            print('{0}: Array {1} RAID: {2}'.format(node, arr['id'],
-                                                    arr['raid']))
-            print('{0}: Array {1} Disks: {2}'.format(node, arr['id'], ','.join(
-                arr['disks'])))
-            print(
-                '{0}: Array {1} Volumes: {2}'.format(node, arr['id'], ','.join(
-                    arr['volumes'])))
-        for vol in storagebynode[node]['volumes']:
-            print('{0}: Volume {1}: Size: {2}'.format(node, vol['name'],
-                                                      mbtohuman(vol['size'])))
-            print('{0}: Volume {1}: State: {2}'.format(node, vol['name'],
-                                                       vol['state']))
-            print('{0}: Volume {1}: Array {2}'.format(node, vol['name'],
-                                                      vol['array']))
-
-
-def createstorage(noderange, options, args):
-    if options.raidlevel is None or options.disks is None:
-        sys.stderr.write('-r and -d are required arguments to create array\n')
-        sys.exit(1)
-    session = client.Command()
-    session.stop_if_noderange_over(noderange, options.maxnodes)
-    names = options.name
-    if names is None:
-        names = ''.join(args)
-    parms = {'disks': options.disks, 'raidlevel': options.raidlevel,
-             'name': names}
-    if options.size:
-        parms['size'] = options.size
-    if options.stripsizes:
-        parms['stripsizes'] = options.stripsizes
-    _print_cfg(session.create(
-            '/noderange/{0}/configuration/storage/volumes/{1}'.format(
-                noderange, names), parms))
-
-
-def deletestorage(noderange, options, args):
-    if options.name is None:
-        if len(args) == 1:
-            names = args[0]
-        else:
-            sys.stderr.write('-n is required to indicate volume(s) to delete\n')
-            sys.exit(1)
-    else:
-        names = options.name
-    session = client.Command()
-    session.stop_if_noderange_over(noderange, options.maxnodes)
-    for rsp in session.delete(
-            '/noderange/{0}/configuration/storage/volumes/{1}'.format(
-                noderange, names)):
-        if 'deleted' in rsp:
-            print('Deleted: {0}'.format(rsp['deleted']))
-        elif 'databynode' in rsp:
-            for node in rsp['databynode']:
-                if 'error' in rsp['databynode'][node]:
-                    sys.stderr.write('{0}: {1}\n'.format(
-                        node, rsp['databynode'][node]['error']))
-                else:
-                    sys.stderr.write('{0}: {1}\n'.format(
-                        node, repr(rsp['databynode'][node])))
-        else:
-            print(repr(rsp))
-
-
-def setdisk(noderange, options, args):
-    if options.disks is None:
-        if len(args):
-            names = args.pop(0)
-        else:
-            sys.stderr.write('-d is required to indicate disk to modify\n')
-            sys.exit(1)
-    else:
-        names = options.disks
-    if not len(args) or args[0] not in ('hotspare', 'jbod', 'unconfigured'):
-        sys.stderr.write('diskset requires valid state as argument (hotspare, jbod, unconfigured)\n')
-        sys.exit(1)
-    session = client.Command()
-    session.stop_if_noderange_over(noderange, options.maxnodes)
-    scfg = session.update('/noderange/{0}/configuration/storage/disks/{1}'.format(noderange, names), {'state': args[0]})
-    _print_cfg(scfg)
-
-funmap = {
-    'create': createstorage,
-    'show': showstorage,
-    'diskset': setdisk,
-    'delete': deletestorage,
-    'rm': deletestorage,
-}
-
-
-
-def main():
-    argparser = OptParser(
-        usage='Usage: %prog <noderange> [show|create|delete|diskset]',
-        epilog='',
-    )
-    argparser.add_option('-r', '--raidlevel', type='int',
-                         help='RAID level to use when creating an array')
-    argparser.add_option('-d', '--disks', type='str',
-                         help='Comma separated list of disks to use, or the '
-                              'word "rest" to indicate use of all available '
-                              'disks')
-    argparser.add_option('-s', '--size', type='str',
-                         help='Comma separated list of sizes to use when '
-                              'creating volumes.  The sizes may be absolute '
-                              'size (e.g. 16gb), percentage (10%) or the word '
-                              '"rest" to use remaining capacity, default '
-                              'behavior is to use all capacity to make a '
-                              'volume')
-    argparser.add_option('-n', '--name', type='str',
-                         help='Comma separated list of names to use when '
-                              'naming volumes, or selecting a volume for '
-                              'delete.  Default behavior is to use '
-                              'implementation provided default names.')
-    argparser.add_option('-z', '--stripsizes', type='str',
-                         help='Comma separated list of stripsizes to use when creating volumes. '
-                            'This value is in kilobytes.  The default behavior is to allow the '
-                            'storage controller to decide.')
-    argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Specify a maximum number of '
-                          'nodes to configure storage on, '
-                          'prompting if over the threshold') 
-    (options, args) = argparser.parse_args()
-    if len(args) == 1:
-        args.append('show')
-    try:
-        noderange = args[0]
-        operation = args[1]
-    except IndexError:
-        argparser.print_help()
-        sys.exit(1)
-    client.check_globbing(noderange)
-    try:
-        handler = funmap[operation]
-    except KeyError:
-        argparser.print_help()
-        sys.exit(1)
-    handler(noderange, options, args[2:])
-
-
-if __name__ == '__main__':
-    main()

confluent_client/bin/nodesupport

@@ -1,152 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2018 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.
-
-import optparse
-import os
-import signal
-import sys
-import time
-
-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
-import confluent.screensqueeze as sq
-
-exitcode = 0
-
-
-def get_update_progress(session, url):
-    for res in session.read(url):
-        status = res['phase']
-        percent = res['progress']
-        detail = res['detail']
-        if status == 'error':
-            text = 'error!'
-        else:
-            text = '{0}: {1:3.0f}%'.format(status, percent)
-    return text, status, detail
-
-
-def printerror(res, node=None):
-    global exitcode
-    if 'errorcode' in res:
-        exitcode = res['errorcode']
-    if 'error' in res:
-        if node:
-            sys.stderr.write('{0}: {1}\n'.format(node, res['error']))
-        else:
-            sys.stderr.write('{0}\n'.format(res['error']))
-        if 'errorcode' not in res:
-            exitcode = 1
-    for node in res.get('databynode', ()):
-        printerror(res['databynode'][node], node)
-
-
-
-def download_servicedata(noderange, media, options):
-    global exitcode
-    session = client.Command()
-    output = sq.ScreenPrinter(noderange, session)
-    filename = os.path.abspath(media)
-    resource = '/noderange/{0}/support/servicedata/'.format(noderange)
-    upargs = {'filename': filename}
-    noderrs = {}
-    nodeurls = {}
-    session.stop_if_noderange_over(noderange, options.maxnodes)
-    for res in session.create(resource, upargs):
-        if 'created' not in res:
-            for nodename in res.get('databynode', ()):
-                output.set_output(nodename, 'error!')
-                noderrs[nodename] = res['databynode'][nodename].get(
-                    'error', 'Unknown Error')
-            continue
-        watchurl = res['created']
-        currnode = watchurl.split('/')[1]
-        nodeurls[currnode] = '/' + watchurl
-    while nodeurls:
-        for node in list(nodeurls):
-            progress, status, err = get_update_progress(
-                session, nodeurls[node])
-            if status == 'error':
-                exitcode = 1
-                noderrs[node] = err
-            if status in ('error', 'complete', 'pending'):
-                list(session.delete(nodeurls[node]))
-                del nodeurls[node]
-            output.set_output(node, progress)
-        time.sleep(2)
-    allerrnodes = ','.join(noderrs)
-    if noderrs:
-        sys.stderr.write(
-            'Nodes had errors retrieving service data ({0})!\n'.format(allerrnodes))
-    for node in noderrs:
-        sys.stderr.write('{0}: {1}\n'.format(node, noderrs[node]))
-
-funmap = {
-    'servicedata': download_servicedata,
-}
-
-
-class OptParser(optparse.OptionParser):
-
-    def format_epilog(self, formatter):
-        return self.expand_prog_name(self.epilog)
-
-def main():
-    argparser = OptParser(
-        usage="Usage: %prog <noderange> servicedata "
-              "<filename>",
-        epilog='\nservicedata will save service data to the given '
-               'directory.  It is saved to the location on the relevant '
-               'management server (the confluent server if running remote, '
-               'and the collective.manager if in collective)\n'
-               '\n\nSee `man %prog` for more info.\n')
-    argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Specify a maximum number of '
-                          'nodes to download diagnostic data from, '
-                          'prompting if over the threshold') 
-    (options, args) = argparser.parse_args()
-    media = None
-    try:
-        noderange = args[0]
-        operation = args[1]
-        arglength = 2
-        if operation == 'servicedata':
-            media = args[2]
-            arglength = 3
-        if len(args) > arglength:
-            argparser.print_help()
-            sys.exit(1)
-    except IndexError:
-        argparser.print_help()
-        sys.exit(1)
-    client.check_globbing(noderange)
-    try:
-        handler = funmap[operation]
-    except KeyError:
-        argparser.print_help()
-        sys.exit(1)
-    handler(noderange, media, options)
-if __name__ == '__main__':
-    main()

confluent_client/bin/stats

@@ -1,167 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2019 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.
-
-import argparse
-import csv
-import fcntl
-import io
-import numpy as np
-
-import os
-import sixel
-import subprocess
-import sys
-
-class DumbWriter(sixel.SixelWriter):
-    def restore_position(self, output):
-        return
-
-
-def plot(gui, output, plotdata, bins):
-    import matplotlib as mpl
-    if not gui:
-        mpl.use('Agg')
-    import matplotlib.pyplot as plt
-    n, bins, patches = plt.hist(plotdata, bins)
-    plt.show()
-    if not gui:
-        if output:
-            tdata = output
-        else:
-            tdata = io.BytesIO()
-        plt.savefig(tdata)
-    if not gui and not output:
-        writer = DumbWriter()
-        writer.draw(tdata)
-    return n, bins
-
-def textplot(plotdata, bins):
-    n, bins = np.histogram(plotdata, bins)
-    labels = []
-    for bin in bins:
-        labels.append('{0:0.1f}'.format(bin))
-    width = 80
-    # Since this will be primarily piped into, hard to get 
-    # terminal width
-    labelwidth = 0
-    for lab in labels:
-        if len(lab) > labelwidth:
-            labelwidth = len(lab)
-    width -= (labelwidth) + 1
-    labelfmt = '{{0:>{0}s}}|'.format(labelwidth)
-    maxn = 0.0
-    for lgth in n:
-        if lgth > maxn:
-            maxn = float(lgth)
-    for i in range(len(n)):
-        print(labelfmt.format(labels[i]) + '=' * int(np.round((n[i]/maxn) * width)))
-    return n, bins
-
-histogram = False
-aparser = argparse.ArgumentParser(description='Quick access to common statistics')
-aparser.add_argument('-c', type=int, default=0, help='Column number to analyze (default is last column)')
-aparser.add_argument('-d', default=None, help='Value used to separate columns')
-aparser.add_argument('-x', default=False, action='store_true', help='Output histogram in sixel format')
-aparser.add_argument('-s', default=0, help='Number of header lines to skip before processing')
-aparser.add_argument('-g', default=False, action='store_true', help='Open histogram in separate graphical window')
-aparser.add_argument('-o', default=None, help='Output histogram to the specified filename in PNG format')
-aparser.add_argument('-t', default=False, action='store_true', help='Output a histogram in text format')
-aparser.add_argument('-v', default=False, action='store_true', help='Attempt to list nodes relevant to each histogram bar (requires -s, -o, or -t)')
-aparser.add_argument('-b', type=int, default=10, help='Number of bins to use in histogram (default is 10)')
-args = aparser.parse_args(sys.argv[1:])
-plotdata = []
-headlines = int(args.s)
-while headlines >= 0:
-    data = sys.stdin.readline()
-    headlines -= 1
-if args.d:
-    delimiter = args.d
-else:
-    if '\t' in data:
-        delimiter = '\t'
-    elif ' ' in data:
-        delimiter = ' '
-    elif ',' in data:
-        delimiter = ','
-    else:
-        delimiter = ' '  # handle single column
-data = list(csv.reader([data], delimiter=delimiter))[0]
-nodebydatum = {}
-idx = args.c - 1
-autoidx = False
-while data:
-    node = None
-    if ':' in data[0]:
-        node, data[0] = data[0].split(':', 1)
-    else:
-        node = data[0]
-    if idx == -1 and not autoidx:
-        while not autoidx:
-            try:
-                datum = float(data[idx])
-            except ValueError:
-                idx -= 1
-                continue
-            except IndexError:
-                sys.stderr.write('Unable to identify a numerical column\n')
-                sys.exit(1)
-            autoidx = True
-    else:
-        datum = float(data[idx])
-    if node:
-        if datum in nodebydatum:
-            nodebydatum[datum].add(node)
-        else:
-            nodebydatum[datum] = set([node])
-    plotdata.append(datum)
-    data = sys.stdin.readline()
-    data = list(csv.reader([data], delimiter=delimiter))[0]
-n = None
-if args.g or args.o or args.x:
-    n, bins = plot(args.g, args.o, plotdata, bins=args.b)
-if args.t:
-    n, bins = textplot(plotdata, bins=args.b)
-print('Samples: {5} Min: {3} Median: {0} Mean: {1} Max: {4} StandardDeviation: {2} Sum: {6}'.format(np.median(plotdata), np.mean(plotdata), np.std(plotdata), np.min(plotdata), np.max(plotdata), len(plotdata), np.sum(plotdata)))
-if args.v and n is not None and nodebydatum:
-    print('')
-    currbin = bins[0]
-    bins = bins[1:]
-    currbinmembers = []
-    for datum in sorted(nodebydatum):
-        if datum > bins[0]:
-           nextbin = None
-           endbin = bins[0]
-           while len(bins) and bins[0] < datum:
-                nextbin = bins[0]
-                bins = bins[1:]
-           if not nextbin:
-               nextbin = np.max(plotdata)
-           print('Entries between {0} and {1}'.format(currbin, endbin))
-           currbin = nextbin
-           print('-' * 80)
-           print(','.join(sorted(currbinmembers)))
-           print('')
-           print('')
-           currbinmembers = []
-        for node in nodebydatum[datum]:
-            currbinmembers.append(node)
-    if currbinmembers:
-       print('Entries between {0} and {1}'.format(currbin, np.max(plotdata)))
-       print('-' * 80)
-       print(','.join(sorted(currbinmembers)))
-       print('')
-       print('')

confluent_client/builddeb

@@ -1 +0,0 @@
-../confluent_server/builddeb

confluent_client/confluent/client.py

@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2014 IBM Corporation
-# Copyright 2015-2019 Lenovo
+# Copyright 2015-2016 Lenovo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,116 +15,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import anydbm as dbm
-except ImportError:
-    import dbm
-import csv
+import anydbm as dbm
 import errno
-import fnmatch
 import hashlib
 import os
-import shlex
 import socket
 import ssl
 import sys
 import confluent.tlvdata as tlvdata
-import confluent.sortutil as sortutil
 
 SO_PASSCRED = 16
 
-_attraliases = {
-    'bmc': 'hardwaremanagement.manager',
-    'bmcuser': 'secret.hardwaremanagementuser',
-    'bmcpass': 'secret.hardwaremanagementpassword',
-}
-
-try:
-    input = raw_input
-except NameError:
-    pass
-
-def stringify(instr):
-    # Normalize unicode and bytes to 'str', correcting for
-    # current python version
-    if isinstance(instr, bytes) and not isinstance(instr, str):
-        return instr.decode('utf-8')
-    elif not isinstance(instr, bytes) and not isinstance(instr, str):
-        return instr.encode('utf-8')
-    return instr
-
-class Tabulator(object):
-    def __init__(self, headers):
-        self.headers = headers
-        self.rows = []
-
-    def add_row(self, row):
-        self.rows.append(row)
-
-    def get_table(self, order=None):
-        i = 0
-        fmtstr = ''
-        separator = []
-        for head in self.headers:
-            if order and order == head:
-                order = i
-            neededlen = len(head)
-            for row in self.rows:
-                if len(row[i]) > neededlen:
-                    neededlen = len(row[i])
-            separator.append('-' * (neededlen + 1))
-            fmtstr += '{{{0}:>{1}}}|'.format(i, neededlen + 1)
-            i = i + 1
-        fmtstr = fmtstr[:-1]
-        yield fmtstr.format(*self.headers)
-        yield fmtstr.format(*separator)
-        if order is not None:
-            for row in sorted(
-                    self.rows,
-                    key=lambda x: sortutil.naturalize_string(x[order])):
-                yield fmtstr.format(*row)
-        else:
-            for row in self.rows:
-                yield fmtstr.format(*row)
-
-    def write_csv(self, output, order=None):
-        output = csv.writer(output)
-        output.writerow(self.headers)
-        i = 0
-        for head in self.headers:
-            if order and order == head:
-                order = i
-            i = i + 1
-        if order is not None:
-            for row in sorted(
-                    self.rows,
-                    key=lambda x: sortutil.naturalize_string(x[order])):
-                output.writerow(row)
-        else:
-            for row in self.rows:
-                output.writerow(row)
-
-
-def printerror(res, node=None):
-    exitcode = 0
-    if 'errorcode' in res:
-        exitcode = res['errorcode']
-    if 'error' in res:
-        if node:
-            sys.stderr.write('{0}: {1}\n'.format(node, res['error']))
-        else:
-            sys.stderr.write('{0}\n'.format(res['error']))
-        if 'errorcode' not in res:
-            exitcode = 1
-    return exitcode
-
-
-def cprint(txt):
-    try:
-        print(txt)
-    except UnicodeEncodeError:
-        print(txt.encode('utf8'))
-    sys.stdout.flush()
 
 def _parseserver(string):
     if ']:' in string:
@@ -142,10 +43,8 @@ def _parseserver(string):
 
 class Command(object):
     def __init__(self, server=None):
-        self._prevdict = None
         self._prevkeyname = None
         self.connection = None
-        self._currnoderange = None
         if server is None:
             if 'CONFLUENT_HOST' in os.environ:
                 self.serverloc = os.environ['CONFLUENT_HOST']
@@ -155,8 +54,6 @@ class Command(object):
             self.serverloc = server
         if os.path.isabs(self.serverloc) and os.path.exists(self.serverloc):
             self._connect_unix()
-        elif self.serverloc == '/var/run/confluent/api.sock':
-            raise Exception('Confluent service is not available')
         else:
             self._connect_tls()
         tlvdata.recv(self.connection)
@@ -180,13 +77,8 @@ class Command(object):
     def add_precede_key(self, keyname):
         self._prevkeyname = keyname
 
-    def add_precede_dict(self, dict):
-        self._prevdict = dict
-
-    def handle_results(self, ikey, rc, res, errnodes=None):
+    def handle_results(self, ikey, rc, res):
         if 'error' in res:
-            if errnodes is not None:
-                errnodes.add(self._currnoderange)
             sys.stderr.write('Error: {0}\n'.format(res['error']))
             if 'errorcode' in res:
                 return res['errorcode']
@@ -197,8 +89,6 @@ class Command(object):
         res = res['databynode']
         for node in res:
             if 'error' in res[node]:
-                if errnodes is not None:
-                    errnodes.add(node)
                 sys.stderr.write('{0}: Error: {1}\n'.format(
                     node, res[node]['error']))
                 if 'errorcode' in res[node]:
@@ -213,19 +103,15 @@ class Command(object):
                 else:
                     val = repr(res[node][ikey])
                 if self._prevkeyname and self._prevkeyname in res[node]:
-                    cprint('{0}: {2}->{1}'.format(
+                    print('{0}: {2}->{1}'.format(
                         node, val, res[node][self._prevkeyname]['value']))
-                elif self._prevdict and node in self._prevdict:
-                    cprint('{0}: {2}->{1}'.format(
-                        node, val, self._prevdict[node]))
                 else:
-                    cprint('{0}: {1}'.format(node, val))
+                    print('{0}: {1}'.format(node, val))
         return rc
 
     def simple_noderange_command(self, noderange, resource, input=None,
-                                 key=None, errnodes=None, promptover=None, **kwargs):
+                                 key=None, **kwargs):
         try:
-            self._currnoderange = noderange
             rc = 0
             if resource[0] == '/':
                 resource = resource[1:]
@@ -237,45 +123,16 @@ class Command(object):
             if input is None:
                 for res in self.read('/noderange/{0}/{1}'.format(
                         noderange, resource)):
-                    rc = self.handle_results(ikey, rc, res, errnodes)
+                    rc = self.handle_results(ikey, rc, res)
             else:
-                self.stop_if_noderange_over(noderange, promptover)
                 kwargs[ikey] = input
                 for res in self.update('/noderange/{0}/{1}'.format(
                         noderange, resource), kwargs):
-                    rc = self.handle_results(ikey, rc, res, errnodes)
-            self._currnoderange = None
+                    rc = self.handle_results(ikey, rc, res)
             return rc
         except KeyboardInterrupt:
-            cprint('')
+            print('')
             return 0
-    
-    def stop_if_noderange_over(self, noderange, maxnodes):
-        if maxnodes is None:
-            return
-        nsize = self.get_noderange_size(noderange)
-        if nsize > maxnodes:
-            if nsize == 1:
-                nodename = list(self.read(
-                    '/noderange/{0}/nodes/'.format(noderange)))[0].get('item', {}).get('href', None)
-                nodename = nodename[:-1]
-                p = input('Command is about to affect node {0}, continue (y/n)? '.format(nodename))
-            else:
-                p = input('Command is about to affect {0} nodes, continue (y/n)? '.format(nsize))
-            if p.lower() != 'y':
-                sys.stderr.write('Aborting at user request\n')
-                sys.exit(1)
-                raise Exception("Aborting at user request")
-        
-
-    def get_noderange_size(self, noderange):
-        numnodes = 0
-        for node in self.read('/noderange/{0}/nodes/'.format(noderange)):
-            if node.get('item', {}).get('href', None):
-                numnodes += 1
-            else:
-                raise Exception("Error trying to size noderange {0}".format(noderange))
-        return numnodes
 
     def simple_nodegroups_command(self, noderange, resource, input=None, key=None, **kwargs):
         try:
@@ -298,7 +155,7 @@ class Command(object):
                     rc = self.handle_results(ikey, rc, res)
             return rc
         except KeyboardInterrupt:
-            cprint('')
+            print('')
             return 0
 
     def read(self, path, parameters=None):
@@ -365,22 +222,22 @@ class Command(object):
             certreqs = ssl.CERT_NONE
             knownhosts = True
         self.connection = ssl.wrap_socket(self.connection, ca_certs=cacert,
-                                          cert_reqs=certreqs)
+                                          cert_reqs=certreqs,
+                                          ssl_version=ssl.PROTOCOL_TLSv1)
         if knownhosts:
             certdata = self.connection.getpeercert(binary_form=True)
             fingerprint = 'sha512$' + hashlib.sha512(certdata).hexdigest()
-            fingerprint = fingerprint.encode('utf-8')
             hostid = '@'.join((port, server))
             khf = dbm.open(os.path.join(clientcfgdir, "knownhosts"), 'c', 384)
             if hostid in khf:
                 if fingerprint == khf[hostid]:
                     return
                 else:
-                    replace = input(
+                    replace = raw_input(
                         "MISMATCHED CERTIFICATE DATA, ACCEPT NEW? (y/n):")
                     if replace not in ('y', 'Y'):
                         raise Exception("BAD CERTIFICATE")
-            cprint('Adding new key for %s:%s' % (server, port))
+            print 'Adding new key for %s:%s' % (server, port)
             khf[hostid] = fingerprint
 
 
@@ -414,69 +271,42 @@ def attrrequested(attr, attrlist, seenattributes):
         truename = candidate
         if candidate.startswith('hm'):
             candidate = candidate.replace('hm', 'hardwaremanagement', 1)
-        if candidate in _attraliases:
-            candidate = _attraliases[candidate]
-        if fnmatch.fnmatch(attr.lower(), candidate.lower()):
+        if candidate == attr:
             seenattributes.add(truename)
             return True
-        elif attr.lower().startswith(candidate.lower() + '.'):
+        elif attr.startswith(candidate + '.'):
             seenattributes.add(truename)
             return True
     return False
 
 
 def printattributes(session, requestargs, showtype, nodetype, noderange, options):
-    path = '/{0}/{1}/attributes/{2}'.format(nodetype, noderange, showtype)
-    return print_attrib_path(path, session, requestargs, options)
-
-def _sort_attrib(k):
-    if isinstance(k[1], dict) and k[1].get('sortid', None) is not None:
-        return k[1]['sortid']
-    return k[0]
-
-def print_attrib_path(path, session, requestargs, options, rename=None, attrprefix=None):
     exitcode = 0
     seenattributes = set([])
-    for res in session.read(path):
+    for res in session.read('/{0}/{1}/attributes/{2}'.format(nodetype, noderange, showtype)):
         if 'error' in res:
             sys.stderr.write(res['error'] + '\n')
             exitcode = 1
             continue
-        for node in sorted(res['databynode']):
-            for attr, val in sorted(res['databynode'][node].items(), key=_sort_attrib):
-                if attr == 'error':
-                    sys.stderr.write('{0}: Error: {1}\n'.format(node, val))
-                    continue
-                if attr == 'errorcode':
-                    exitcode |= val
-                    continue
+        for node in res['databynode']:
+            for attr in res['databynode'][node]:
                 seenattributes.add(attr)
-                if rename:
-                    printattr = rename.get(attr, attr)
-                else:
-                    printattr = attr
-                if attrprefix:
-                    printattr = attrprefix + printattr
                 currattr = res['databynode'][node][attr]
-                if show_attr(attr, requestargs, seenattributes, options):
+                if (requestargs is None or requestargs == [] or attrrequested(attr, requestargs, seenattributes)):
                     if 'value' in currattr:
                         if currattr['value'] is not None:
-                            val = currattr['value']
-                            if isinstance(val, list):
-                                val = ','.join(val)
                             attrout = '{0}: {1}: {2}'.format(
-                                node, printattr, val)
+                                node, attr, currattr['value'])
                         else:
-                            attrout = '{0}: {1}:'.format(node, printattr)
+                            attrout = '{0}: {1}:'.format(node, attr)
                     elif 'isset' in currattr:
                         if currattr['isset']:
-                            attrout = '{0}: {1}: ********'.format(node,
-                                                                  printattr)
+                            attrout = '{0}: {1}: ********'.format(node, attr)
                         else:
-                            attrout = '{0}: {1}:'.format(node, printattr)
+                            attrout = '{0}: {1}:'.format(node, attr)
                     elif 'broken' in currattr:
                         attrout = '{0}: {1}: *ERROR* BROKEN EXPRESSION: ' \
-                                  '{2}'.format(node, printattr,
+                                  '{2}'.format(node, attr,
                                                currattr['broken'])
                     elif isinstance(currattr, list) or isinstance(currattr, tuple):
                         attrout = '{0}: {1}: {2}'.format(node, attr, ','.join(map(str, currattr)))
@@ -484,14 +314,11 @@ def print_attrib_path(path, session, requestargs, options, rename=None, attrpref
                         dictout = []
                         for k, v in currattr.items:
                             dictout.append("{0}={1}".format(k, v))
-                        attrout = '{0}: {1}: {2}'.format(node, printattr, ','.join(map(str, dictout)))
+                        attrout = '{0}: {1}: {2}'.format(node, attr, ','.join(map(str, dictout)))
                     else:
-                        cprint("CODE ERROR" + repr(attr))
-                    try:
-                        blame = options.blame
-                    except AttributeError:
-                        blame = False
-                    if blame or 'broken' in currattr:
+                        print ("CODE ERROR" + repr(attr))
+
+                    if options.blame or 'broken' in currattr:
                         blamedata = []
                         if 'inheritedfrom' in currattr:
                             blamedata.append('inherited from group {0}'.format(
@@ -503,42 +330,7 @@ def print_attrib_path(path, session, requestargs, options, rename=None, attrpref
                                     currattr['expression']))
                         if blamedata:
                             attrout += ' (' + ', '.join(blamedata) + ')'
-                    try:
-                        comparedefault = options.comparedefault
-                    except AttributeError:
-                        comparedefault = False
-                    if comparedefault:
-                        try:
-                            exclude = options.exclude
-                        except AttributeError:
-                            exclude = False
-                        if ((requestargs and not exclude) or
-                                (currattr.get('default', None) is not None and
-                                currattr.get('value', None) is not None and
-                                currattr['value'] != currattr['default'])):
-                            cval = ','.join(currattr['value']) if isinstance(
-                                currattr['value'], list) else currattr['value']
-                            dval = ','.join(currattr['default']) if isinstance(
-                                currattr['default'], list) else currattr['default']
-                            cprint('{0}: {1}: {2} (Default: {3})'.format(
-                                node, printattr, cval, dval))
-                    else:
-
-                        try:
-                            details = options.detail
-                        except AttributeError:
-                            details = False
-                        if details:
-                            if currattr.get('help', None):
-                                attrout += u' (Help: {0})'.format(
-                                    currattr['help'])
-                            if currattr.get('possible', None):
-                                try:
-                                    attrout += u' (Choices: {0})'.format(
-                                        ','.join(currattr['possible']))
-                                except TypeError:
-                                    pass
-                        cprint(attrout)
+                    print attrout
     if not exitcode:
         if requestargs:
             for attr in requestargs:
@@ -548,19 +340,6 @@ def print_attrib_path(path, session, requestargs, options, rename=None, attrpref
     return exitcode
 
 
-def show_attr(attr, requestargs, seenattributes, options):
-    try:
-        reverse = options.exclude
-    except AttributeError:
-        reverse = False
-    if requestargs is None or requestargs == []:
-        return True
-    processattr = attrrequested(attr, requestargs, seenattributes)
-    if reverse:
-        processattr = not processattr
-    return processattr
-
-
 def printgroupattributes(session, requestargs, showtype, nodetype, noderange, options):
     exitcode = 0
     seenattributes = set([])
@@ -598,8 +377,8 @@ def printgroupattributes(session, requestargs, showtype, nodetype, noderange, op
                         dictout.append("{0}={1}".format(k, v))
                     attrout = '{0}: {1}: {2}'.format(noderange, attr, ','.join(map(str, dictout)))
                 else:
-                    cprint("CODE ERROR" + repr(attr))
-                cprint(attrout)
+                    print ("CODE ERROR" + repr(attr))
+                print attrout
     if not exitcode:
         if requestargs:
             for attr in requestargs:
@@ -608,7 +387,7 @@ def printgroupattributes(session, requestargs, showtype, nodetype, noderange, op
                     exitcode = 1
     return exitcode
 
-def updateattrib(session, updateargs, nodetype, noderange, options, dictassign=None):
+def updateattrib(session, updateargs, nodetype, noderange, options):
     # update attribute
     exitcode = 0
     if options.clear:
@@ -622,89 +401,28 @@ def updateattrib(session, updateargs, nodetype, noderange, options, dictassign=N
                     exitcode = res['errorcode']
                 sys.stderr.write('Error: ' + res['error'] + '\n')
         sys.exit(exitcode)
-    elif hasattr(options, 'environment') and options.environment:
-        for key in updateargs[1:]:
-            key = key.replace('.', '_')
-            value = os.environ.get(
-                key, os.environ[key.upper()])
-            # Let's do one pass to make sure that there's not a usage problem
-        for key in updateargs[1:]:
-            key = key.replace('.', '_')
-            value = os.environ.get(
-                key, os.environ[key.upper()])
-            if (nodetype == "nodegroups"):
-                exitcode = session.simple_nodegroups_command(noderange,
-                                                             'attributes/all',
-                                                             value, key)
-            else:
-                exitcode = session.simple_noderange_command(noderange,
-                                                            'attributes/all',
-                                                            value, key)
-        sys.exit(exitcode)
-    elif dictassign:
-        for key in dictassign:
-            if nodetype == 'nodegroups':
-                exitcode = session.simple_nodegroups_command(
-                    noderange, 'attributes/all', dictassign[key], key)
-            else:
-                exitcode = session.simple_noderange_command(
-                    noderange, 'attributes/all', dictassign[key], key)
     else:
         if "=" in updateargs[1]:
             try:
-                for val in updateargs[1:]:
-                    val = val.split('=', 1)
-                    if val[0][-1] in (',', '-', '^'):
-                        key = val[0][:-1]
-                        if val[0][-1] == ',':
-                            value = {'prepend': val[1]}
-                        elif val[0][-1] in ('-', '^'):
-                            value = {'remove': val[1]}
+                if len(updateargs[1:]) > 1:
+                    for val in updateargs[1:]:
+                        val = val.split('=')
+                        if (nodetype == "nodegroups"):
+                            exitcode =  session.simple_nodegroups_command(noderange, 'attributes/all'.format(noderange),
+                                                                         val[1],val[0])
+                        else:
+                            exitcode = session.simple_noderange_command(noderange, 'attributes/all'.format(noderange),
+                                                                        val[1], val[0])
+                else:
+                    val = updateargs[1].split('=')
+                    if nodetype == "nodegroups" :
+                        exitcode = session.simple_nodegroups_command(noderange, 'attributes/all'.format(noderange),
+                                                                     val[1], val[0])
                     else:
-                        key = val[0]
-                        value = val[1]
-                    if (nodetype == "nodegroups"):
-                        exitcode =  session.simple_nodegroups_command(noderange, 'attributes/all',
-                                                                     value, key)
-                    else:
-                        exitcode = session.simple_noderange_command(noderange, 'attributes/all',
-                                                                    value, key)
+                        exitcode = session.simple_noderange_command(noderange, 'attributes/all'.format(noderange),
+                                                                    val[1], val[0])
             except:
                 sys.stderr.write('Error: {0} not a valid expression\n'.format(str(updateargs[1:])))
                 exitcode = 1
             sys.exit(exitcode)
     return exitcode
-
-
-# So we try to prevent bad things from happening when globbing
-# We tried to head this off at the shell, but the various solutions would end
-# up breaking the shell in various ways (breaking pipe capability if using
-# DEBUG, breaking globbing if in pipe, etc)
-# Then we tried to parse the original commandline instead, however shlex isn't
-# going to parse full bourne language (e.g. knowing that '|' and '>' and
-# a world of other things would not be in our command line
-# so finally, just make sure the noderange appears verbatim in the command line
-# if we glob to something, then bash will change noderange and this should
-# detect it and save the user from tragedy
-def check_globbing(noderange):
-    if not os.path.exists(noderange):
-        return True
-    rawargs = os.environ.get('CURRENT_CMDLINE', None)
-    if rawargs:
-        rawargs = shlex.split(rawargs)
-        for arg in rawargs:
-            if arg.startswith('$'):
-                arg = arg[1:]
-                if arg.endswith(';'):
-                    arg = arg[:-1]
-                arg = os.environ.get(arg, '$' + arg)
-            if arg.startswith(noderange):
-                break
-        else:
-            sys.stderr.write(
-                'Shell glob conflict detected, specified target "{0}" '
-                'not in command line, but is a file.  You can use "set -f" in '
-                'bash or change directories such that there is no filename '
-                'that would conflict.'
-                '\n'.format(noderange))
-            sys.exit(1)

confluent_client/confluent/screensqueeze.py

@@ -1,87 +0,0 @@
-# Copyright 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.
-
-import fcntl
-import sys
-import struct
-import termios
-
-def get_screenwidth():
-    return struct.unpack('hh', fcntl.ioctl(sys.stdout, termios.TIOCGWINSZ,
-                                           b'....'))[1]
-class ScreenPrinter(object):
-
-    def __init__(self, noderange, client, textlen=4):
-        self.squeeze = sys.stdout.isatty()
-        self.textlen = textlen
-        self.noderange = noderange
-        self.client = client
-        self.nodeoutput = {}
-        self.nodelist = []
-        maxlen = 0
-        for ans in self.client.read('/noderange/{0}/nodes/'.format(noderange)):
-            if 'error' in ans:
-                sys.stderr.write(ans['error'])
-                continue
-            nodename = ans['item']['href'][:-1]
-            if len(nodename) > maxlen:
-                maxlen = len(nodename)
-            self.nodelist.append(nodename)
-            self.nodeoutput[nodename] = ''
-        self.nodenamelen = maxlen
-        self.textlen = textlen
-        self.fieldwidth = maxlen + textlen + 1  # 1 for column
-
-    def set_output(self, node, text):
-        if self.nodeoutput[node] == text:
-            return
-        self.nodeoutput[node] = text
-        if len(text) >= self.textlen:
-            self.textlen = len(text) + 1
-            self.fieldwidth = self.textlen + self.nodenamelen + 1
-        self.drawscreen()
-
-    def drawscreen(self):
-        if self.squeeze:
-            currwidth = get_screenwidth()
-            numfields = currwidth // self.fieldwidth
-            fieldformat = '{{0:>{0}}}:{{1:{1}}}'.format(self.nodenamelen,
-                                                        self.textlen)
-            sys.stdout.write('\x1b[2J\x1b[;H')  # clear screen
-        else:
-            numfields = 1
-            fieldformat = '{0}: {1}'
-        currfields = 0
-        for node in self.nodelist:
-            if currfields >= numfields:
-                sys.stdout.write('\n')
-                currfields = 1
-            else:
-                currfields += 1
-            sys.stdout.write(fieldformat.format(node, self.nodeoutput[node]))
-        sys.stdout.write('\n')
-        sys.stdout.flush()
-
-
-
-
-
-if __name__ == '__main__':
-    import confluent.client as client
-    c = client.Command()
-    p = ScreenPrinter('n1-n13', c)
-    p.set_output('n3', 'Upload: 67%')
-
-
-

confluent_client/confluent/sortutil.py

@@ -1,43 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2014 IBM Corporation
-# Copyright 2015-2016 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.
-
-import re
-
-numregex = re.compile('([0-9]+)')
-
-
-def naturalize_string(key):
-    """Analyzes string in a human way to enable natural sort
-
-    :param key: The node name to analyze
-    :returns: A structure that can be consumed by 'sorted'
-    """
-    return [int(text) if text.isdigit() else text.lower()
-            for text in re.split(numregex, key)]
-
-
-def natural_sort(iterable):
-    """Return a sort using natural sort if possible
-
-    :param iterable:
-    :return:
-    """
-    try:
-        return sorted(iterable, key=naturalize_string)
-    except TypeError:
-        # The natural sort attempt failed, fallback to ascii sort
-        return sorted(iterable)

confluent_client/confluent/textgroup.py

@@ -1,222 +0,0 @@
-# Copyright 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.
-
-import difflib
-import re
-import sys
-
-try:
-    range = xrange
-except NameError:
-    pass
-
-
-
-numregex = re.compile('([0-9]+)')
-def humanify_nodename(nodename):
-    """Analyzes nodename in a human way to enable natural sort
-
-    :param nodename: The node name to analyze
-    :returns: A structure that can be consumed by 'sorted'
-    """
-    return [int(text) if text.isdigit() else text.lower()
-            for text in re.split(numregex, nodename)]
-
-
-def _colorize_line(orig, mask):
-    highlighted = False
-    newline = orig[0]
-    for i in range(1, len(orig)):
-        if i > len(mask) - 1:
-            if highlighted:
-                newline += '\x1b[0m'
-            newline += orig[i:]
-            break
-        if highlighted and mask[i] == ' ':
-            highlighted = False
-            newline += '\x1b[0m'
-        elif not highlighted and mask[i] != ' ':
-            highlighted = True
-            newline += '\x1b[31m'
-        newline += orig[i]
-    newline += '\x1b[0m'
-    return newline
-
-
-def near_diff(idx, diffdata):
-    maxidx = idx + 3
-    if maxidx > len(diffdata) -1:
-        maxidx = len(diffdata) - 1
-    idx = idx - 3
-    if idx < 0:
-        idx = 0
-    while idx <= maxidx:
-        if len(diffdata[idx]) > 0 and diffdata[idx][0] in ('+', '-'):
-            return True
-        idx += 1
-    return False
-
-
-def colordiff(first, second):
-    diffdata = list(difflib.ndiff(first, second))
-    quiet = True
-    for i in range(len(diffdata)):
-        if i < len(diffdata) - 1 and diffdata[i + 1].startswith('?'):
-            if quiet:
-                quiet = False
-                yield '@@'
-            yield _colorize_line(diffdata[i], diffdata[i + 1])
-        elif not diffdata[i].startswith('?') and near_diff(i, diffdata):
-            if quiet:
-                quiet = False
-                yield '@@'
-            yield diffdata[i]
-        elif not diffdata[i].startswith('?'):
-            quiet = True
-
-
-
-class GroupedData(object):
-    '''A post processor to sort and compare per-node data
-
-    :param confluentconnection: If given, will attempt to use the connection to abbreviate noderanges
-    '''
-
-    def __init__(self, confluentconnection=None):
-        self.bynode = {}
-        self.byoutput = {}
-        self.header = {}
-        self.client = confluentconnection
-
-    def generate_byoutput(self):
-        self.byoutput = {}
-        for n in self.bynode:
-            output = '\n'.join(self.bynode[n])
-            if output not in self.byoutput:
-                self.byoutput[output] = set([n])
-            else:
-                self.byoutput[output].add(n)
-
-    def add_line(self, node, line):
-        if node not in self.bynode:
-            self.bynode[node] = [line]
-        else:
-            self.bynode[node].append(line)
-
-    def get_group_text(self, nodes):
-        if self.client:
-            headerkey = ','.join(sorted(nodes))
-            if headerkey in self.header:
-                return self.header[headerkey]
-            noderange = ''
-            for reply in self.client.create('/noderange//abbreviate',
-                                            {'nodes': sorted(nodes)}):
-                noderange = reply['noderange']
-            self.header[headerkey] = noderange
-            return noderange
-        else:
-            return ','.join(sorted(nodes, key=humanify_nodename))
-
-    def print_all(self, output=sys.stdout, skipmodal=False, reverse=False,
-                  count=False):
-        self.generate_byoutput()
-        modaloutput = None
-        ismodal = True
-
-        if reverse:
-            outdatalist = sorted(
-                self.byoutput, key=lambda x: [len(self.byoutput[x]),
-                                              humanify_nodename(
-                                                  self.get_group_text(
-                                                      self.byoutput[x]
-                                                  ))])
-        else:
-            outdatalist = sorted(
-                self.byoutput, key=lambda x: [0 - len(self.byoutput[x]),
-                                              humanify_nodename(
-                                                  self.get_group_text(
-                                                      self.byoutput[x]
-                                                  ))])
-        if reverse and skipmodal:
-            # if reversed, the last is biggest and should be skipped if modal
-            outdatalist = outdatalist[:-1]
-        for outdata in outdatalist:
-            if not reverse and skipmodal:
-                # If big first, this makes skipmodal skip first
-                skipmodal = False
-                continue
-            currout = '====================================\n'
-            currout += self.get_group_text(self.byoutput[outdata])
-            currout += '\n====================================\n'
-            if count:
-                currout += 'Count: {0}'.format(len(list(
-                    self.byoutput[outdata])))
-                currout += '\n====================================\n'
-            currout += outdata
-            currout += '\n\n'
-            output.write(currout)
-        output.flush()
-
-    def print_deviants(self, output=sys.stdout, skipmodal=False, reverse=False,
-                       count=False, basenode=None):
-        self.generate_byoutput()
-        modaloutput = None
-        ismodal = True
-        revoutput = []
-        if basenode:
-            for checkout in self.byoutput:
-                if basenode in self.byoutput[checkout]:
-                    modaloutput = checkout
-        for outdata in sorted(
-                self.byoutput, key=lambda x: [0 if modaloutput == x else 1,
-                                              0 - len(self.byoutput[x]),
-                                              humanify_nodename(
-                                                  self.get_group_text(
-                                                      self.byoutput[x]
-                                                  ))]):
-            if modaloutput is None:
-                modaloutput = outdata
-            if skipmodal:
-                skipmodal = False
-                ismodal = False
-                continue
-            currout = '====================================\n'
-            currout += self.get_group_text(self.byoutput[outdata])
-            currout += '\n====================================\n'
-            if count:
-                currout += 'Count: {0}'.format(len(list(
-                    self.byoutput[outdata])))
-                currout += '\n====================================\n'
-            if ismodal:
-                ismodal = False
-                currout += outdata
-            else:
-                currout += '\n'.join(colordiff(modaloutput.split('\n'),
-                                                 outdata.split('\n')))
-            currout += '\n\n'
-            if reverse:
-                revoutput.append(currout)
-            else:
-                output.write(currout)
-        for currout in reversed(revoutput):
-            output.write(currout)
-        output.flush()
-
-if __name__ == '__main__':
-    groupoutput = GroupedData()
-    for line in sys.stdin.read().split('\n'):
-        if not line:
-            continue
-        groupoutput.add_line(*line.split(': ', 1))
-    groupoutput.print_deviants()

confluent_client/confluent/tlvdata.py

@@ -20,16 +20,6 @@ from datetime import datetime
 import json
 import struct
 
-try:
-    unicode
-except NameError:
-    unicode = str
-
-try:
-    range = xrange
-except NameError:
-    pass
-
 def decodestr(value):
     ret = None
     try:
@@ -39,39 +29,26 @@ def decodestr(value):
             ret = value.decode('cp437')
         except UnicodeDecodeError:
             ret = value
-    except AttributeError:
-        return value
     return ret
 
 def unicode_dictvalues(dictdata):
     for key in dictdata:
-        if isinstance(dictdata[key], bytes):
+        if isinstance(dictdata[key], str):
             dictdata[key] = decodestr(dictdata[key])
         elif isinstance(dictdata[key], datetime):
             dictdata[key] = dictdata[key].strftime('%Y-%m-%dT%H:%M:%S')
         elif isinstance(dictdata[key], list):
-            _unicode_list(dictdata[key])
+            for i in xrange(len(dictdata[key])):
+                if isinstance(dictdata[key][i], str):
+                    dictdata[key][i] = decodestr(dictdata[key][i])
+                elif isinstance(dictdata[key][i], dict):
+                    unicode_dictvalues(dictdata[key][i])
         elif isinstance(dictdata[key], dict):
             unicode_dictvalues(dictdata[key])
 
 
-def _unicode_list(currlist):
-    for i in range(len(currlist)):
-        if isinstance(currlist[i], str):
-            currlist[i] = decodestr(currlist[i])
-        elif isinstance(currlist[i], dict):
-            unicode_dictvalues(currlist[i])
-        elif isinstance(currlist[i], list):
-            _unicode_list(currlist[i])
-
-
 def send(handle, data):
-    if isinstance(data, unicode):
-        try:
-            data = data.encode('utf-8')
-        except AttributeError:
-            pass
-    if isinstance(data, bytes) or isinstance(data, unicode):
+    if isinstance(data, str):
         # plain text, e.g. console data
         tl = len(data)
         if tl == 0:
@@ -97,14 +74,6 @@ def send(handle, data):
         handle.sendall(struct.pack("!I", tl))
         handle.sendall(sdata)
 
-def recvall(handle, size):
-    rd = handle.recv(size)
-    while len(rd) < size:
-        nd = handle.recv(size - len(rd))
-        if not nd:
-            raise Exception("Error reading data")
-        rd += nd
-    return rd
 
 def recv(handle):
     tl = handle.recv(4)

confluent_client/confluent_client.spec.tmpl

@@ -24,18 +24,10 @@ a confluent server.
 %setup -n %{name}-%{version} -n %{name}-%{version}
 
 %build
-%if "%{dist}" == ".el8"
-python3 setup.py build
-%else
-python2 setup.py build
-%endif
+python setup.py build
 
 %install
-%if "%{dist}" == ".el8"
-python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python
-%else
-python2 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python
-%endif
+python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python
 
 
 %clean

confluent_client/confluent_env.sh

@@ -2,284 +2,3 @@ PATH=/opt/confluent/bin:$PATH
 export PATH
 MANPATH=/opt/confluent/share/man:$MANPATH
 export MANPATH
-# The aliases below are to signify that file globbing is unwelcome at the shell
-# this avoids a problem if a user does a noderange like 'n[21-33] and there is a file
-# in the directory like 'n3' that causes the parameter to change and target a totally
-# different node
-# Unfortunately in bourne shell, we cannot reliably ensure a prepended set-f
-# and an appended set +f are both run.  alias seems to be the only mechanism
-# that can intervene before glob expansion, but it lacks power.
-# putting it into a function to append is all well and good, *except*  that
-# if doing something like 'nodepower compute|grep' causes set -f to execute
-# in current shell, and the function to be in a subshell and leaves globbing
-# disabled in the parent shell.  Instead, store the current command in a
-# variable and use that to check for misglobbed noderanges, which was the goal
-alias nodeattrib='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodeattrib'
-alias nodebmcreset='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodebmcreset'
-alias nodeboot='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodeboot'
-alias nodeconfig='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodeconfig'
-alias nodeconsole='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodeconsole'
-alias nodedefine='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodedefine'
-alias nodeeventlog='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodeeventlog'
-alias nodefirmware='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodefirmware'
-alias nodegroupattrib='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodegroupattrib'
-alias nodegroupdefine='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodegroupdefine'
-alias nodegroupremove='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodegroupremove'
-alias nodehealth='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodehealth'
-alias nodeidentify='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodeidentify'
-alias nodeinventory='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodeinventory'
-alias nodelist='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodelist'
-alias nodemedia='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodemedia'
-alias nodepower='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodepower'
-alias noderemove='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; noderemove'
-alias nodereseat='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodereseat'
-alias noderun='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; noderun'
-alias nodesensors='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodesensors'
-alias nodesetboot='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodesetboot'
-alias nodestorage='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodestorage'
-alias nodeshell='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodeshell'
-alias nodelicense='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodelicense'
-# Do not continue for non-bash shells, the rest of this sets up bash completion functions
-[ -z "$BASH_VERSION" -o -z "$PS1" ] && return
-
-
-_confluent_get_args()
-{
-    CMPARGS=($COMP_LINE)
-    NUMARGS=$((COMP_CWORD+1))
-    if [ "${COMP_WORDS[COMP_CWORD]}" == '' ]; then
-        CMPARGS+=("")
-    fi
-    GENNED=""
-    for CAND in ${COMP_CANDIDATES[@]}; do
-        candarray=(${CAND//,/ })
-        matched=0
-        for c in "${candarray[@]}"; do
-            for arg in "${CMPARGS[@]}"; do
-                if [ "$arg" = "$c" ]; then
-                    matched=1
-                    break
-                fi
-            done
-        done
-        if [ 0 = $matched ]; then
-            for c in "${candarray[@]}"; do
-                GENNED+=" $c"
-            done
-        fi
-    done
-}
-
-function _confluent_generic_completion()
-{
-    _confluent_get_args
-    if [ $NUMARGS -ge 3 ] && [ ! -z "$GENNED" ]; then
-        COMPREPLY=($(compgen -W "$GENNED" -- ${COMP_WORDS[COMP_CWORD]}))
-    fi
-    if [ $NUMARGS -lt 3 ]; then
-        _confluent_nr_completion
-        return;
-    fi
-}
-_confluent_nodeidentify_completion()
-{
-    COMP_CANDIDATES=("on,off,blink -h")
-    _confluent_generic_completion
-}
-
-
-_confluent_nodesetboot_completion()
-{
-    COMP_CANDIDATES=("default,cd,network,setup,hd -h -b -p")
-    _confluent_generic_completion
-}
-
-_confluent_nodepower_completion()
-{
-   COMP_CANDIDATES=("boot,off,on,status -h -p")
-   _confluent_generic_completion
-}
-
-_confluent_nodemedia_completion()
-{
-    COMP_CANDIDATES=("list,upload,attach,detachall -h")
-    _confluent_get_args
-    if [ $NUMARGS -gt 3 ] && [ ${CMPARGS[-2]} == 'upload' ]; then
-        compopt -o default
-        COMPREPLY=()
-        return
-    fi
-    if [ $NUMARGS -ge 3 ] && [ ! -z "$GENNED" ]; then
-        COMPREPLY=($(compgen -W "$GENNED" -- ${COMP_WORDS[COMP_CWORD]}))
-        return;
-    fi
-    if [ $NUMARGS -lt 3 ]; then
-        _confluent_nr_completion
-        return;
-    fi
-}
-
-_confluent_nodefirmware_completion()
-{
-    _confluent_get_args
-    if [ $NUMARGS == 3 ]; then
-        COMPREPLY=($(compgen -W "list update" -- ${COMP_WORDS[COMP_CWORD]}))
-        return;
-    fi
-    if [ $NUMARGS -gt 3 ] && [ ${CMPARGS[2]} == 'update' ]; then
-        compopt -o default
-        COMPREPLY=()
-        return
-    fi
-    if [ $NUMARGS -lt 3 ]; then
-        _confluent_nr_completion
-        return;
-    fi
-}
-
-_confluent_nodeshell_completion()
-{
-    _confluent_get_args
-    if [ $NUMARGS == 3 ]; then
-        COMPREPLY=($(compgen -c -- ${COMP_WORDS[COMP_CWORD]}))
-        return
-    fi
-    if [ $NUMARGS -gt 3 ]; then
-        compopt -o default
-        COMPREPLY=()
-        return
-    fi
-    if [ $NUMARGS -lt 3 ]; then
-        _confluent_nr_completion
-        return;
-    fi
-}
-
-_confluent_nodelicense_completion()
-{
-    _confluent_get_args
-    if [ $NUMARGS == 3 ]; then
-        COMPREPLY=($(compgen -W "install list save delete" -- ${COMP_WORDS[COMP_CWORD]}))
-        return;
-    fi
-    if [ $NUMARGS == 4 ] && [ ${CMPARGS[2]} == 'install' ]; then
-        compopt -o default
-        COMPREPLY=()
-        return
-    fi
-    if [ $NUMARGS == 4 ] && [ ${CMPARGS[2]} == 'save' ]; then
-        compopt -o dirnames
-        COMPREPLY=()
-        return
-    fi
-    if [ $NUMARGS -lt 3 ]; then
-         _confluent_nr_completion
-         return
-    fi
-}
-
-_confluent_nodesupport_completion()
-{
-    _confluent_get_args
-    if [ $NUMARGS == 3 ]; then
-        COMPREPLY=($(compgen -W "servicedata" -- ${COMP_WORDS[COMP_CWORD]}))
-        return;
-    fi
-    if [ $NUMARGS == 4 ] && [ ${CMPARGS[2]} == 'servicedata' ]; then
-        compopt -o  dirnames
-        COMPREPLY=()
-        return
-    fi
-    if [ $NUMARGS -lt 3 ]; then
-         _confluent_nr_completion
-         return
-    fi
-}
-
-_confluent_nodeattrib_completion()
-{
-    COMP_CANDIDATES=$(nodeattrib '~.>1' all | awk '{print $2}'|sed -e 's/://')
-    _confluent_generic_completion
-}
-
-
-_confluent_nn_completion()
-{
-    _confluent_get_args
-    if [ $NUMARGS -gt 2 ]; then
-        return;
-    fi
-    INPUT=${COMP_WORDS[COMP_CWORD]}
-    INPUT=${INPUT##*,-}
-    INPUT=${INPUT##*,}
-    INPUT=${INPUT##*@}
-    PREFIX=""
-    if [ "$INPUT" != "${COMP_WORDS[COMP_CWORD]}" ]; then
-        PREFIX=${COMP_WORDS[COMP_CWORD]}
-        PREFIX=$(echo $PREFIX | sed -e 's/,[^,@-]*$/,/' -e 's/,-[^,@]*$/,-/' -e 's/@[^,@]*/@/')
-    fi
-
-    COMPREPLY=($(compgen -W "$(nodelist | sed -e s/^/$PREFIX/)" -- "${COMP_WORDS[COMP_CWORD]}"))
-}
-_confluent_nr_completion()
-{
-    CMPARGS=($COMP_LINE)
-    _confluent_get_args
-    if [ $NUMARGS -gt 2 ]; then
-        return;
-    fi
-    INPUT=${COMP_WORDS[COMP_CWORD]}
-    INPUT=${INPUT##*,-}
-    INPUT=${INPUT##*,}
-    INPUT=${INPUT##*@}
-    PREFIX=""
-    if [ "$INPUT" != "${COMP_WORDS[COMP_CWORD]}" ]; then
-        PREFIX=${COMP_WORDS[COMP_CWORD]}
-        PREFIX=$(echo $PREFIX | sed -e 's/,[^,@-]*$/,/' -e 's/,-[^,@]*$/,-/' -e 's/@[^,@]*/@/')
-    fi
-
-    COMPREPLY=($(compgen -W "$(confetty show /nodegroups|sed -e 's/\///' -e s/^/$PREFIX/;nodelist | sed -e s/^/$PREFIX/)" -- "${COMP_WORDS[COMP_CWORD]}"))
-}
-_confluent_ng_completion()
-{
-    _confluent_get_args
-    if [ $NUMARGS -gt 2 ]; then
-        return;
-    fi
-    INPUT=${COMP_WORDS[COMP_CWORD]}
-    INPUT=${INPUT##*,-}
-    INPUT=${INPUT##*,}
-    INPUT=${INPUT##*@}
-    PREFIX=""
-    if [ "$INPUT" != "${COMP_WORDS[COMP_CWORD]}" ]; then
-        PREFIX=${COMP_WORDS[COMP_CWORD]}
-        PREFIX=$(echo $PREFIX | sed -e 's/,[^,@-]*$/,/' -e 's/,-[^,@]*$/,-/' -e 's/@[^,@]*/@/')
-    fi
-
-    COMPREPLY=($(compgen -W "$(confetty show /nodegroups|sed -e 's/\///' -e s/^/$PREFIX/)" -- "${COMP_WORDS[COMP_CWORD]}"))
-}
-complete -F _confluent_nodeattrib_completion nodeattrib
-complete -F _confluent_nodeattrib_completion nodegroupattrib
-complete -F _confluent_nr_completion nodebmcreset
-complete -F _confluent_nodesetboot_completion nodeboot
-complete -F _confluent_nr_completion nodeconfig
-complete -F _confluent_nn_completion nodeconsole
-complete -F _confluent_nr_completion nodeeventlog
-complete -F _confluent_nodefirmware_completion nodefirmware
-complete -F _confluent_ng_completion nodegroupattrib
-complete -F _confluent_ng_completion nodegroupremove
-complete -F _confluent_nr_completion nodehealth
-complete -F _confluent_nodeidentify_completion nodeidentify
-complete -F _confluent_nr_completion nodeinventory
-complete -F _confluent_nodeattrib_completion nodelist
-complete -F _confluent_nodemedia_completion nodemedia
-complete -F _confluent_nodepower_completion nodepower
-complete -F _confluent_nr_completion noderemove
-complete -F _confluent_nr_completion nodereseat
-complete -F _confluent_nodeshell_completion noderun
-complete -F _confluent_nr_completion nodesensors
-complete -F _confluent_nodesetboot_completion nodesetboot
-complete -F _confluent_nodeshell_completion nodeshell
-complete -F _confluent_nodesupport_completion nodesupport
-complete -F _confluent_nodelicense_completion nodelicense
-

confluent_client/doc/man/collate.ronn

@@ -1,92 +0,0 @@
-collate(1) -- Organize text input by node
-==============================
-
-## SYNOPSIS
-
-`<other command> | collate [-a] [-d] [-w] [-s] [-c] [-r] [-l lognametemplate]`
-
-## DESCRIPTION
-
-**collate** takes input in the form of <nodename>: <data> and groups
-the output for each <nodename> together, and checks for identical data to further group nodes together.
-Output groups are sorted in descending size such that the topmost group is the largest, and the
-last output group is the smallest.  In the event of equally sized output groups,
-the groups are sorted alphanumerically by their header, and each header has
-node and group names sorted alphanumerically.
-
-## OPTIONS
-
-* `-a`, `--abbreviate`:
-   Use confluent to attempt to shorten the noderange.  This can help identify
-   when output differs along a telling group boundary.  For example, if
-   output suggests a large number of nodes are unreachable, abbreviate
-   showing 'rack1' as being unreachable may make more obvious a possible cause.
-
-* `-d`, `--diff`:
-   Express all but the most common result group in terms of diff from
-   the most common result group
-
-* `-l`, `--log`:
-   Save output per node to individual log files, replacing {node} in the name
-   with the nodename of each
-
-* `-w`, `--watch`:
-   Update results dynamically as data becomes available, rather than
-   waiting    for the command to fully complete.
-
-* `-s`, `--skipcommon`:
-   Suppress printing of the most common result text group.  This is used to
-   focus on stray output against a well known and expected result.
-   
-* `-c`, `--count`:
-   Print a count of the number of nodes in an output group under the 
-  noderange.
-  
- * `-r`, `--reverse`:
-    Rather than starting with most common to least common, start with
-    the least common and print the most common last.
-   
-## EXAMPLES
- * Organizing power state of multiple nodes:  
-  `# nodepower n1-n12 | collate`  
-  `====================================`  
-  `n1,n2,n3,n4,n7,n8,n9,n10,n11,n12`  
-  `====================================`  
-  `on`  
-  ` `  
-  `====================================`  
-  `n5,n6`  
-  `====================================`  
-  `off`  
-
-* Using diff to detect distinct UEFI configuration
-
-  `# pasu n1-n4 show Processors|collate -d -s`  
-  `====================================`  
-  `n3`  
-  `====================================`  
-  `@@`  
-  `  Processors.ProcessorPerformanceStates=Enable`  
-  `  Processors.C-States=Enable`  
-  `  Processors.PackageACPIC-StateLimit=ACPI C3`  
-  `- Processors.C1EnhancedMode=Enable`  
-  `+ Processors.C1EnhancedMode=Disable`  
-  `- Processors.Hyper-Threading=Enable`  
-  `+ Processors.Hyper-Threading=Disable`  
-  `  Processors.ExecuteDisableBit=Enable`  
-  `  Processors.IntelVirtualizationTechnology=Enable`  
-  ` `  
-  `====================================`  
-  `n1`  
-  `====================================`  
-  `@@`  
-  `  Processors.ProcessorPerformanceStates=Enable`  
-  `  Processors.C-States=Enable`  
-  `  Processors.PackageACPIC-StateLimit=ACPI C3`  
-  `- Processors.C1EnhancedMode=Enable`  
-  `+ Processors.C1EnhancedMode=Disable`  
-  `  Processors.Hyper-Threading=Enable`  
-  `  Processors.ExecuteDisableBit=Enable`  
-
-   
-   

confluent_client/doc/man/collective.ronn

@@ -1,55 +0,0 @@
-collective(1) -- Check and manage a confluent collective
-==============================
-
-## SYNOPSIS
-
-`collective invite <server>`  
-`collective join <server> [-i TOKEN]`  
-`collective show`  
-`collective gencert`  
-
-
-## DESCRIPTION
-
-**collective** helps manage the collective mode of confluent, where multiple
-confluent servers are linked together to act as one.  For example, the procedure to set up
-a collective to run on three servers called mgt1, mgt2, and mgt3, first install and start
-confluent as usual on the three servers.  On mgt1, run `collective invite mgt2` and an
-invitation token will be output.  On mgt2, either run `collective join mgt1` to paste
-the token interactively, or `collective join mgt1 -i <token>`.  At this point, either
-mgt1 or mgt2 can bring in mgt3.  For example on mgt2 run `collective invite mgt3` and
-on mgt3 run `collective join mgt2 -i <token>`
-
-This can be linked together in the following manner with ssh:
-on mgt1:
-  `# ssh mgt2 collective join mgt1 -i $(collective invite mgt2)`
-
-Note that a collective is only redundant with 3 or more members.  The collective
-will function so long as more than half of the members are online.  A collective
-of two members is supported, but without redundancy.
-
-Also note that the collective leader role is dynamic, but has no impact on interacting
-with confluent.  It is merely an internal role that can dynamically change depending
-on circumstances.
-
-## OPTIONS
-
- * `-i`:
-    Provide the token as an argument rather than interactively.
-   
-## EXAMPLES
- * Inviting a server called mgt2:
-  `# collective invite mgt2`  
-  `bWd0MkA+BNQ6XAxMXlqJJa+EQRlihL/k9xCXnasgSQXZr989Pa1/ln7G3e1Ncxx6BMzMqqreHJVkPr2FrzjNit/UgHlg`  
-
-* On mgt2, joining mgt1:
-  `# collective join mgt1 -i bWd0MkA+BNQ6XAxMXlqJJa+EQRlihL/k9xCXnasgSQXZr989Pa1/ln7G3e1Ncxx6BMzMqqreHJVkPr2FrzjNit/UgHlg`  
-  `Success`  
-
-* Showing the collective state:
-  `# collective show`  
-  `Quorum: True`  
-  `Leader: mgt1`  
-  `Active collective members:`  
-  `  mgt2`  
-

confluent_client/doc/man/nodeattrib.ronn

@@ -3,11 +3,9 @@ nodeattrib(8) -- List or change confluent nodes attributes
 
 ## SYNOPSIS
 
-`nodeattrib [-b] <noderange> [all|<nodeattribute>...]`
+`nodeattrib [-b] <noderange> [<nodeattribute>...]`  
 `nodeattrib <noderange> [<nodeattribute1=value1> <nodeattribute2=value2> ...]`  
 `nodeattrib -c <noderange> <nodeattribute1> <nodeattribute2> ...`  
-`nodeattrib -e <noderange> <nodeattribute1> <nodeattribute2> ...`  
-`nodeattrib -p <noderange> <nodeattribute1> <nodeattribute2> ...`  
 
 ## DESCRIPTION
 
@@ -20,19 +18,9 @@ displayed.  If `-b` is specified, it will also display information on
 how inherited and expression based attributes are defined.  Attributes can be
 straightforward values, or an expression as documented in nodeattribexpressions(5).
 For a full list of attributes, run `nodeattrib <node> all` against a node.
-If `-c` is specified, this will set the nodeattribute to a null value.
+If `-c` is specified, this will set the nodeattribute to a null valid.
 This is different from setting the value to an empty string.
 
-Attributes may be specified by wildcard, for example `net.*switch` will report
-all attributes that begin with `net.` and end with `switch`.
-
-If the word all is specified, then all available attributes are given.
-Omitting any attribute name or the word 'all' will display only attributes
-that are currently set.
-
-For the `groups` attribute, it is possible to add a group by doing
-`groups,=<newgroup>` and to remove by doing `groups^=<oldgroup>`
-
 Note that `nodeattrib <group>` will likely not provide the expected behavior.
 See nodegroupattrib(8) command on how to manage attributes on a group level.
 
@@ -42,10 +30,6 @@ See nodegroupattrib(8) command on how to manage attributes on a group level.
   Annotate inherited and expression based attributes to show their base value.
 * `-c`, `--clear`:
   Clear specified nodeattributes
-* `-e`, `--environment`:
-  Set specified attributes based on exported environment variable of matching name.  Environment variable names may be lower case or all upper case.  Replace . with _ as needed (e.g. info.note may be specified as either $info_note or $INFO_NOTE
-* `-p`, `--prompt`:
-  Request interactive prompting to provide values rather than the command line or environment variables.
 
 ## EXAMPLES
 * Listing matching nodes of a simple noderange:
@@ -91,14 +75,6 @@ See nodegroupattrib(8) command on how to manage attributes on a group level.
     `n1: console.method: `  
     `n2: console.method: `  
 
-* List all switches that a node is described as connected to:
-    `# nodeattrib d1 net.*switch`  
-    `d1: net.mgt.switch: mgtswitch1`  
-    `d1: net.pxe.switch: pxeswitch1`  
-    `d1: net.switch:`  
-
 ## SEE ALSO
 
 nodegroupattrib(8), nodeattribexpressions(5)
-
-## ATTRIBUTES

confluent_client/doc/man/nodeattribexpressions.ronn

@@ -9,18 +9,6 @@ expression to generate the value.
 An expression will contain some directives wrapped in `{}` characters. Within
 `{}` are a number of potential substitute values and operations.
 
-Note that syntax of expressions can have overlap with the shell syntax.
-For example:
-
-`$ echo (n2)`  
-`-bash: syntax error near unexpected token `n2'`  
-
-In such a case, it helps to quote the expression to allow it to be passed:
-
-`$ echo '(n2)'`  
-`(n2)`  
-
-
 The most common operation is to extract a number from the nodename. These 
 values are available as n1, n2, etc. So for example attributes for a node named 
 b1o2r3u4 would have {n1} as 1, {n2} as 2, {n3} as 3, and {n4} as 4. 
@@ -51,7 +39,7 @@ number of operators at the end to indicate formatting changes.
 
 Another common element to pull into an expression is the node name in whole:
 
-`hardwaremanagement.manager={node}-imm`
+`hardwaremanagement.manager={nodename}-imm`  
 
 Additionally other attributes may be pulled in:
 
@@ -59,7 +47,7 @@ Additionally other attributes may be pulled in:
 
 Multiple expressions are permissible within a single attribute:
 
-`hardwaremanagement.manager={node}-{hardwaremanagement.method}`
+`hardwaremanagement.manager={nodename}-{hardwaremanagement.method}`  
 
 A note to developers: in general the API layer will automatically recognize a
 generic set attribute to string with expression syntax and import it as an

confluent_client/doc/man/nodebmcreset.ronn

@@ -1,19 +0,0 @@
-nodebmcreset(8) -- Reset management controller
-=========================================================
-
-## SYNOPSIS
-
-`nodebmcreset <noderange>`  
-
-## DESCRIPTION
-
-`nodebmcreset` allows you to reset the management controller of the specified noderange
-
-## EXAMPLES:
-
-* Reset the management controller for nodes n1 through n4:
-  `# nodebmcreset n1-n4`  
-  `n1: BMC Reset Successful`  
-  `n2: BMC Reset Successful`  
-  `n3: BMC Reset Successful`  
-  `n4: BMC Reset Successful`  

confluent_client/doc/man/nodeboot.ronn

@@ -4,44 +4,12 @@ nodeboot(8) -- Reboot a confluent node to a specific device
 ## SYNOPSIS
 
 `nodeboot <noderange>`  
-`nodeboot [options] <noderange>` [default|cd|network|setup|hd]  
+`nodeboot <noderange>` [net|setup]  
 
 ## DESCRIPTION
 
 **nodeboot** reboots nodes in a noderange.  If an additional argument is given,
-it sets the node to specifically boot to that as the next boot.  This 
-performs an immediate reboot without waiting for the OS.  To set the boot
-device without inducing a reboot, see the `nodesetboot` command.
-
-## OPTIONS
-
-* `-b`, `--bios`:
-  For a system that supports both BIOS and UEFI style boot, request BIOS style
-  boot if supported (some platforms will UEFI boot with this flag anyway).
-
-* `-u`, `--uefi`:
-  This flag does nothing, it is for command compatibility with xCAT's rsetboot
-
-* `-p`, `--persist`:
-  For a system that supports it, mark the boot override to persist rather than
-  be a one time change.  Many systems do not support this functionality.
-
-* `default`:
-  Request a normal default boot with no particular device override
-
-* `cd`:
-  Request boot from media.  Note that this can include physical CD,
-  remote media mounted as CD/DVD, and detachable hard disks drives such as usb
-  key devices.
-  
-* `network`:
-  Request boot to network
-  
-* `setup`:
-  Request to enter the firmware configuration menu (e.g. F1 setup) on next boot.
-
-* `hd`:
-  Boot straight to hard disk drive
+it sets the node to specifically boot to that as the next boot.
 
 ## EXAMPLES
 * Booting n3 and n4 to the default boot behavior:

confluent_client/doc/man/nodeconfig.ronn

@@ -1,63 +0,0 @@
-nodeconfig(8) -- Show or change node configuration
-==================================================
-
-## SYNOPSIS
-
-`nodeconfig <noderange> [options] [<configuration>..]`  
-`nodeconfig <noderange> [options] [<configuration=value>..]`  
-
-## DESCRIPTION
-
-**nodeconfig** manages the configuration of nodes managed by confluent.
-Rather than manipulating the confluent database, this actually modifies the
-running configuration on the node firmware.  Calling without '=' will show the
-current value, and '=' will change the value.  Network information can be
-given as a node expression, as documented in the man page for nodeattribexpressions(5).
-
-## OPTIONS
-
-* `-c`, `--comparedefault`:
-  Take the given settings and compare against default value, if available.  If
-  no configuration values are specified, it will show only those that differ.
-  If combined with `-x`, will show all differing values except those indicated
-  by `-x`
-
-* `-e`, `--extra`:
-   Read settings that are generally not needed, but may be slow to retrieve.
-   Notably this includes the IMM category of Lenovo systems.  The most popular
-   IMM settings are available through faster 'bmc' attributes.
-
-* `-x`, `--exclude`:
-  Rather than listing only the specified configuration parameters, list all
-  attributes except for the specified ones
-
-* `-d`, `--detail`:
-  Provide detailed data as available.  This can include help text and valid
-  values for a setting.
-
-* `-r`, `--restoredefault`:
-  Request that the specified component of the targeted nodes will have its
-  configuration reset to default.  Currently the only component implemented
-  is uefi.
-
-* `-b`, '--batch':
-   Provide arguments as lines of a file, rather than the command line.
-
-
-## EXAMPLES
-* Showing the current IP configuration of noderange BMC/IMM/XCC:
-    `# nodeconfig s3,s4 bmc`  
-    `s3: bmc.ipv4_address: 172.30.254.193/16`  
-    `s3: bmc.ipv4_method: DHCP`  
-    `s3: bmc.ipv4_gateway: 172.30.0.6`  
-    `s4: bmc.ipv4_address: 172.30.254.192/16`  
-    `s4: bmc.ipv4_method: DHCP`  
-    `s4: bmc.ipv4_gateway: 172.30.0.6`  
-
-* Changing nodes `s3` and `s4` to have the ip addressess 10.1.2.3 and 10.1.2.4 with a 16 bit subnet mask:
-    `# nodeconfig s3,s4 bmc.ipv4_address=10.1.2.{n1}/16`  
-
-## SEE ALSO
-
-nodeattribexpressions(5)
-

confluent_client/doc/man/nodeconsole.ronn

@@ -2,7 +2,7 @@ nodeconsole(8) -- Open a console to a confluent node
 =====================================================
 
 ## SYNOPSIS
-`nodeconsole [options] <noderange>`
+`nodeconsole <node>`
 
 ## DESCRIPTION
 
@@ -11,17 +11,6 @@ text or serial console of a system.  Exiting is done by hitting `Ctrl-e`, then `
  then `.`.  Note that console output by default is additionally logged to
 `/var/log/confluent/consoles/`**NODENAME**.
 
-When the console connection to the target is broken, then confluent on backend
-will initiate an automatic retry interval that is randomized between 2 and 4 minutes.
-The reopen escape sequence below requests an immediate retry, as does connecting
-a new session.
-
-## OPTIONS
-
-* `-t`, `--tile`:
-  Use tmux to arrange consoles of the given noderange into a tiled layout on
-  the terminal screen
-
 ## ESCAPE SEQUENCE COMMANDS
 
 While connected to a console, a number of commands may be performed through escape
@@ -53,10 +42,6 @@ keystroke will be interpreted as a command.  The following commands are availabl
 * `pbn`:
   [Power Boot Network]
   Request immediate boot to network
-* `r`:
-  [send Resize]
-  This queries the current terminal and sends stty commands to advertise the user termineal
-  size to the remote console
 * `?`:
   Get a list of supported commands
 * `<ent>`:

confluent_client/doc/man/nodedefine.ronn

@@ -1,29 +0,0 @@
-nodedefine(8) -- Define new confluent nodes
-===================================================================
-
-## SYNOPSIS
-
-`nodedefine <noderange> [nodeattribute1=value1> <nodeattribute2=value2> ...]`  
-
-## DESCRIPTION
-
-`nodedefine` allows the definition of new nodes for the confluent management
-system.  It has the same syntax as `nodeattrib(8)`, and the commands differ in
-that `nodeattrib(8)` will error if a node does not exist.
-
-## EXAMPLES
-
-* Define two racks of nodes, named r{rack}u{u}:
-    `# nodedefine r1u1-r2u4`  
-    `r1u4: created`  
-    `r1u1: created`  
-    `r1u2: created`  
-    `r1u3: created`  
-    `r2u4: created`  
-    `r2u3: created`  
-    `r2u2: created`  
-    `r2u1: created`  
-
-## SEE ALSO
-
-noderange(5), nodeattribexpressions(8)

confluent_client/doc/man/nodediscover.ronn

@@ -1,144 +0,0 @@
-nodediscover(8)  -- List or manage confluent node discovery
-=========================================================
-
-## SYNOPSIS
-
-`nodediscover rescan`  
-`nodediscover [options] list`  
-`nodediscover [options] assign`
-`nodediscover [options] rescan`
-`nodediscover [options] clear`
-
-## DESCRIPTION
-
-**nodediscover** provides streamlined access to the confluent discovery data
-and assignment.  Nodes are detected through either an active scan (as occurs
-at service startup and on request by nodediscover rescan) or through passive
-detection (as a target comes online, it may attempt to register with the
-network).
-
-**nodediscover list** provides the currently known data in tabular format.  The
-data may be filtered by various parameters, as denoted in the options below.
-
-**nodediscover assign** performs manual discovery, assigning an entry to a node
-identity or, using `-i`, using a csv file to assign nodes all at once.  For
-example, a spreadsheet of serial numbers to desired node names could be used.
-
-**nodediscover rescan** requests the server to do an active sweep for new
-devices.  Generally every effort is made to passively detect devices as they
-become available (as they boot or are plugged in), however sometimes an active
-scan is the best approach to catch something that appears to be missing.
-
-**nodedsicover clear** requests the server forget about a selection of
-detected device.  It takes the same arguments as **nodediscover list**.
-
-## CSV FORMAT
-
-The CSV format used by nodediscover consists of one header describing the
-columns followed by the data.  The available columns are:
-
-* node: The name desired for the node in confluent
-* groups: A comma delimited list of groups to put the node into (using normal CSV escape rules for the commas)
-* mac: The mac address of the node
-* serial: The serial number of the node
-* uuid: The uuid of the node
-* bmc: The name or ip address that should be assigned to the BMC, regardless of current address
-* bmc_gateway: IP address of gateway, if desired
-* bmcuser: The desired username for the BMC to have as administrator
-* bmcpass: The desired password for the BMC to require
-
-Note that node is the only mandatory field.  To identify the systems, one of
-mac, serial, or uuid should be specified, it is pointless to provide more than
-one of these columns.  Other attributes if not provided may be defined through
-nodeattrib or group inherited.  It is possible to define nodes without ever
-providing a BMC ip, in which case IPv6 will be used automatically if possible.
-
-One example of a valid CSV file would be:
-node,serial,bmc,bmcuser,bmcpass
-n1,06DPMDF,172.30.204.1,admin,Passw0rd12
-n2,J30002HG,172.30.204.2,admin,Passw0rd12
-
-Which would use the serial number to assign the name and other three values to
-the nodes.
-
-## OPTIONS
-
-* `-m MODEL`, `--model=MODEL`:
-  Operate with nodes matching the specified model number
-* `-s SERIAL`, `--serial=SERIAL`:
-  Operate against the system matching the specified
-  serial number
-* `-u UUID`, `--uuid=UUID`:
-  Operate against the system matching the specified UUID
-* `-n NODE`, `--node=NODE`:
-  Operate with the given nodename
-* `-e MAC`, `--ethaddr=MAC`:
-  Operate against the system with the specified MAC
-  address
-* `-f FIELDS`, `--fields=FIELDS`:
-  Request a custom set of fields.  The available fields are:  
-  Node: The node name if a correlation has been identified  
-  Model: The model number  
-  Serial: The serial number  
-  UUID: The UUID as it should appear in DMI  
-  Type: Device type (e.g. lenovo-xcc, pxe-client, etc)  
-  IP: The confirmed working IP addresses associated with the record  
-  Mac: Mac address of the relevant network interface  
-  Switch: The nearest detected switch to the entry  
-  Port: Port of the switch that most closely connects to the network interface  
-  Advertised IP: IP addresses that may not have been confirmed, but are advertised  
-* `-o ORDER`, `--order=ORDER`:
-  Order output by given field.  Field names are the same as documented in the -f argument.
-* `-t TYPE`, `--type=TYPE`:
-  Operate against the system of the specified type
-* `-c`, `--csv`:
-  Use CSV formatted output
-* `-i IMPORT.CSV`, `--import=IMPORT.CSV`:
-  Import bulk assignment data from given CSV file
-* `-d STATE`, `--discoverystate=STATE`:
-  Indicate devices with a particular state.  The states are listed below
-* discovered: The device has been identified and has also had discovery
-              activities performed, including any relevant certificate
-              exchanges and deploying user and network configuration.
-* identified:  The device has been identified as to what node it is
-               supposed to be, however no active changes to the attributes
-               or device configuration has been performed.  This is
-               generally discovery awaiting approval due to
-               discovery.policy specifying a strict security model.
-* unidentified:  A device has been sensed, but no node identity has been
-                 established at all.  It provides data that can be used
-                 for nodediscover assign, as well as current IP addresses
-                 that can be used for manual efforts as possible.
-
-## EXAMPLES
-
-* Listing all detected Lenovo IMMv2 systems on a local network:
-  `# nodediscover list -t lenovo-imm2`  
-  `           Node|          Model|         Serial|                                UUID|      Mac Address|        Type|                            Current IP Addresses`  
-  `---------------|---------------|---------------|------------------------------------|-----------------|------------|------------------------------------------------`  
-  `             r2|        5463AC1|        06DPMDF|5f7133b8-c8cb-11e4-99a9-40f2e9b91018|40:f2:e9:b9:10:1d| lenovo-imm2|     172.30.204.1,fe80::42f2:e9ff:feb9:101d%eth1`  
-  `               |        7906AC1|        06PBX15|e98d483d-2759-11e1-8ffd-5cf3fc11249c|5c:f3:fc:11:24:9f| lenovo-imm2|      172.30.3.12,fe80::5ef3:fcff:fe11:249f%eth1`  
-  `             n1|        8737AC1|        23XXH41|14dd3ba6-5c38-11e1-931a-5cf3fc6e4680|5c:f3:fc:6e:13:e1| lenovo-imm2|       172.30.3.1,fe80::5ef3:fcff:fe6e:13e1%eth1`  
-  `             n7|        8737AC1|        23XXH32|79d2ce28-5cd5-11e1-8c86-5cf3fc6e46b0|5c:f3:fc:6e:13:f9| lenovo-imm2|       172.30.3.7,fe80::5ef3:fcff:fe6e:13f9%eth1`  
-  `             n8|        8737AC1|        23XXH49|551a8438-5cd5-11e1-8d6c-5cf3fc6e4708|5c:f3:fc:6e:14:25| lenovo-imm2|       172.30.3.8,fe80::5ef3:fcff:fe6e:1425%eth1`  
-  `             n3|        8737AC1|        23XXH30|1dd7f7b3-5da5-11e1-baf0-5cf3fc6e4738|5c:f3:fc:6e:14:3d| lenovo-imm2|       172.30.3.3,fe80::5ef3:fcff:fe6e:143d%eth1`  
-  `             n4|        8737AC1|        23XXH35|45b81dae-5d9b-11e1-8337-5cf3fc6e4858|5c:f3:fc:6e:14:cd| lenovo-imm2|       172.30.3.4,fe80::5ef3:fcff:fe6e:14cd%eth1`  
-  `            n11|        8737AC1|        23XXH12|31d90128-5c37-11e1-bdb7-5cf3fc6e4920|5c:f3:fc:6e:15:31| lenovo-imm2|      172.30.3.11,fe80::5ef3:fcff:fe6e:1531%eth1`  
-  `            n13|        8737AC1|        23XXH44|e23a138a-5cd3-11e1-8f3d-5cf3fc6e4950|5c:f3:fc:6e:15:49| lenovo-imm2|      172.30.3.13,fe80::5ef3:fcff:fe6e:1549%eth1`  
-  `               |        8737AC1|        23XXH29|5cd1216b-5c37-11e1-ba0c-5cf3fc6e49c8|5c:f3:fc:6e:15:85| lenovo-imm2|       172.30.3.9,fe80::5ef3:fcff:fe6e:1585%eth1`  
-  `               |        8737AC1|        23ZYT44|f4bf48ca-71f0-11e1-b274-5cf3fc6e4f10|5c:f3:fc:6e:18:29| lenovo-imm2|      172.30.3.10,fe80::5ef3:fcff:fe6e:1829%eth1`  
-  `         hpcedr|        7915AC1|        06DRHL5|a64e3014-d7e3-11e1-8d21-6cae8b1dff32|6c:ae:8b:1d:ff:36| lenovo-imm2|   172.30.254.250,fe80::6eae:8bff:fe1d:ff36%eth1`  
-  `               |        8737AC1|        06YRWC3|3af85a51-7efd-11e3-8599-000af7482e00|6c:ae:8b:32:cb:c5| lenovo-imm2|       172.30.3.6,fe80::6eae:8bff:fe32:cbc5%eth1`  
-  `               |        8737AC1|        06YRWB7|b230f62e-7efd-11e3-9773-000af7482980|6c:ae:8b:32:cd:01| lenovo-imm2|       172.30.3.5,fe80::6eae:8bff:fe32:cd01%eth1`  
-  `               |        8737AC1|        06YRWC7|09586005-7efe-11e3-9f03-000af7482df0|6c:ae:8b:32:cd:a5| lenovo-imm2|       172.30.3.2,fe80::6eae:8bff:fe32:cda5%eth1`  
-
-* Manually assign a single node according to serial number:
-  `[root@odin ~]# nodediscover assign -s 06PBX15 -n n12`  
-  `Assigned: n12`  
-
-* Bulk execute discovery based on spreadsheet:
-  `[root@odin ~]# nodediscover assign -i import.csv`  
-  `Defined r2`  
-  `Discovered r2`  
-  `Defined c1`  
-  `Discovered c1`  

confluent_client/doc/man/nodefirmware.ronn

@@ -4,27 +4,10 @@ nodefirmware(8) -- Report firmware information on confluent nodes
 ## SYNOPSIS
 
 `nodefirmware <noderange>`  
-`nodefirmware <noderange> list|<components>|core`  
-`nodefirmware <noderange> update [--backup] <filename>`  
 
 ## DESCRIPTION
 
-`nodefirmware` reports and updates various firmware on nodes.  By default it
-will retrieve all firmware, but can be directed to fetch specific firmware by
-calling out the name of the firmware (e.g. uefi or xcc) or request reading only
-core firmware firmware by using the word 'core', which is generally a quicker
-operation.  Different hardwaremanagement.method indicated plugins may have
-different capabilities available.  For example, the 'core' distinction may
-not be relevant to redfish.  Additionally, the Lenovo XCC makes certain
-information available over IPMI that is not otherwise available (for example
-the FPGA version where applicable).
-
-In the update form, it accepts a single file and attempts to update it using
-the out of band facilities.  Firmware updates can end in one of three states:
-
-* `error`: The attempted update encountered an error that prevented successful install.  Nodes experiencing this state will be reported at the end and more detail on the error will be given
-* `pending`:  The firmware update process has completed, but the firmware will not be active until the relevant component next resets.  Generally speaking, for UEFI update the system will need a reboot, and for BMC updates, the `nodebmcreset` command will begin the process to activate the firmware.
-* `complete`:  The firmware update process has completed and activation has proceeded.  Note that while the activation process has commenced, the component may still be in the process of rebooting when nodefirmware exits.
+`nodefirmware` reports various pieces of firmware on confluent nodes.
 
 ## EXAMPLES
 

confluent_client/doc/man/nodegroupattrib.ronn

@@ -7,7 +7,6 @@ nodegroupattrib(8) -- List or change confluent nodegroup attributes
 `nodegroupattrib <group> [<nodeattribute>...]`  
 `nodegroupattrib <group> [<nodeattribute1=value1> <nodeattribute2=value2> ...]`  
 `nodegroupattrib <group> [-c] [<nodeattribute1> <nodeattribute2=value2> ...]`  
-`nodeattrib -p <noderange> <nodeattribute1> <nodeattribute2> ...`  
 
 ## DESCRIPTION
 
@@ -41,5 +40,3 @@ the attributes are set on the node versus a group to which a node belongs.
 ## SEE ALSO
 
 nodeattrib(8), nodeattribexpressions(5)
-
-## ATTRIBUTES

confluent_client/doc/man/nodegroupdefine.ronn

@@ -1,24 +0,0 @@
-nodegroupdefine(8) -- Define new confluent node group
-===================================================================
-
-## SYNOPSIS
-
-`nodegroupdefine <groupname> [nodeattribute1=value1> <nodeattribute2=value2> ...]`  
-
-## DESCRIPTION
-
-`nodegroupdefine` allows the definition of a new nodegroup for the confluent management
-service.  It may only define a single group name at a time.
-It has the same syntax as `nodegroupattrib(8)`, and the commands differ in
-that `nodegroupattrib(8)` will error if a node group does not exist.
-
-## EXAMPLES
-
-* Create a group called `compute`:
-    `# nodegroupdefine compute`  
-    `compute: created`  
-
-
-## SEE ALSO
-
-nodeattribexpressions(8), nodegroupattrib(8), nodegroupremove(8)

confluent_client/doc/man/nodegrouplist.ronn

@@ -1,14 +0,0 @@
-nodegrouplist(8) -- List the defined confluent nodegroups
-===================================================================
-
-## SYNOPSIS
-
-`nodegrouplist`  
-
-## DESCRIPTION
-
-`nodegrouplist` lists the currently defined groups in confluent.
-
-## SEE ALSO
-
-nodeattrib(8), nodeattribexpressions(5), nodegroupattrib(8)

confluent_client/doc/man/nodegroupremove.ronn

@@ -1,18 +0,0 @@
-nodegroupremove(8) -- Remove a nodegroup from the confluent database
-====================================================================
-
-## SYNOPSIS
-
-`nodegroupremove <noderange>`  
-
-## DESCRIPTION
-
-`nodegroupremove` simply removes the given single nodegroup from the confluent database.
-
-
-## EXAMPLES
-
-* Remove group called testgroup
-    `# nodegroupremove testgroup`  
-    `testgroup: deleted`  
-

confluent_client/doc/man/nodeidentify.ronn

@@ -3,7 +3,7 @@ nodeidentify(8) -- Control the identify LED of confluent nodes
 
 ## SYNOPSIS
 
-`nodidentify <noderange> [on|off|blink]`  
+`nodidentify <noderange> [on|off]`  
 
 ## DESCRIPTION
 
@@ -13,7 +13,6 @@ options are supported:
 
 * `on`: Turn on the identify LED
 * `off`: Turn off the identify LED
-* `blink`: Set the identify LED to blink (when supported by the system)
 
 ## EXAMPLES:
 

confluent_client/doc/man/nodeinventory.ronn

@@ -3,15 +3,13 @@ nodeinventory(8) -- Get hardware inventory of confluent node
 
 ## SYNOPSIS
 
-`nodeinventory <noderange> [serial|model|uuid|mac]`
+`nodeinventory <noderange>`  
 
 ## DESCRIPTION
 
 `nodeinventory` pulls information about hardware of a node.  This includes 
 information such as adapters, serial numbers, processors, and memory modules,
-as supported by the platforms hardware management implementation.  It accepts
-arguments such as serial or model or others as listed above to filter
-output to specific data.
+as supported by the platforms hardware management implementation.
 
 ## EXAMPLES
 
@@ -106,16 +104,3 @@ output to specific data.
   `r1: Broadcom NetXtreme Gigabit Ethernet Controller MAC Address 4: 40:f2:e9:af:45:a3`   
   `r1: Broadcom NetXtreme Gigabit Ethernet Controller PCI slot: 1b:00`   
   `r1: Broadcom NetXtreme Gigabit Ethernet Controller location: Onboard`   
-
-* Reporting just the mac addresses of a node named r2:
-  `# nodeinventory r2 mac`
-  `r2: System MAC Address 1: 40:f2:e9:b9:10:18`
-  `r2: System MAC Address 2: 40:f2:e9:b9:10:19`
-  `r2: System MAC Address 3: 40:f2:e9:b9:10:1a`
-  `r2: System MAC Address 4: 40:f2:e9:b9:10:1b`
-
-* Getting the model number and serial number of a node named s2:
-  `# nodeinventory stark2 serial model`
-  `s2: System Product name: LENOVO THINKSYSTEM SD530 SERVER`
-  `s2: System Serial Number: DEV0000002`
-  `s2: System Model: 7X2104Z028`

confluent_client/doc/man/nodelicense.ronn

@@ -1,17 +0,0 @@
-nodelicense(8) -- Manage license keys on BMC
-=================================================================
-
-## SYNOPSIS
-
-`nodelicense <noderange> [list|install <filename>|delete <license>|save <directory>]`
-
-## DESCRIPTION
-
-`nodelicense` manages license keys on supported BMCs. Without an argument, the command
-lists currently installed license.  Using `delete` will remove the specified license name
-from th eBMC.  The `save` subcommand will take the passed directory (which may be in the form
-of /path/to/{node}/ to have the node name substituted for each node) and back up installed licenses
-to that directory. The `install` command will take the specified filename and install.  The filename
-argument may be of the form  xcc_fod_0034_7X21{id.serial}.key to have the serial number substituted
-to allow unique licenses to be specified in a single command.
-

confluent_client/doc/man/nodelist.ronn

@@ -17,9 +17,6 @@ displayed.  If `-b` is specified, it will also display information on
 how inherited and expression based attributes are defined.  There is more
 information on node attributes in nodeattributes(5) man page.
 
-Attributes may be specified by wildcard, for example `net.*switch` will report
-all attributes that begin with `net.` and end with `switch`.
-
 ## OPTIONS
 
 * `-b`, `--blame`:

confluent_client/doc/man/nodemedia.ronn

@@ -1,57 +0,0 @@
-nodemedia(8) -- Manage server remote media
-=========================================================
-
-## SYNOPSIS
-
-`nodemedia <noderange> [attach|detachall|list|upload] [options] <media>`
-
-## DESCRIPTION
-
-**nodemedia** manages the remote media functionality of supported BMCs.
-
-`list` shows all the current remote media the BMCs of the noderange are
-providing to the host platform.  The string (insecure) is appended to URLs that
-are mounted in an insecure fashion.  http is insecure, and https is also
-insecure when no meaningful certificate validation is performed.  Currently
-there is no action that can change this, and this is purely informational.  A
-future version of software may provide a means to increase security of attached
-remote media.  If no media is mounted, this will provide no output, error
-conditions will result in output to standard error.
-
-`detachall` removes all the currently provided media to the host.  This unlinks
-remote media from urls and deletes uploaded media from the BMC.
-
-`upload` takes the given media image and uploads it to the BMC.  This causes
-the remote media to reside internally to the system without having to go
-to the network after the upload.  This is more constrained, for example the
-Lenovo xClarity Controller has a limit of 50 megabytes, but it has zero ongoing
-load on the media source.
-
-`attach` takes a URL to a remote media as an argument, and has the given
-BMCs map a virtual USB device to that url.  Content is loaded on demand, and
-as such that URL is referenced potentially once for every IO operation that
-the host platform attempts.
-
-## OPTIONS
-
-* `-c`:
-  Specify the maximum number of instances to run concurrently.
-
-## EXAMPLES
-* Listing currently mounted media:
-  `# nodemedia s1-s4 list`  
-  `s1: boot.img`  
-  `s2: boot.img`  
-  `s4: boot.img`  
-
-* Uploading a small boot image to the BMC:
-  `# nodemedia s1-s4 upload boot.img`  
-  `s1:complete: 100%     s2:complete: 100%     s3:complete: 100%     s4:complete: 100%`  
-  `s1: boot.img`  
-  `s4: boot.img`  
-  `s2: boot.img`  
-
-* Attaching a larger ISO for on-demand access:
-  `# nodemedia s1,s4 attach http://172.30.0.6/install/rhel74.iso`  
-  `s4: http://172.30.0.6/install/rhel74.iso (insecure)`  
-  `s1: http://172.30.0.6/install/rhel74.iso (insecure)`

confluent_client/doc/man/nodepower.ronn

@@ -4,7 +4,7 @@ nodepower(8) -- Check or change power state of confluent nodes
 ## SYNOPSIS
 
 `nodepower <noderange>`  
-`nodepower <noderange> [-p] [on|off|boot|shutdown|reset|status]`
+`nodepower <noderange> [on|off|boot|shutdown|reset|status]`
 
 ## DESCRIPTION
 
@@ -26,11 +26,6 @@ respond.
 off will not react to this request.
 * `status`:  Behave identically to having no argument passed at all.
 
-## OPTIONS
-
-* `-p`, '--showprevious':
-   Show previous power state for all directives that may change power state.
-
 ## EXAMPLES
 * Get power state of nodes n1 through n4:
   `# nodepower n1-n4`  

confluent_client/doc/man/noderange.ronn

@@ -1,60 +0,0 @@
-noderange(5) -- Indicate a target set of nodes in confluent
-=========================================================
-
-## SYNOPSIS
-
-`<noderange>`  
-
-## DESCRIPTION
-
-<noderange> is a syntax that can be used in most Confluent commands to conveniently specify a list of nodes. The result is that the command will be applied to a range of nodes, often in parallel.
-
-## EXAMPLES:
-
-The simplest noderange is a single node name:
-`n1`
-
-Nodes and groups may be used interchangeably. The following may be used in any context where n1 would be accepted as a noderange:
-`rack1`
-
-Commonly, there is a desire to target a range of elements. There are a few identically behaving syntaxes for the purpose.
-`n1:n20`
-`n1-n20`
-`n[1-20]`
-
-Note that numbers may be zero padded or not, it will automatically detect the padding amount and adjust members of the range accordingly. Ranges also can understand multiple numeric values changing:
-`r[1-3]u[01-10]`
-`r1u01-r3u10`
-
-Ranges can also be applied to group names, and all above syntaxes are compatible:
-`rack1-rack10`
-`rack[1-10]`
-
-Also, regular expressions may be used to indicate nodes with names matching certain patterns:
-`~r1u..`
-
-The other major noderange primitive is indicating nodes by some attribute value:
-`location.rack=7`
-
-The attribute name may use a wildcard:
-`net.*switch=switch1`
-
-Commas can be used to indicate multiple nodes, and can mix and match any of the above primitives. The following can be a valid single noderange, combining any and all members of each comma separated component
-`n1,n2,rack1,storage,location.rack=9,~s1..,n20-n30`
-
-Exclusions can be done by prepending a '-' before a portion of a noderange:
-`rack1,-n2`
-`compute,-rack1`
-`compute,-location.row=12`
-
-To indicate nodes that match multiple selections at once (set intersection), the @ symbol may be used:
-`compute@rack1`
-`location.rack=10@compute`
-
-For complex expressions, () may be used to indicate order of expanding the noderange to be explicit
-`rack1,-(console.logging=full@compute)`
-
-Noderange syntax can also indicate 'pagination', or separating the nodes into well defined chunks. > is used to indicate how many nodes to display at a time, and < is used to indicate how many nodes to skip into a noderange:
-`rack1>3<6`
-
-The above would show the seventh through ninth nodes of the rack1 group. Like all other noderange operations, this may be combined with any of the above, but must appear as the very last operation. Ordering is done with a natural sort.

confluent_client/doc/man/noderemove.ronn

@@ -1,25 +0,0 @@
-noderemove(8) -- Remove nodes from the confluent management service
-===================================================================
-
-## SYNOPSIS
-
-`noderemove <noderange>`  
-
-## DESCRIPTION
-
-`noderemove` simply removes the given noderange from the confluent database.
-
-
-## EXAMPLES
-
-* Remove two racks each with 4 nodes:
-    `# noderemove r1u1-r2u4`  
-    `r1u4: deleted`  
-    `r1u1: deleted`  
-    `r1u2: deleted`  
-    `r1u3: deleted`  
-    `r2u4: deleted`  
-    `r2u3: deleted`  
-    `r2u2: deleted`  
-    `r2u1: deleted`  
-

confluent_client/doc/man/nodereseat.ronn

@@ -1,19 +0,0 @@
-nodereseat(8) -- Request a reseat of a node
-============================================
-
-## SYNOPSIS
-
-`nodereseat <noderange>`  
-
-## DESCRIPTION
-
-`nodereseat` requests the enclosure manager of the current node to reseat that
-node's slot.  This should be equivalent to removing the system entirely from
-the chassis and putting it back in, but without actually having to do so.
-
-## EXAMPLES
-
-* Reseating the node `s1`:
-    `# nodereseat s1`  
-    `s1: Reseat successful`  
-

confluent_client/doc/man/nodersync.ronn

@@ -1,21 +0,0 @@
-nodersync(8) -- Run rsync in parallel against a noderange
-=========================================================================
-
-## SYNOPSIS
-
-`nodersync <file/directorylist> <noderange>:<destination>`  
-
-## DESCRIPTION
-
-Supervises execution of rsync to push files or a directory tree to the specified
-noderange. This will present progress as percentage for all nodes.
-
-## OPTIONS
-
-* `-m`:
-  Specify maximum number of nodes for noderange max.
-
-* `-c`:
-  Specify how many rsync executions to do concurrently.  If noderange
-  exceeds the count, then excess nodes will wait until one of the
-  active count completes.

confluent_client/doc/man/noderun.ronn

@@ -48,10 +48,6 @@ themselves, see nodeshell(8).
   `n4:  01 10 00`  
   `n2:  01 10 00`  
 
-
-* If wanting to use literal {} in the command, they must be escaped by doubling:
-  `# noderun n1-n4 "echo {node} | awk '{{print $1}}'"`
-
 ## SEE ALSO
 
 nodeshell(8)

confluent_client/doc/man/nodesetboot.ronn

@@ -4,7 +4,7 @@ nodesetboot(8) -- Check or set next boot device for noderange
 ## SYNOPSIS
 
 `nodesetboot <noderange>`  
-`nodesetboot [options] <noderange> [default|cd|network|setup|hd]`
+`nodesetboot [options] <noderang> [default|cd|network|setup|hd]`
 
 ## DESCRIPTION
 
@@ -30,10 +30,7 @@ control.
 * `-p`, `--persist`:
   For a system that supports it, mark the boot override to persist rather than
   be a one time change.  Many systems do not support this functionality.
-
-* `-u`, `--uefi`:
-  This flag does nothing, it is for command compatibility with xCAT's rsetboot
-
+  
 * `default`:
   Request a normal default boot with no particular device override
 

confluent_client/doc/man/nodeshell.ronn

@@ -3,19 +3,13 @@ nodeshell(8) -- Execute command on many nodes in a noderange through ssh
 
 ## SYNOPSIS
 
-`nodeshell <noderange> [options] <command to execute on each node>`
+`nodeshell <noderange> <command to execute on each node>`
 
 ## DESCRIPTION
 
 Allows execution of a command on many nodes in parallel.  Like noderun(8), it
 accepts and interpolates confluent attribute expressions as documented in 
-nodeattribexpressions(5).  `nodeshell` provides stdout as stdout and stderr
-as stderr, unlike psh which combines all stdout and stderr into stdout.
-
-## OPTIONS
-
-* `-c`:
-  Specify the maximum number of instances to run concurrently.
+nodeattribexpressions(5).
 
 ## EXAMPLES
 
@@ -27,10 +21,7 @@ as stderr, unlike psh which combines all stdout and stderr into stdout.
   `n4: hi`  
 
 * Setting a new static ip address temporarily on secondary interface of four nodes:
-  `# nodeshell n1-n4 ifconfig eth1 172.30.93.{n1}`
-
-* If wanting to use literal {} in the command, they must be escaped by doubling:
-  `# nodeshell n1-n4 "ps | awk '{{print $1}}'"`
+  `# nodeshell n1-n4 ifconfig eth1 172.30.93.{n1}`  
   
 ## SEE ALSO
 

confluent_client/doc/man/nodestorage.ronn

@@ -1,65 +0,0 @@
-nodestorage(8) -- Examine/Modify storage configuration of a node
-============================================
-
-## SYNOPSIS
-
-`nodestorage <noderange> [show|create|delete] [options]`  
-
-## DESCRIPTION
-
-`nodestorage` provides access to the remote storage configuration of
-the noderange.
-
-## OPTIONS
-* `-r` **RAIDLEVEL**, `--raidlevel`=**RAIDLEVEL**:
-  RAID level to use when creating an array
-
-* `-d` **DISKS**, `--disks`=**DISKS**:
-   Comma separated list of disks to use, or the word "rest" to
-   indicate use of all available disks
-
-* `-s` **SIZE**, `--size`=**SIZE**:
-  Comma separated list of sizes to use when creating
-  volumes.  The sizes may be absolute size (e.g. 16gb),
-  percentage (10%) or the word "rest" to use remaining
-  capacity, default behavior is to use all capacity to
-  make a volume
-* `-n` **NAME**, `--name`=**NAME**:
-  Comma separated list of names to use when naming
-  volumes, or selecting a volume for delete.  Default
-  behavior is to use implementation provided default
-
-## EXAMPLES
-
-* Deleting the volume `somedata`:
-    `$ nodestorage d5 delete somedata`  
-    `Deleted: somedata`  
-
-* Creating a raid5 of 4 disks and a volume named `somedata`:
-    `$ nodestorage d5 create -r 5 -d drive0,drive_1,drive_2,drive_3 -n somedata`  
-    `d5: Volume somedata: Size: 1.905 TB`  
-    `d5: Volume somedata: State: Optimal`  
-    `d5: Volume somedata: Array 1-2`  
-
-* Showing current storage configuration of `d3`:
-    `$ nodestorage d3`  
-    `d3: Disk m.2-0 Description: 128GB M.2 SATA SSD`  
-    `d3: Disk m.2-0 State: online`  
-    `d3: Disk m.2-0 FRU: 00LF428`  
-    `d3: Disk m.2-0 Serial Number: H6B80054`  
-    `d3: Disk m.2-0 Array: 0-0`  
-    `d3: Disk m.2-1 Description: 128GB M.2 SATA SSD`  
-    `d3: Disk m.2-1 State: online`  
-    `d3: Disk m.2-1 FRU: 00LF428`  
-    `d3: Disk m.2-1 Serial Number: H6B80059`  
-    `d3: Disk m.2-1 Array: 0-0`  
-    `d3: Array 0-0 Available Capacity: 0.000 MB`  
-    `d3: Array 0-0 Total Capacity: 131.072 GB`  
-    `d3: Array 0-0 RAID: RAID 1`  
-    `d3: Array 0-0 Disks: m.2-0,m.2-1`  
-    `d3: Array 0-0 Volumes: new_vd`  
-    `d3: Volume new_vd: Size: 122.040 GB`  
-    `d3: Volume new_vd: State: Optimal`  
-    `d3: Volume new_vd: Array 0-0`  
-
-

confluent_client/doc/man/nodesupport.ronn

@@ -1,32 +0,0 @@
-nodesupport(8) -- Utilities for interacting with vendor support
-=================================================================
-
-## SYNOPSIS
-
-`nodesupport <noderange> servicedata <directory or filename>`  
-
-## DESCRIPTION
-
-`nodesupport` provides capabilities associated with interacting with support.
-Currently it only has the `servicedata` subcommand.  `servicedata` takes
-an argument that is either a directory name (that can be used for a single node
-or multiple nodes) or a file name (only to be used with single node noderange).
-Note that the file will be downloaded to the confluent server that actually
-connects to the managed system, so it will download to the remote system if running
-remotely and will download to the collective.manager indicated system if
-running in collective mode.
-
-Note that due to vendor filename requirements, any filename may have vendor
-specific suffixes added to any file produced.
-
-## EXAMPLES
-
-* Download support data from a single node to a specific filename  
-`# nodesupport d1 servicedata svcdata.out`  
-`d1:initializing:  15%`  
-
-* Download support data from multiple nodes to a directory  
-`# nodesupport d1-d4 servicedata service/`    
-`d1:initializing:   0% d2:initializing:   0% d3:initializing:   0% d4:initializing:   0%`  
-`# ls service/`  
-`d1.svcdata d2.svcdata  d3.svcdata  d4.svcdata`  

confluent_client/makeman

@@ -1,12 +1,8 @@
 #!/bin/sh
-cd `dirname $0`
-python3 addattribs.py || python2 addattribs.py
 cd `dirname $0`/doc/man
-mkdir -p ../../man/man1
 mkdir -p ../../man/man5
 mkdir -p ../../man/man8
 ronn -r *.ronn
-mv *.1 ../../man/man1/
 mv *.5 ../../man/man5/
 mv *.8 ../../man/man8/
 

confluent_client/samples/nodeattrib_from_switch.py

@@ -1,35 +0,0 @@
-#!/usr/bin/python2
-
-# This is a sample python script for going through all observed mac addresses
-# and assuming they are BMC related and printing nodeattrib commands
-# for each node to access the bmc using the interface specified on the command
-# line
-
-# Not necessarily as useful if there may be mistakes in the
-# net.switch/net.switchport attributes, but a handy utility in a pinch when
-# you really know
-
-
-import confluent.client as cl
-import socket
-import struct
-c = cl.Command()
-macs = []
-interface = sys.argv[1]
-for mac in c.read('/networking/macs/by-mac/'):
-    macs.append(mac['item']['href'])
-for mac in macs:
-    macinfo = list(c.read('/networking/macs/by-mac/{0}'.format(mac)))[0]
-    if 'possiblenode' in macinfo and macinfo['possiblenode']:
-        if macinfo['macsonport'] > 1:
-            print('#Ambiguous set of macs on port for ' + macinfo[
-                'possiblenode'])
-        prefix = int(mac.replace('-', '')[:6], 16) ^ 0b100000000000000000
-        prefix = prefix << 8
-        prefix |= 0xff
-        suffix = int(mac.replace('-', '')[6:], 16)
-        suffix |= 0xfe000000
-        rawn = struct.pack('!QLL', 0xfe80000000000000, prefix, suffix)
-        bmc = socket.inet_ntop(socket.AF_INET6, rawn)
-        print('nodeattrib {0} bmc={1}%{2}'.format(macinfo['possiblenode'],
-                                                  bmc, interface))

confluent_client/setup.py.tmpl

@@ -4,7 +4,6 @@ import os
 data_files = [('/etc/profile.d', ['confluent_env.sh', 'confluent_env.csh'])]
 try:
     scriptlist = ['bin/{0}'.format(d) for d in os.listdir('bin/')]
-    data_files.append(('/opt/confluent/share/man/man1', ['man/man1/' + x for x in os.listdir('man/man1')]))
     data_files.append(('/opt/confluent/share/man/man5', ['man/man5/' + x for x in os.listdir('man/man5')]))
     data_files.append(('/opt/confluent/share/man/man8', ['man/man8/' + x for x in os.listdir('man/man8')]))
 except OSError:

confluent_common/confluent_common.spec.tmpl

@@ -22,10 +22,10 @@ This provides the modules common for both client and server
 %setup -n %{name}-%{version} -n %{name}-%{version}
 
 %build
-python2 setup.py build
+python setup.py build
 
 %install
-python2 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-purelib=/opt/confluent/lib/python --install-scripts=/opt/confluent/bin
+python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-purelib=/opt/confluent/lib/python --install-scripts=/opt/confluent/bin
 
 %clean
 rm -rf $RPM_BUILD_ROOT

confluent_common/setup.cfg

@@ -0,0 +1,17 @@
+[metadata]
+name = confluent_common
+summary = Confluent Common Libraries
+description-file =
+    README.txt
+author = Jarrod Johnson
+author-email = jjohnson2@lenovo.com
+home-page = http://xcat.sf.net/
+classifier =
+    Intended Audience :: Information Technology
+    Intended Audience :: System Administrators
+    License :: OSI Approved :: Apache Software License
+    Operating System :: POSIX :: Linux
+    Programming Language :: Python :: 2.6
+    Programming Language :: Python :: 2.7
+
+[files]

confluent_server/MANIFEST.in

@@ -1,4 +1,2 @@
-include pam/*
 include sysvinit/*
 include systemd/*
-include sysctl/*

confluent_server/bin/collective

@@ -1,149 +0,0 @@
-#!/usr/bin/python2
-
-import argparse
-import errno
-import os
-import pwd
-import socket
-import subprocess
-import sys
-
-path = os.path.dirname(os.path.realpath(__file__))
-path = os.path.realpath(os.path.join(path, '..', 'lib', 'python'))
-if path.startswith('/opt'):
-    # if installed into system path, do not muck with things
-    sys.path.append(path)
-
-import confluent.client as client
-import confluent.tlvdata as tlvdata
-
-try:
-    input = raw_input
-except NameError:
-    pass
-
-def make_certificate():
-    umask = os.umask(0o77)
-    try:
-        os.makedirs('/etc/confluent/cfg')
-    except OSError as e:
-        if e.errno == errno.EEXIST and os.path.isdir('/etc/confluent/cfg'):
-            pass
-        else:
-            raise
-    if subprocess.check_call(
-            'openssl ecparam -name secp384r1 -genkey -out '
-            '/etc/confluent/privkey.pem'.split(' ')):
-        raise Exception('Error generating private key')
-
-    if subprocess.check_call('openssl req -new -x509 -key '
-                              '/etc/confluent/privkey.pem -days 7300 -out '
-                              '/etc/confluent/srvcert.pem -subj /CN='
-                              '{0}'.format(socket.gethostname()).split(' ')):
-        raise Exception('Error generating certificate')
-    try:
-        uid = pwd.getpwnam('confluent').pw_uid
-        os.chown('/etc/confluent/privkey.pem', uid, -1)
-        os.chown('/etc/confluent/srvcert.pem', uid, -1)
-    except KeyError:
-        pass
-    print('Certificate generated successfully')
-    os.umask(umask)
-
-
-def show_invitation(name):
-    if not os.path.exists('/etc/confluent/srvcert.pem'):
-        make_certificate()
-    s = client.Command().connection
-    tlvdata.send(s, {'collective': {'operation': 'invite', 'name': name}})
-    invite = tlvdata.recv(s)['collective']
-    if 'error' in invite:
-        sys.stderr.write(invite['error'] + '\n')
-        return
-    print('{0}'.format(invite['invitation']))
-
-
-def join_collective(server, invitation):
-    if not os.path.exists('/etc/confluent/srvcert.pem'):
-        make_certificate()
-    s = client.Command().connection
-    while not invitation:
-        invitation = input('Paste the invitation here: ')
-    tlvdata.send(s, {'collective': {'operation': 'join',
-                                    'invitation': invitation,
-                                    'server': server}})
-    res = tlvdata.recv(s)
-    res = res.get('collective',
-                  {'status': 'Unknown response: ' + repr(res)})
-    print(res.get('status', res.get('error', repr(res))))
-    if 'error' in res:
-        sys.exit(1)
-
-def delete_member(name):
-    s = client.Command().connection
-    tlvdata.send(s, {'collective': {'operation': 'delete',
-                                    'member': name}})
-    res = tlvdata.recv(s)
-    res = res.get('collective',
-                  {'status': 'Unknown response: ' + repr(res)})
-    print(res.get('status', res.get('error', repr(res))))
-    if 'error' in res:
-        sys.exit(1)
-
-
-def show_collective():
-    s = client.Command().connection
-    tlvdata.send(s, {'collective': {'operation': 'show'}})
-    res = tlvdata.recv(s)
-    if 'error' in res:
-        print(res['error'])
-        return
-    if 'error' in res['collective']:
-        print(res['collective']['error'])
-        return
-    if 'quorum' in res['collective']:
-        print('Quorum: {0}'.format(res['collective']['quorum']))
-    print('Leader: {0}'.format(res['collective']['leader']))
-    if 'active' in res['collective']:
-        if res['collective']['active']:
-            print('Active collective members:')
-            for member in res['collective']['active']:
-                print('    {0}'.format(member))
-        if res['collective']['offline']:
-            print('Offline collective members:')
-            for member in res['collective']['offline']:
-                print('    {0}'.format(member))
-    else:
-        print('Run collective show on leader for more data')
-
-def main():
-    a = argparse.ArgumentParser(description='Confluent server utility')
-    sp = a.add_subparsers(dest='command')
-    gc = sp.add_parser('gencert', help='Generate Confluent Certificates for '
-                                'collective mode and remote CLI access')
-    sl = sp.add_parser('show', help='Show information about the collective')
-    ic = sp.add_parser('invite', help='Generate a invitation to allow a new '
-                                    'confluent instance to join as a '
-                                    'collective member.  Run collective invite -h for more information')
-    ic.add_argument('name', help='Name of server to invite to join the '
-                                 'collective')
-    dc = sp.add_parser('delete', help='Delete a member of a collective')
-    dc.add_argument('name', help='Name of server to delete from collective')
-    jc = sp.add_parser('join', help='Join a collective.  Run collective join -h for more information')
-    jc.add_argument('server', help='Existing collective member that ran invite and generated a token')
-    jc.add_argument('-i', help='Invitation provided by runniing invite on an '
-                               'existing collective member')
-    cmdset = a.parse_args()
-    if cmdset.command == 'gencert':
-        make_certificate()
-    elif cmdset.command == 'invite':
-        show_invitation(cmdset.name)
-    elif cmdset.command == 'join':
-        join_collective(cmdset.server, cmdset.i)
-    elif cmdset.command == 'show':
-        show_collective()
-    elif cmdset.command == 'delete':
-        delete_member(cmdset.name)
-
-if __name__ == '__main__':
-    main()

confluent_server/bin/confluent

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2014 IBM Corporation
@@ -32,7 +32,7 @@ import confluent.main
 import multiprocessing
 if __name__ == '__main__':
     multiprocessing.freeze_support()
-    confluent.main.run(sys.argv)
+    confluent.main.run()
 #except:
 #   pass
 #p.disable()

confluent_server/bin/confluentcertutil.py

@@ -1,55 +0,0 @@
-from os.path import exists
-import shutil
-import socket
-import subprocess
-import tempfile
-
-def get_openssl_conf_location():
-    if exists('/etc/pki/tls/openssl.cnf'):
-        return '/etc/pki/tls/openssl.cnf'
-    elif exists('/etc/ssl/openssl.cnf'):
-        return '/etc/ssl/openssl.cnf'
-    else:
-        raise Exception("Cannot find openssl config file")
-
-def get_ip_addresses():
-    lines = subprocess.check_output('ip addr'.split(' '))
-    for line in lines.split('\n'):
-        if line.startswith('    inet6 '):
-            line = line.replace('    inet6 ', '').split('/')[0]
-            if line.startswith('fe80::'):
-                continue
-            if line == '::1':
-                continue
-        elif line.startswith('    inet '):
-            line = line.replace('    inet ', '').split('/')[0]
-            if line == '127.0.0.1':
-                continue
-            if line.startswith('169.254.'):
-                continue
-        else:
-            continue
-        yield line
-
-def create_certificate():
-    shortname = socket.gethostname().split('.')[0]
-    longname = socket.getfqdn()
-    subprocess.check_call(
-        'openssl ecparam -name secp384r1 -genkey -out privkey.pem'.split(' '))
-    san = ['IP:{0}'.format(x) for x in get_ip_addresses()]
-    san.append('DNS:{0}'.format(shortname))
-    san.append('DNS:{0}'.format(longname))
-    san = ','.join(san)
-    sslcfg = get_openssl_conf_location()
-    tmpconfig = tempfile.mktemp()
-    shutil.copy2(sslcfg, tmpconfig)
-    with open(tmpconfig, 'a') as cfgfile:
-        cfgfile.write('\n[SAN]\nsubjectAltName={0}'.format(san))
-    subprocess.check_call(
-        'openssl req -new -x509 -key privkey.pem -days 7300 -out cert.pem '
-        '-subj /CN={0} -extensions SAN '
-        '-config {1}'.format(longname, tmpconfig).split(' ')
-    )
-
-if __name__ == '__main__':
-    create_certificate()

confluent_server/bin/confluentdbutil

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -16,7 +16,6 @@
 # limitations under the License.
 
 
-import getpass
 import optparse
 import sys
 import os
@@ -33,8 +32,6 @@ argparser = optparse.OptionParser(
     usage="Usage: %prog [options] [dump|restore] [path]")
 argparser.add_option('-p', '--password',
                      help='Password to use to protect/unlock a protected dump')
-argparser.add_option('-i', '--interactivepassword', help='Prompt for password',
-                     action='store_true')
 argparser.add_option('-r', '--redact', action='store_true',
                      help='Redact potentially sensitive data rather than store')
 argparser.add_option('-u', '--unprotected', action='store_true',
@@ -42,14 +39,6 @@ argparser.add_option('-u', '--unprotected', action='store_true',
                            ' the key information.  Fields will be encrypted, '
                            'but keys.json will contain unencrypted decryption'
                            ' keys that may be used to read the dump')
-argparser.add_option('-s', '--skipkeys', action='store_true',
-                      help='This specifies to dump the encrypted data without '
-                           'dumping the keys needed to decrypt it.  This is '
-                           'suitable for an automated incremental backup, '
-                           'where an earlier password protected dump has a '
-                           'protected keys.json file, and only the protected '
-                           'data is needed.  keys do not change and as such '
-                           'they do not require incremental backup')
 (options, args) = argparser.parse_args()
 if len(args) != 2 or args[0] not in ('dump', 'restore'):
     argparser.print_help()
@@ -62,32 +51,17 @@ if args[0] == 'restore':
     if pid is not None:
         print("Confluent is running, must shut down to restore db")
         sys.exit(1)
-    try:
-        cfm.restore_db_from_directory(dumpdir, options.password)
-    except Exception as e:
-        print(str(e))
-        sys.exit(1)
+    cfm.restore_db_from_directory(dumpdir, options.password)
 elif args[0] == 'dump':
-    password = options.password
-    if not password and options.interactivepassword:
-        passcfm = None
-        while passcfm is None or password != passcfm:
-            password = getpass.getpass(
-                'Enter password to protect the backup: ')
-            passcfm = getpass.getpass('Confirm password to protect the backup: ')
-    if password is None and not (options.unprotected or options.redact
-                                         or options.skipkeys):
+    if options.password is None and not (options.unprotected or options.redact):
         print("Must indicate a password to protect or -u to opt opt of "
-              "secure value protection or -r to redact sensitive information, "
-              "or -s to do encrypted backup that requires keys.json from "
-              "another backup to restore.")
+              "secure value protection or -r to skip all protected data")
         sys.exit(1)
-    os.umask(0o77)
+    os.umask(077)
     main._initsecurity(conf.get_config())
     if not os.path.exists(dumpdir):
         os.makedirs(dumpdir)
-    cfm.dump_db_to_directory(dumpdir, options.password, options.redact,
-                             options.skipkeys)
+    cfm.dump_db_to_directory(dumpdir, options.password, options.redact)
 
 
 

confluent_server/bin/confluentsrv.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2014 IBM Corporation

confluent_server/bin/createcert.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-umask 0077
-openssl ecparam -name secp384r1 -genkey -out /etc/confluent/privkey.pem
-openssl req -new -x509 -key /etc/confluent/privkey.pem -days 760 -out /etc/confluent/srvcert.pem -subj /CN=$(hostname)

confluent_server/builddeb

@@ -1,68 +0,0 @@
-#!/bin/bash
-cd `dirname $0`
-PKGNAME=$(basename $(pwd))
-DPKGNAME=$(basename $(pwd) | sed -e s/_/-/)
-OPKGNAME=$(basename $(pwd) | sed -e s/_/-/)
-PYEXEC=python3
-DSCARGS="--with-python3=True --with-python2=False"
-if grep wheezy /etc/os-release; then
-    DPKGNAME=python-$DPKGNAME
-    PYEXEC=python
-    DSCARGS=""
-fi
-cd ..
-mkdir -p /tmp/confluent # $DPKGNAME
-cp -a * .git /tmp/confluent # $DPKGNAME
-cd /tmp/confluent/$PKGNAME
-if [ -x ./makeman ]; then
-    ./makeman
-fi
-./makesetup
-VERSION=`cat VERSION`
-cat > setup.cfg << EOF
-[install]
-install-purelib=/opt/confluent/lib/python
-install-scripts=/opt/confluent/bin
-
-[sdist_dsc]
-package=$DPKGNAME
-EOF
-
-$PYEXEC setup.py sdist > /dev/null 2>&1
-py2dsc $DSCARGS dist/*.tar.gz
-shopt -s extglob
-cd deb_dist/!(*.orig)/
-if [ "$OPKGNAME" = "confluent-server" ]; then
-    if grep wheezy /etc/os-release; then
-        sed -i 's/^\(Depends:.*\)/\1, python-confluent-client, python-lxml, python-eficompressor, python-pycryptodomex, python-dateutil, python-pyopenssl, python-msgpack/' debian/control
-    else
-        sed -i 's/^\(Depends:.*\)/\1, confluent-client, python3-lxml, python3-eficompressor, python3-pycryptodome, python3-websocket, python3-msgpack/' debian/control
-    fi
-    if grep wheezy /etc/os-release; then
-        echo 'confluent_client python-confluent-client' >> debian/pydist-overrides
-    else
-        echo 'confluent_client confluent-client' >> debian/pydist-overrides
-    fi
-fi
-head -n -1 debian/control > debian/control1
-mv debian/control1 debian/control
-echo 'export PYBUILD_INSTALL_ARGS=--install-lib=/opt/confluent/lib/python' >> debian/rules
-#echo 'Provides: python-'$DPKGNAME >> debian/control
-#echo 'Conflicts: python-'$DPKGNAME >> debian/control
-#echo 'Replaces: python-'$DPKGNAME' (<<2)' >> debian/control
-#echo 'Breaks: python-'$DPKGNAME' (<<2)' >> debian/control
-
-dpkg-buildpackage -rfakeroot -uc  -us -i
-if [ $? -ne 0 ]; then
-    echo "[ERROR] rpmbuild returned non-zero, run: rpmbuild -ba ~/rpmbuild/SPECS/$PKGNAME.spec"
-    exit 1
-else
-    cd -
-    # Clean up the generated files in this directory
-    rm -rf $PKGNAME.egg-info dist setup.py
-    rm -rf $(find deb_dist -mindepth 1 -maxdepth 1 -type d)
-    if [ ! -z "$1" ]; then
-        mv deb_dist/* $1/
-    fi
-fi
-exit 0

confluent_server/buildrpm

@@ -6,7 +6,7 @@ fi
 ./makesetup
 VERSION=`cat VERSION`
 PKGNAME=$(basename $(pwd))
-python3 setup.py sdist > /dev/null 2>&1
+python setup.py sdist > /dev/null 2>&1
 cp dist/*.tar.gz ~/rpmbuild/SOURCES
 sed -e 's/#VERSION#/'$VERSION/ $PKGNAME.spec.tmpl > ~/rpmbuild/SPECS/$PKGNAME.spec
 rpmbuild -ba ~/rpmbuild/SPECS/$PKGNAME.spec 2> /dev/null |grep ^Wrote:

confluent_server/confluent/asynchttp.py

@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2016-2018 Lenovo
+# Copyright 2016 Lenovo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -64,12 +64,12 @@ class AsyncTermRelation(object):
     # Need to keep an association of term object to async
     # This allows the async handler to know the context of
     # outgoing data to provide to calling code
-    def __init__(self, termid, asynchdl):
-        self.asynchdl = asynchdl
+    def __init__(self, termid, async):
+        self.async = async
         self.termid = termid
 
     def got_data(self, data):
-        self.asynchdl.add(self.termid, data)
+        self.async.add(self.termid, data)
 
 
 class AsyncSession(object):
@@ -83,8 +83,6 @@ class AsyncSession(object):
         self.reaper = eventlet.spawn_after(15, self.destroy)
 
     def add(self, requestid, rsp):
-        if self.responses is None:
-            return
         self.responses.append((requestid, rsp))
         if self._evt:
             self._evt.send()
@@ -109,7 +107,6 @@ class AsyncSession(object):
         for console in self.consoles:
             _consolesessions[console]['session'].destroy()
         self.consoles = None
-        self.responses = None
         del _asyncsessions[self.asyncid]
 
     def run_handler(self, handler, requestid):
@@ -169,9 +166,6 @@ def handle_async(env, querydict, threadset):
         currsess = AsyncSession()
         yield messages.AsyncSession(currsess.asyncid)
         return
-    if  querydict['asyncid'] not in _asyncsessions:
-        raise exc.InvalidArgumentException(
-                'Invalid or expired async id')
     mythreadid = greenlet.getcurrent()
     threadset.add(mythreadid)
     loggedout = None

confluent_server/confluent/auth.py

@@ -22,18 +22,12 @@
 import confluent.config.configmanager as configmanager
 import eventlet
 import eventlet.tpool
-import Cryptodome.Protocol.KDF as KDF
-from fnmatch import fnmatch
+import Crypto.Protocol.KDF as KDF
 import hashlib
 import hmac
 import multiprocessing
-import os
-import pwd
-import confluent.userutil as userutil
-import confluent.util as util
-pam = None
 try:
-    import confluent.pam as pam
+    import PAM
 except ImportError:
     pass
 import time
@@ -45,59 +39,35 @@ _passchecking = {}
 authworkers = None
 authcleaner = None
 
-_allowedbyrole = {
-    'Operator': {
-        'retrieve': ['*'],
-        'create': [
-            '/noderange/',
-            '/nodes/',
-            '/node*/media/uploads/',
-            '/node*/inventory/firmware/updates/*',
-            '/node*/suppport/servicedata*',
-            '/node*/attributes/expression',
-            '/nodes/*/console/session*',
-            '/nodes/*/shell/sessions*',
-            '/node*/configuration/*',
-        ],
-        'update': [
-            '/discovery/*',
-            '/networking/macs/rescan',
-            '/node*/power/state',
-            '/node*/power/reseat',
-            '/node*/attributes/*',
-            '/node*/media/*tach',
-            '/node*/boot/nextdevice',
-            '/node*/identify',
-            '/node*/configuration/*',
-        ],
-        'start': [
-            '/nodes/*/console/session*',
-            '/nodes/*/shell/sessions*',
-        ],
-        'delete': [
-            '/discovery/*',
-            '/node*',
-        ],
-    },
-    'Monitor': {
-        'retrieve': [
-            '/node*/health/hardware',
-            '/node*/power/state',
-            '/node*/sensors/*',
-            '/nodes/',
-            '/',
-        ],
-    }
-}
 
-_deniedbyrole = {
-    # This supersedes the above and is only consulted after the allowed has happened
-    'Operator': {
-        'update': [
-            '/node*/configuration/management_controller/users/*',
-        ]
-    }
-}
+class Credentials(object):
+    def __init__(self, username, passphrase):
+        self.username = username
+        self.passphrase = passphrase
+        self.haspam = False
+
+    def pam_conv(self, auth, query_list):
+        # use stored credentials in a pam conversation
+        self.haspam = True
+        resp = []
+        for query_entry in query_list:
+            query, pamtype = query_entry
+            if query.startswith('Password'):
+                resp.append((self.passphrase, 0))
+            else:
+                return None
+        return resp
+
+
+def _prune_passcache():
+    # This function makes sure we don't remember a passphrase in memory more
+    # than 10 seconds
+    while True:
+        curtime = time.time()
+        for passent in _passcache.iterkeys():
+            if passent[2] < curtime - 10:
+                del _passcache[passent]
+        eventlet.sleep(10)
 
 
 def _get_usertenant(name, tenant=False):
@@ -111,13 +81,11 @@ def _get_usertenant(name, tenant=False):
     administrator account a tenant gets.
     Otherwise, just assume a user in the default tenant
     """
-    if not isinstance(name, bytes):
-        name = name.encode('utf-8')
     if not isinstance(tenant, bool):
         # if not boolean, it must be explicit tenant
         user = name
-    elif b'/' in name:  # tenant scoped name
-        tenant, user = name.split(b'/', 1)
+    elif '/' in name:  # tenant scoped name
+        tenant, user = name.split('/', 1)
     elif configmanager.is_tenant(name):
         # the account is the implicit tenant owner account
         user = name
@@ -125,9 +93,6 @@ def _get_usertenant(name, tenant=False):
     else:  # assume it is a non-tenant user account
         user = name
         tenant = None
-    user = util.stringify(user)
-    if tenant:
-        tenant = util.stringify(tenant)
     yield user
     yield tenant
 
@@ -147,37 +112,21 @@ def authorize(name, element, tenant=False, operation='create',
             and the relevant ConfigManager object for the context of the
             request.
     """
-    # skipuserobj is a leftover from the now abandoned plan to use pam session
-    # to do authorization and authentication.  Now confluent always does authorization
-    # even if pam does authentication.
-    if operation not in ('create', 'start', 'update', 'retrieve', 'delete', None):
-        return False
+    if operation not in ('create', 'start', 'update', 'retrieve', 'delete'):
+        return None
     user, tenant = _get_usertenant(name, tenant)
     if tenant is not None and not configmanager.is_tenant(tenant):
-        return False
+        return None
     manager = configmanager.ConfigManager(tenant, username=user)
+    if skipuserobj:
+        return None, manager, user, tenant, skipuserobj
     userobj = manager.get_user(user)
-    if not userobj:
-        for group in userutil.grouplist(user):
-            userobj = manager.get_usergroup(group)
-            if userobj:
-                break
     if userobj:  # returning
-        role = userobj.get('role', 'Administrator')
-        if element and role != 'Administrator':
-            for rule in _allowedbyrole.get(role, {}).get(operation, []):
-                if fnmatch(element, rule):
-                    break
-            else:
-                return False
-            for rule in _deniedbyrole.get(role, {}).get(operation, []):
-                if fnmatch(element, rule):
-                    return False
         return userobj, manager, user, tenant, skipuserobj
-    return False
+    return None
 
 
-def check_user_passphrase(name, passphrase, operation=None, element=None, tenant=False):
+def check_user_passphrase(name, passphrase, element=None, tenant=False):
     """Check a a login name and passphrase for authenticity and authorization
 
     The function combines authentication and authorization into one function.
@@ -208,90 +157,63 @@ def check_user_passphrase(name, passphrase, operation=None, element=None, tenant
         # would normally make an event and wait
         # but here there's no need for that
         eventlet.sleep(0.5)
-    cfm = configmanager.ConfigManager(tenant, username=user)
-    ucfg = cfm.get_user(user)
-    if ucfg is None:
-        try:
-            for group in userutil.grouplist(user):
-                ucfg = cfm.get_usergroup(group)
-                if ucfg:
-                    break
-        except KeyError:
-            pass
-    if ucfg is None:
-        eventlet.sleep(0.05)
-        return None
+    credobj = Credentials(user, passphrase)
+    try:
+        pammy = PAM.pam()
+        pammy.start(_pamservice, user, credobj.pam_conv)
+        pammy.authenticate()
+        pammy.acct_mgmt()
+        del pammy
+        return authorize(user, element, tenant, skipuserobj=False)
+    except NameError:
+        pass
+    except PAM.error:
+        if credobj.haspam:
+            return None
     if (user, tenant) in _passcache:
-        if hashlib.sha256(passphrase).digest() == _passcache[(user, tenant)]:
-            return authorize(user, element, tenant, operation=operation)
+        if passphrase == _passcache[(user, tenant)]:
+            return authorize(user, element, tenant)
         else:
             # In case of someone trying to guess,
             # while someone is legitimately logged in
             # invalidate cache and force the slower check
             del _passcache[(user, tenant)]
-    if 'cryptpass' in ucfg:
-        _passchecking[(user, tenant)] = True
-        # TODO(jbjohnso): WORKERPOOL
-        # PBKDF2 is, by design, cpu intensive
-        # throw it at the worker pool when implemented
-        # maybe a distinct worker pool, wondering about starving out non-auth stuff
-        salt, crypt = ucfg['cryptpass']
-        # execute inside tpool to get greenthreads to give it a special thread
-        # world
-        # TODO(jbjohnso): util function to generically offload a call
-        # such a beast could be passed into pyghmi as a way for pyghmi to
-        # magically get offload of the crypto functions without having
-        # to explicitly get into the eventlet tpool game
-        global authworkers
-        global authcleaner
-        if authworkers is None:
-            authworkers = multiprocessing.Pool(processes=1)
-        else:
-            authcleaner.cancel()
-        authcleaner = eventlet.spawn_after(30, _clean_authworkers)
-        crypted = eventlet.tpool.execute(_do_pbkdf, passphrase, salt)
-        del _passchecking[(user, tenant)]
-        eventlet.sleep(
-            0.05)  # either way, we want to stall so that client can't
+            return None
+    cfm = configmanager.ConfigManager(tenant, username=user)
+    ucfg = cfm.get_user(user)
+    if ucfg is None or 'cryptpass' not in ucfg:
+        eventlet.sleep(0.05)  # stall even on test for existence of a username
+        return None
+    _passchecking[(user, tenant)] = True
+    # TODO(jbjohnso): WORKERPOOL
+    # PBKDF2 is, by design, cpu intensive
+    # throw it at the worker pool when implemented
+    # maybe a distinct worker pool, wondering about starving out non-auth stuff
+    salt, crypt = ucfg['cryptpass']
+    # execute inside tpool to get greenthreads to give it a special thread
+    # world
+    #TODO(jbjohnso): util function to generically offload a call
+    #such a beast could be passed into pyghmi as a way for pyghmi to
+    #magically get offload of the crypto functions without having
+    #to explicitly get into the eventlet tpool game
+    global authworkers
+    global authcleaner
+    if authworkers is None:
+        authworkers = multiprocessing.Pool(processes=1)
+    else:
+        authcleaner.cancel()
+    authcleaner = eventlet.spawn_after(30, _clean_authworkers)
+    crypted = eventlet.tpool.execute(_do_pbkdf, passphrase, salt)
+    del _passchecking[(user, tenant)]
+    eventlet.sleep(0.05)  # either way, we want to stall so that client can't
         # determine failure because there is a delay, valid response will
         # delay as well
-        if crypt == crypted:
-            _passcache[(user, tenant)] = hashlib.sha256(passphrase).digest()
-            return authorize(user, element, tenant, operation)
-    if pam:
-        pwe = None
-        try:
-            pwe = pwd.getpwnam(user)
-        except KeyError:
-            #pam won't work if the user doesn't exist, don't go further
-            eventlet.sleep(0.05)  # stall even on test for existence of a username
-            return None
-        if os.getuid() != 0:
-            # confluent is running with reduced privilege, however, pam_unix refuses
-            # to let a non-0 user check anothers password.
-            # We will fork and the child will assume elevated privilege to
-            # get unix_chkpwd helper to enable checking /etc/shadow
-            pid = os.fork()
-            if not pid:
-                usergood = False
-                try:
-                    # we change to the uid we are trying to authenticate as, because
-                    # pam_unix uses unix_chkpwd which reque
-                    os.setuid(pwe.pw_uid)
-                    usergood = pam.authenticate(user, passphrase, service=_pamservice)
-                finally:
-                    os._exit(0 if usergood else 1)
-            usergood = os.waitpid(pid, 0)[1] == 0
-        else:
-            # We are running as root, we don't need to fork in order to authenticate the
-            # user
-            usergood = pam.authenticate(user, passphrase, service=_pamservice)
-        if usergood:
-            _passcache[(user, tenant)] = hashlib.sha256(passphrase).digest()
-            return authorize(user, element, tenant, operation, skipuserobj=False)
-    eventlet.sleep(0.05)  # stall even on test for existence of a username
+    if crypt == crypted:
+        _passcache[(user, tenant)] = passphrase
+        return authorize(user, element, tenant)
     return None
 
+
 def _apply_pbkdf(passphrase, salt):
     return KDF.PBKDF2(passphrase, salt, 32, 10000,
                       lambda p, s: hmac.new(p, s, hashlib.sha256).digest())
@@ -309,4 +231,4 @@ def _do_pbkdf(passphrase, salt):
     # compute.  However, we do want to wait for result, so we have
     # one of the exceedingly rare sort of circumstances where 'apply'
     # actually makes sense
-    return authworkers.apply(_apply_pbkdf, [passphrase, salt])
+    return authworkers.apply(_apply_pbkdf, [passphrase, salt])

confluent_server/confluent/collective/invites.py

@@ -1,60 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2018 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.
-
-# This handles the process of generating and tracking/validating invites
-
-import base64
-import hashlib
-import hmac
-import os
-pending_invites = {}
-
-def create_server_invitation(servername):
-    servername = servername.encode('utf-8')
-    randbytes = (3 - ((len(servername) + 2) % 3)) % 3 + 64
-    invitation = os.urandom(randbytes)
-    pending_invites[servername] = invitation
-    return base64.b64encode(servername + b'@' + invitation)
-
-def create_client_proof(invitation, mycert, peercert):
-    return hmac.new(invitation, peercert + mycert, hashlib.sha256).digest()
-
-def check_server_proof(invitation, mycert, peercert, proof):
-    validproof = hmac.new(invitation, mycert + peercert, hashlib.sha256
-                          ).digest()
-    return proof == validproof
-
-def check_client_proof(servername, mycert, peercert, proof):
-    servername = servername.encode('utf-8')
-    if servername not in pending_invites:
-        return False
-    invitation = pending_invites[servername]
-    validproof = hmac.new(invitation, mycert + peercert, hashlib.sha256
-                          ).digest()
-    if proof == validproof:
-        # We know that the client knew the secret, and that it measured our
-        # certificate, and thus calling code can bless the certificate, and
-        # we can forget the invitation
-        del pending_invites[servername]
-        # We now want to prove to the client that we also know the secret,
-        # and that we measured their certificate well
-        # Now to generate an answer...., reverse the cert order so our answer
-        # is different, but still proving things
-        return hmac.new(invitation, peercert + mycert, hashlib.sha256
-                          ).digest()
-    # The given proof did not verify the invitation
-    return False
-

confluent_server/confluent/collective/manager.py

@@ -1,610 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2018 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.
-
-import base64
-import confluent.collective.invites as invites
-import confluent.config.configmanager as cfm
-import confluent.exceptions as exc
-import confluent.log as log
-import confluent.tlvdata as tlvdata
-import confluent.util as util
-import eventlet
-import eventlet.green.socket as socket
-import eventlet.green.ssl as ssl
-import eventlet.green.threading as threading
-import greenlet
-import random
-import sys
-try:
-    import OpenSSL.crypto as crypto
-except ImportError:
-    # while not always required, we use pyopenssl required for at least
-    # collective
-    crypto = None
-
-currentleader = None
-follower = None
-retrythread = None
-
-class ContextBool(object):
-    def __init__(self):
-        self.active = False
-        self.mylock = threading.RLock()
-
-    def __enter__(self):
-        self.active = True
-        self.mylock.__enter__()
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.active = False
-        self.mylock.__exit__(exc_type, exc_val, exc_tb)
-
-connecting = ContextBool()
-leader_init = ContextBool()
-
-def connect_to_leader(cert=None, name=None, leader=None):
-    global currentleader
-    global follower
-    if leader is None:
-        leader = currentleader
-    log.log({'info': 'Attempting connection to leader {0}'.format(leader),
-             'subsystem': 'collective'})
-    try:
-        remote = connect_to_collective(cert, leader)
-    except socket.error as e:
-        log.log({'error': 'Collective connection attempt to {0} failed: {1}'
-                          ''.format(leader, str(e)),
-                 'subsystem': 'collective'})
-        return False
-    with connecting:
-        with cfm._initlock:
-            banner = tlvdata.recv(remote)  # the banner
-            vers = banner.split()[2]
-            if vers != b'v2':
-                raise Exception('This instance only supports protocol 2, synchronize versions between collective members')
-            tlvdata.recv(remote)  # authpassed... 0..
-            if name is None:
-                name = get_myname()
-            tlvdata.send(remote, {'collective': {'operation': 'connect',
-                                                 'name': name,
-                                                 'txcount': cfm._txcount}})
-            keydata = tlvdata.recv(remote)
-            if not keydata:
-                return False
-            if 'error' in keydata:
-                if 'backoff' in keydata:
-                    log.log({
-                        'info': 'Collective initialization in progress on '
-                                '{0}'.format(leader),
-                        'subsystem': 'collective'})
-                    return False
-                if 'leader' in keydata:
-                    log.log(
-                        {'info': 'Prospective leader {0} has redirected this '
-                                 'member to {1}'.format(leader, keydata['leader']),
-                         'subsystem': 'collective'})
-                    ldrc = cfm.get_collective_member_by_address(
-                        keydata['leader'])
-                    if ldrc and ldrc['name'] == name:
-                        raise Exception("Redirected to self")
-                    return connect_to_leader(name=name,
-                                             leader=keydata['leader'])
-                if 'txcount' in keydata:
-                    log.log({'info':
-                                 'Prospective leader {0} has inferior '
-                                 'transaction count, becoming leader'
-                                 ''.format(leader), 'subsystem': 'collective',
-                             'subsystem': 'collective'})
-                    return become_leader(remote)
-                return False
-                follower.kill()
-                cfm.stop_following()
-                follower = None
-            if follower:
-                follower.kill()
-                cfm.stop_following()
-                follower = None
-            log.log({'info': 'Following leader {0}'.format(leader),
-                     'subsystem': 'collective'})
-            colldata = tlvdata.recv(remote)
-            globaldata = tlvdata.recv(remote)
-            dbi = tlvdata.recv(remote)
-            dbsize = dbi['dbsize']
-            dbjson = b''
-            while (len(dbjson) < dbsize):
-                ndata = remote.recv(dbsize - len(dbjson))
-                if not ndata:
-                    try:
-                        remote.close()
-                    except Exception:
-                        pass
-                    raise Exception("Error doing initial DB transfer")
-                dbjson += ndata
-            cfm.clear_configuration()
-            try:
-                cfm._restore_keys(keydata, None, sync=False)
-                for c in colldata:
-                    cfm._true_add_collective_member(c, colldata[c]['address'],
-                                                    colldata[c]['fingerprint'],
-                                                    sync=False)
-                for globvar in globaldata:
-                    cfm.set_global(globvar, globaldata[globvar], False)
-                cfm._txcount = dbi.get('txcount', 0)
-                cfm.ConfigManager(tenant=None)._load_from_json(dbjson,
-                                                               sync=False)
-                cfm.commit_clear()
-            except Exception:
-                cfm.stop_following()
-                cfm.rollback_clear()
-                raise
-            currentleader = leader
-        #spawn this as a thread...
-        follower = eventlet.spawn(follow_leader, remote, leader)
-    return True
-
-
-def follow_leader(remote, leader):
-    global currentleader
-    cleanexit = False
-    try:
-        cfm.follow_channel(remote)
-    except greenlet.GreenletExit:
-        cleanexit = True
-    finally:
-        if cleanexit:
-            log.log({'info': 'Previous following cleanly closed',
-                     'subsystem': 'collective'})
-            return
-        log.log({'info': 'Current leader ({0}) has disappeared, restarting '
-                         'collective membership'.format(leader), 'subsystem': 'collective'})
-        # The leader has folded, time to startup again...
-        cfm.stop_following()
-        currentleader = None
-        eventlet.spawn_n(start_collective)
-
-
-def connect_to_collective(cert, member):
-    remote = socket.create_connection((member, 13001))
-    # TLS cert validation is custom and will not pass normal CA vetting
-    # to override completely in the right place requires enormous effort, so just defer until after connect
-    remote = ssl.wrap_socket(remote, cert_reqs=ssl.CERT_NONE, keyfile='/etc/confluent/privkey.pem',
-                             certfile='/etc/confluent/srvcert.pem')
-    if cert:
-        fprint = cert
-    else:
-        collent = cfm.get_collective_member_by_address(member)
-        fprint = collent['fingerprint']
-    if not util.cert_matches(fprint, remote.getpeercert(binary_form=True)):
-        # probably Janeway up to something
-        raise Exception("Certificate mismatch in the collective")
-    return remote
-
-
-def get_myname():
-    try:
-        with open('/etc/confluent/cfg/myname', 'r') as f:
-            return f.read().strip()
-    except IOError:
-        myname = socket.gethostname()
-        with open('/etc/confluent/cfg/myname', 'w') as f:
-            f.write(myname)
-        return myname
-
-def handle_connection(connection, cert, request, local=False):
-    global currentleader
-    global retrythread
-    operation = request['operation']
-    if cert:
-        cert = crypto.dump_certificate(crypto.FILETYPE_ASN1, cert)
-    else:
-        if not local:
-            return
-        if operation in ('show', 'delete'):
-            if not list(cfm.list_collective()):
-                tlvdata.send(connection,
-                             {'collective': {'error': 'Collective mode not '
-                                                      'enabled on this '
-                                                      'system'}})
-                return
-            if follower:
-                linfo = cfm.get_collective_member_by_address(currentleader)
-                remote = socket.create_connection((currentleader, 13001))
-                remote = ssl.wrap_socket(remote, cert_reqs=ssl.CERT_NONE,
-                                         keyfile='/etc/confluent/privkey.pem',
-                                         certfile='/etc/confluent/srvcert.pem')
-                cert = remote.getpeercert(binary_form=True)
-                if not (linfo and util.cert_matches(
-                        linfo['fingerprint'],
-                        cert)):
-                    remote.close()
-                    tlvdata.send(connection,
-                                 {'error': 'Invalid certificate, '
-                                           'redo invitation process'})
-                    connection.close()
-                    return
-                tlvdata.recv(remote)  # ignore banner
-                tlvdata.recv(remote)  # ignore authpassed: 0
-                tlvdata.send(remote,
-                             {'collective': {'operation': 'getinfo',
-                                             'name': get_myname()}})
-                collinfo = tlvdata.recv(remote)
-            else:
-                collinfo = {}
-                populate_collinfo(collinfo)
-            try:
-                cfm.check_quorum()
-                collinfo['quorum'] = True
-            except exc.DegradedCollective:
-                collinfo['quorum'] = False
-            if operation == 'show':
-                tlvdata.send(connection, {'collective':  collinfo})
-            elif operation == 'delete':
-                todelete = request['member']
-                if (todelete == collinfo['leader'] or 
-                       todelete in collinfo['active']):
-                    tlvdata.send(connection, {'collective':
-                            {'error': '{0} is still active, stop the confluent service to remove it'.format(todelete)}})
-                    return
-                if todelete not in collinfo['offline']:
-                    tlvdata.send(connection, {'collective':
-                            {'error': '{0} is not a recognized collective member'.format(todelete)}})
-                    return
-                cfm.del_collective_member(todelete)
-                tlvdata.send(connection,
-                    {'collective': {'status': 'Successfully deleted {0}'.format(todelete)}})
-                connection.close()
-            return
-        if 'invite' == operation:
-            try:
-                cfm.check_quorum()
-            except exc.DegradedCollective:
-                tlvdata.send(connection,
-                    {'collective':
-                         {'error': 'Collective does not have quorum'}})
-                return
-            #TODO(jjohnson2): Cannot do the invitation if not the head node, the certificate hand-carrying
-            #can't work in such a case.
-            name = request['name']
-            invitation = invites.create_server_invitation(name)
-            tlvdata.send(connection,
-                         {'collective': {'invitation': invitation}})
-            connection.close()
-        if 'join' == operation:
-            invitation = request['invitation']
-            try:
-                invitation = base64.b64decode(invitation)
-                name, invitation = invitation.split(b'@', 1)
-                name = util.stringify(name)
-            except Exception:
-                tlvdata.send(
-                    connection,
-                    {'collective':
-                         {'status': 'Invalid token format'}})
-                connection.close()
-                return
-            host = request['server']
-            try:
-                remote = socket.create_connection((host, 13001))
-                # This isn't what it looks like.  We do CERT_NONE to disable
-                # openssl verification, but then use the invitation as a
-                # shared secret to validate the certs as part of the join
-                # operation
-                remote = ssl.wrap_socket(remote,  cert_reqs=ssl.CERT_NONE,
-                                         keyfile='/etc/confluent/privkey.pem',
-                                         certfile='/etc/confluent/srvcert.pem')
-            except Exception:
-                tlvdata.send(
-                    connection,
-                    {'collective':
-                         {'status': 'Failed to connect to {0}'.format(host)}})
-                connection.close()
-                return
-            mycert = util.get_certificate_from_file(
-                '/etc/confluent/srvcert.pem')
-            cert = remote.getpeercert(binary_form=True)
-            proof = base64.b64encode(invites.create_client_proof(
-                invitation, mycert, cert))
-            tlvdata.recv(remote)  # ignore banner
-            tlvdata.recv(remote)  # ignore authpassed: 0
-            tlvdata.send(remote, {'collective': {'operation': 'enroll',
-                                                 'name': name, 'hmac': proof}})
-            rsp = tlvdata.recv(remote)
-            if 'error' in rsp:
-                tlvdata.send(connection, {'collective':
-                                              {'status': rsp['error']}})
-                connection.close()
-                return
-            proof = rsp['collective']['approval']
-            proof = base64.b64decode(proof)
-            j = invites.check_server_proof(invitation, mycert, cert, proof)
-            if not j:
-                remote.close()
-                tlvdata.send(connection, {'collective':
-                                              {'status': 'Bad server token'}})
-                connection.close()
-                return
-            tlvdata.send(connection, {'collective': {'status': 'Success'}})
-            connection.close()
-            currentleader = rsp['collective']['leader']
-            f = open('/etc/confluent/cfg/myname', 'w')
-            f.write(name)
-            f.close()
-            log.log({'info': 'Connecting to collective due to join',
-                     'subsystem': 'collective'})
-            eventlet.spawn_n(connect_to_leader, rsp['collective'][
-                'fingerprint'], name)
-    if 'enroll' == operation:
-        #TODO(jjohnson2): error appropriately when asked to enroll, but the master is elsewhere
-        mycert = util.get_certificate_from_file('/etc/confluent/srvcert.pem')
-        proof = base64.b64decode(request['hmac'])
-        myrsp = invites.check_client_proof(request['name'], mycert,
-                                           cert, proof)
-        if not myrsp:
-            tlvdata.send(connection, {'error': 'Invalid token'})
-            connection.close()
-            return
-        myrsp = base64.b64encode(myrsp)
-        fprint = util.get_fingerprint(cert)
-        myfprint = util.get_fingerprint(mycert)
-        cfm.add_collective_member(get_myname(),
-                                  connection.getsockname()[0], myfprint)
-        cfm.add_collective_member(request['name'],
-                                  connection.getpeername()[0], fprint)
-        myleader = get_leader(connection)
-        ldrfprint = cfm.get_collective_member_by_address(
-            myleader)['fingerprint']
-        tlvdata.send(connection,
-                     {'collective': {'approval': myrsp,
-                                     'fingerprint': ldrfprint,
-                                     'leader': get_leader(connection)}})
-    if 'assimilate' == operation:
-        drone = request['name']
-        droneinfo = cfm.get_collective_member(drone)
-        if not droneinfo:
-            tlvdata.send(connection,
-                         {'error': 'Unrecognized leader, '
-                                   'redo invitation process'})
-            return
-        if not util.cert_matches(droneinfo['fingerprint'], cert):
-            tlvdata.send(connection,
-                         {'error': 'Invalid certificate, '
-                                   'redo invitation process'})
-            return
-        if request['txcount'] < cfm._txcount:
-            tlvdata.send(connection,
-                         {'error': 'Refusing to be assimilated by inferior'
-                                   'transaction count',
-                          'txcount': cfm._txcount,})
-            return
-        if connecting.active:
-            # don't try to connect while actively already trying to connect
-            tlvdata.send(connection, {'status': 0})
-            connection.close()
-            return
-        if (currentleader == connection.getpeername()[0] and
-                follower and not follower.dead):
-            # if we are happily following this leader already, don't stir
-            # the pot
-            tlvdata.send(connection, {'status': 0})
-            connection.close()
-            return
-        log.log({'info': 'Connecting in response to assimilation',
-                 'subsystem': 'collective'})
-        eventlet.spawn_n(connect_to_leader, None, None,
-                         leader=connection.getpeername()[0])
-        tlvdata.send(connection, {'status': 0})
-        connection.close()
-    if 'getinfo' == operation:
-        drone = request['name']
-        droneinfo = cfm.get_collective_member(drone)
-        if not (droneinfo and util.cert_matches(droneinfo['fingerprint'],
-                                                cert)):
-            tlvdata.send(connection,
-                         {'error': 'Invalid certificate, '
-                                   'redo invitation process'})
-            connection.close()
-            return
-        collinfo = {}
-        populate_collinfo(collinfo)
-        tlvdata.send(connection, collinfo)
-    if 'connect' == operation:
-        drone = request['name']
-        droneinfo = cfm.get_collective_member(drone)
-        if not (droneinfo and util.cert_matches(droneinfo['fingerprint'],
-                                                cert)):
-            tlvdata.send(connection,
-                         {'error': 'Invalid certificate, '
-                                   'redo invitation process'})
-            connection.close()
-            return
-        myself = connection.getsockname()[0]
-        if connecting.active:
-            tlvdata.send(connection, {'error': 'Connecting right now',
-                                      'backoff': True})
-            connection.close()
-            return
-        if myself != get_leader(connection):
-            tlvdata.send(
-                connection,
-                {'error': 'Cannot assimilate, our leader is '
-                          'in another castle', 'leader': currentleader})
-            connection.close()
-            return
-        if request['txcount'] > cfm._txcount:
-            retire_as_leader()
-            tlvdata.send(connection,
-                         {'error': 'Client has higher tranasaction count, '
-                                   'should assimilate me, connecting..',
-                          'txcount': cfm._txcount})
-            log.log({'info': 'Connecting to leader due to superior '
-                             'transaction count', 'subsystem': collective})
-            eventlet.spawn_n(connect_to_leader, None, None,
-                             connection.getpeername()[0])
-            connection.close()
-            return
-        if retrythread:
-            retrythread.cancel()
-            retrythread = None
-        with leader_init:
-            cfm.update_collective_address(request['name'],
-                                          connection.getpeername()[0])
-            tlvdata.send(connection, cfm._dump_keys(None, False))
-            tlvdata.send(connection, cfm._cfgstore['collective'])
-            tlvdata.send(connection, cfm.get_globals())
-            cfgdata = cfm.ConfigManager(None)._dump_to_json()
-            tlvdata.send(connection, {'txcount': cfm._txcount,
-                                      'dbsize': len(cfgdata)})
-            connection.sendall(cfgdata)
-        #tlvdata.send(connection, {'tenants': 0}) # skip the tenants for now,
-        # so far unused anyway
-        if not cfm.relay_slaved_requests(drone, connection):
-            if not retrythread:  # start a recovery if everyone else seems
-                # to have disappeared
-                retrythread = eventlet.spawn_after(30 + random.random(),
-                                                   start_collective)
-        # ok, we have a connecting member whose certificate checks out
-        # He needs to bootstrap his configuration and subscribe it to updates
-
-
-def populate_collinfo(collinfo):
-    iam = get_myname()
-    collinfo['leader'] = iam
-    collinfo['active'] = list(cfm.cfgstreams)
-    activemembers = set(cfm.cfgstreams)
-    activemembers.add(iam)
-    collinfo['offline'] = []
-    for member in cfm.list_collective():
-        if member not in activemembers:
-            collinfo['offline'].append(member)
-
-
-def try_assimilate(drone):
-    try:
-        remote = connect_to_collective(None, drone)
-    except socket.error:
-        # Oh well, unable to connect, hopefully the rest will be
-        # in order
-        return
-    tlvdata.send(remote, {'collective': {'operation': 'assimilate',
-                                         'name': get_myname(),
-                                         'txcount': cfm._txcount}})
-    tlvdata.recv(remote)  # the banner
-    tlvdata.recv(remote)  # authpassed... 0..
-    answer = tlvdata.recv(remote)
-    if not answer:
-        log.log(
-            {'error':
-                 'No answer from {0} while trying to assimilate'.format(
-                     drone),
-            'subsystem': 'collective'})
-        return
-    if 'txcount' in answer:
-        log.log({'info': 'Deferring to {0} due to transaction count'.format(
-            drone), 'subsystem': 'collective'})
-        connect_to_leader(None, None, leader=remote.getpeername()[0])
-        return
-    if 'error' in answer:
-        log.log({
-            'error': 'Error encountered while attempting to '
-                     'assimilate {0}: {1}'.format(drone, answer['error']),
-            'subsystem': 'collective'})
-        return
-    log.log({'info': 'Assimilated {0} into collective'.format(drone),
-             'subsystem': 'collective'})
-
-
-def get_leader(connection):
-    if currentleader is None or connection.getpeername()[0] == currentleader:
-        if currentleader is None:
-            msg = 'Becoming leader as no leader known'
-        else:
-            msg = 'Becoming leader because {0} attempted to connect and it ' \
-                  'is current leader'.format(currentleader)
-        log.log({'info': msg, 'subsystem': 'collective'})
-        become_leader(connection)
-    return currentleader
-
-def retire_as_leader():
-    global currentleader
-    cfm.stop_leading()
-    currentleader = None
-
-def become_leader(connection):
-    global currentleader
-    global follower
-    global retrythread
-    log.log({'info': 'Becoming leader of collective',
-             'subsystem': 'collective'})
-    if follower:
-        follower.kill()
-        cfm.stop_following()
-        follower = None
-    if retrythread:
-        retrythread.cancel()
-        retrythread = None
-    currentleader = connection.getsockname()[0]
-    skipaddr = connection.getpeername()[0]
-    myname = get_myname()
-    skipem = set(cfm.cfgstreams)
-    skipem.add(currentleader)
-    skipem.add(skipaddr)
-    for member in cfm.list_collective():
-        dronecandidate = cfm.get_collective_member(member)['address']
-        if dronecandidate in skipem or member == myname:
-            continue
-        eventlet.spawn_n(try_assimilate, dronecandidate)
-
-
-def startup():
-    members = list(cfm.list_collective())
-    if len(members) < 2:
-        # Not in collective mode, return
-        return
-    eventlet.spawn_n(start_collective)
-
-def start_collective():
-    global follower
-    global retrythread
-    if follower:
-        follower.kill()
-        cfm.stop_following()
-        follower = None
-    try:
-        if cfm.cfgstreams:
-            cfm.check_quorum()
-            # Do not start if we have quorum and are leader
-            return
-    except exc.DegradedCollective:
-        pass
-    if leader_init.active:  # do not start trying to connect if we are
-        # xmitting data to a follower
-        return
-    myname = get_myname()
-    for member in sorted(list(cfm.list_collective())):
-        if member == myname:
-            continue
-        if cfm.cfgleader is None:
-            cfm.stop_following(True)
-        ldrcandidate = cfm.get_collective_member(member)['address']
-        log.log({'info': 'Performing startup attempt to {0}'.format(
-            ldrcandidate), 'subsystem': 'collective'})
-        if connect_to_leader(name=myname, leader=ldrcandidate):
-            break
-    else:
-        retrythread = eventlet.spawn_after(30 + random.random(),
-                                           start_collective)
-
-

confluent_server/confluent/config/attributes.py

@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2014 IBM Corporation
-# Copyright 2015-2019 Lenovo
+# Copyright 2015 Lenovo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -93,10 +93,9 @@ node = {
         'description': ('List of static groups for which this node is '
                         'considered a member'),
     },
-    'type': {
-        'description': ('Classification of node as server or switch'),
-        'validvalues': ('switch', 'server'),
-    },
+    #'type': {
+    #    'description': ('Classification of node as system, vm, etc')
+    #},
     #'id': {
     #    'description': ('Numeric identifier for node')
     #},
@@ -149,22 +148,6 @@ node = {
 #                        'autonode.servername, so that would not need to be '
 #                        'copied ')
 #    },
-    'collective.manager': {
-        'description': ('When in collective mode, the member of the '
-                        'collective currently considered to be responsible '
-                        'for this node.  At a future date, this may be '
-                        'modified automatically if another attribute '
-                        'indicates candidate managers, either for '
-                        'high availability or load balancing purposes.')
-    },
-    'discovery.passwordrules': {
-        'description':  'Any specified rules shall be configured on the BMC '
-                        'upon discovery.  "expiration=no,loginfailures=no,complexity=no,reuse=no" '
-                        'would disable password expiration, login failures '
-                        'triggering a lockout, password complexity requirements,'
-                        'and any restrictions around reusing an old password.',
-        'validlistkeys': ('expiration', 'loginfailures', 'complexity', 'reuse'),
-    },
     'discovery.policy': {
         'description':  'Policy to use for auto-configuration of discovered '
                         'and identified nodes. Valid values are "manual", '
@@ -174,7 +157,6 @@ node = {
                         'so long as the node has no existing public key. '
                         '"open" allows discovery even if a known public key '
                         'is already stored',
-        'validlist': ('manual', 'permissive', 'pxe', 'open'),
     },
     'info.note': {
         'description':  'A field used for administrators to make arbitrary '
@@ -183,9 +165,6 @@ node = {
                         'freeform text data without concern for issues in how '
                         'the server will process it.',
     },
-    'location.height': {
-        'description': 'Height in RU of the system (defaults to query the systems)',
-    },
     'location.room': {
         'description': 'Room description for the node',
     },
@@ -265,14 +244,11 @@ node = {
     'console.logging': {
         'description': ('Indicate logging level to apply to console.  Valid '
                         'values are currently "full", "interactive", and '
-                        '"none". Defaults to "full".'),
-        'validvalues': ('full', 'interactive', 'none'),
+                        '"none". Defaults to "full".')
     },
     'console.method': {
         'description': ('Indicate the method used to access the console of '
-                        'the managed node.  If not specified, then console '
-                        'is disabled'),
-        'validvalues': ('ssh', 'ipmi', 'tsmsol'),
+                        'the managed node.')
     },
 #    'virtualization.host': {
 #        'description': ('Hypervisor where this node does/should reside'),
@@ -302,19 +278,13 @@ node = {
     'hardwaremanagement.method': {
         'description': 'The method used to perform operations such as power '
                        'control, get sensor data, get inventory, and so on. '
-                       'ipmi is used if not specified.'
-    },
-    'enclosure.bay': {
-         'description': 'The bay in the enclosure, if any',
-#        'appliesto': ['system'],
-    },
-    'enclosure.extends': {
-        'description': 'When using an extendable enclosure, this is the node '
-                       'representing the manager that is one closer to the '
-                       'uplink.',
     },
     'enclosure.manager': {
         'description': "The management device for this node's chassis",
+#        'appliesto': ['system'],
+    },
+    'enclosure.bay': {
+         'description': 'The bay in the enclosure, if any',
 #        'appliesto': ['system'],
     },
 
@@ -323,39 +293,17 @@ node = {
 #IBM Flex)''',
 #        'appliesto': ['system'],
 #    },
-    'id.model': {
-        'description': 'The model number of a node.  In scenarios where there '
-                       'is both a name and a model number, it is generally '
-                       'expected that this would be the generally more '
-                       'specific model number.'
-    },
-    'id.serial': {
-        'description': 'The manufacturer serial number of node',
-    },
+#    'id.serial': {
+#        'description': 'The manufacturer serial number of node',
+#    },
     'id.uuid': {
         'description': 'The UUID of the node as presented in DMI.',
     },
-    # For single interface mac collection, net.bootable suffices
-    # For multiple interface mac collection, we perhaps add an address field and use subnet affinity as a clue
-    # to disambiguate multiple addresses for external provisioning
-    # For internal provisioning, the UUID matters rather than the MAC, though subnet affinity may
-    # still be a factor to select the appropriate static config to send down.  In such a case bonding
-    # is hopefully more likely as that's a bit easier.
-    # Start with the first case and only document that, the other thoughts can be future items if they turn up
-    'net.bootable': {
-        'type': bool,
-        'description': 'Whether or not the indicated network interface is to be used for booting.  This is used by '
-                       'the discovery process to decide where to place the mac address of a detected PXE nic.',
-    },
     'net.ipv4_gateway': {
         'description':  'The IPv4 gateway to use if applicable.  As is the '
                         'case for other net attributes, net.eth0.ipv4_gateway '
                         'and similar is accepted.'
     },
-    'net.hwaddr': {
-        'description': 'The hardware address, aka MAC address of the interface indicated, generally populated by the '
-                       'PXE discovery mechanism'
-    },
     # 'net.pxe': { 'description': 'Whether pxe will be used on this interface'
     # TODO(jjohnson2):  Above being 'true' will control whether mac addresses
     # are stored in this nics attribute on pxe-client discovery, since

confluent_server/confluent/config/conf.py

@@ -16,10 +16,7 @@
 
 
 # This defines config variable to store the global configuration for confluent
-try:
-    import ConfigParser
-except ModuleNotFoundError:
-    import configparser as ConfigParser
+import ConfigParser
 import os
 
 _config = None