Have nodes/ipminode/power/state work for xcat node

confluent_client/bin/collate

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -35,9 +35,6 @@ 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')
@@ -68,7 +65,7 @@ else:
 def print_current():
     if options.diff:
         grouped.print_deviants(skipmodal=options.skipcommon, count=options.count,
-                          reverse=options.reverse, basenode=options.base)
+                          reverse=options.reverse)
     else:
         grouped.print_all(skipmodal=options.skipcommon,
                                count=options.count,

confluent_client/bin/confetty

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2014 IBM Corporation
@@ -89,10 +89,6 @@ except NameError:
 netserver = None
 laststate = {}
 
-try:
-    input = raw_input
-except NameError:
-    pass
 
 class BailOut(Exception):
     def __init__(self, errorcode=0):
@@ -199,9 +195,9 @@ def prompt():
     if os.environ.get('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")
@@ -300,7 +296,7 @@ currchildren = None
 
 def print_result(res):
     if 'errorcode' in res or 'error' in res:
-        print(res['error'])
+        print res['error']
         return
     if 'databynode' in res:
         print_result(res['databynode'])
@@ -313,9 +309,9 @@ def print_result(res):
             attrstr = '%s=%s' % (key, recurse_format(res[key]))
         elif not isinstance(res[key], dict):
             try:
-                print('{0}: {1}'.format(key, res[key]))
+                print '{0}: {1}'.format(key, res[key])
             except UnicodeEncodeError:
-                print('{0}: {1}'.format(key, repr(res[key])))
+                print '{0}: {1}'.format(key, repr(res[key]))
             continue
         elif 'value' in res[key] and res[key]['value'] is not None:
             attrstr = '%s="%s"' % (key, res[key]['value'])
@@ -328,7 +324,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
@@ -427,10 +423,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')
@@ -508,13 +504,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):
@@ -855,7 +844,7 @@ 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)
 
@@ -875,7 +864,7 @@ def main():
     global inconsole
     try:
         server_connect()
-    except (EOFError, KeyboardInterrupt) as _:
+    except EOFError, KeyboardInterrupt:
         raise BailOut(0)
     except socket.gaierror:
         sys.stderr.write('Could not connect to confluent\n')
@@ -933,7 +922,6 @@ def main():
                         updatestatus(data)
                         continue
                     if data is not None:
-                        data = client.stringify(data)
                         if clearpowermessage:
                             sys.stdout.write("\x1b[2J\x1b[;H")
                             clearpowermessage = False
@@ -1009,6 +997,4 @@ if __name__ == '__main__':
         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)

confluent_client/bin/confluent2ansible

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 import optparse
 import signal
 import sys

confluent_client/bin/confluent2lxca

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 import csv
 import optparse
 import signal

confluent_client/bin/confluent2xcat

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 import csv
 import optparse
 import signal
@@ -26,7 +26,7 @@ def lookupdata(data, key):
 
 def main():
     argparser = optparse.OptionParser(
-    usage='''\n       %prog noderange -o xcatnodes.def
+    usage='''\n       %prog noderange -o ansible.hosts
              \n ''')
     argparser.add_option('-o', '--output',
                          help='xCAT stanza file')

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
@@ -126,6 +126,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,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
@@ -56,7 +56,7 @@ for node in session.read('/noderange/{0}/nodes/'.format(noderange)):
 goodNodes = allNodes - errorNodes
 
 for node in goodNodes:
-    print(node + ": BMC Reset Successful")
+    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

confluent_client/bin/nodeconfig

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -43,7 +43,7 @@ def bailout(msg, code=1):
     sys.exit(code)
 
 
-argparser = optparse.OptionParser(usage="Usage: %prog [options] noderange [option|option=value]")
+argparser = optparse.OptionParser()
 argparser.add_option('-c', '--comparedefault', dest='comparedefault',
                      action='store_true', default=False,
                      help='Compare given settings to default or list settings '
@@ -98,8 +98,6 @@ setmode = None
 assignment = {}
 queryparms = {}
 printsys = []
-printbmc = []
-printallbmc = False
 setsys = {}
 forceset = False
 needval = None
@@ -124,7 +122,7 @@ def _assign_value():
 
 
 def parse_config_line(arguments):
-    global setmode, printallbmc, forceset, key, value, needval, candidate, path, attrib
+    global setmode, forceset, key, value, needval, candidate, path, attrib
     for param in arguments:
         if param == 'show':
             continue  # forgive muscle memory of pasu users
@@ -156,8 +154,6 @@ def parse_config_line(arguments):
             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)):
@@ -176,10 +172,7 @@ def parse_config_line(arguments):
                 if not matchedparms:
                     printsys.append(param)
             elif param not in cfgpaths:
-                if param.startswith('bmc.'):
-                    printbmc.append(param.replace('bmc.', ''))
-                else:
-                    printsys.append(param)
+                printsys.append(param)
             else:
                 path, attrib = cfgpaths[param]
                 path = '/noderange/{0}/{1}'.format(noderange, path)
@@ -192,38 +185,24 @@ if options.batch:
     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))
+        parse_config_line(shlex.split(argset))
         argset = argfile.readline()
 else:
     parse_config_line(args[1:])
 session = client.Command()
 rcode = 0
-if options.restoredefault:
-    if options.restoredefault.lower() in (
+if options.restoredefault and 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)
+    for fr in session.update(
+            '/noderange/{0}/configuration/system/clear'.format(noderange),
+            {'clear': True}):
+        rcode |= client.printerror(fr)
+    sys.exit(rcode)
+elif options.restoredefault:
+    sys.stderr.write(
+        'Unrecognized component to restore defaults: {0}\n'.format(
+            options.restoredefault))
+    sys.exit(1)
 if setmode:
     if options.exclude:
         sys.stderr.write('Cannot use exclude and assign at the same time\n')
@@ -232,12 +211,8 @@ if setmode:
     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
+            path = 'configuration/system/all'
+            attrib = key
         else:
             path, attrib = cfgpaths[key]
         if path not in updatebypath:
@@ -269,10 +244,6 @@ else:
                                       NullOpt(), queryparms[path])
         if rc:
             sys.exit(rc)
-    if printbmc or printallbmc:
-        rcode = client.print_attrib_path(
-                    '/noderange/{0}/configuration/management_controller/extended/all'.format(noderange),
-                    session, printbmc, options, attrprefix='bmc.')
     if printsys or options.exclude:
         if printsys == 'all':
             printsys = []
@@ -281,7 +252,6 @@ else:
         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
@@ -40,7 +40,6 @@ 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])):
@@ -61,15 +60,13 @@ if options.tile:
                     confettypath, node)])
         else:
             subprocess.call(['tmux', 'select-pane', '-t', str(pane)])
-            subprocess.call(['tmux', 'set-option', 'pane-border-status', 'top'], stderr=null)
             pane += 1
             subprocess.call(
                 ['tmux', 'split', '-h',
                  '{0} -m 5 start /nodes/{1}/console/session'.format(
                      confettypath, node)])
-            subprocess.call(['tmux', 'select-layout', 'tiled'], stdout=null)
+            subprocess.call(['tmux', 'select-layout', 'tiled'])
     subprocess.call(['tmux', 'select-pane', '-t', '0'])
-    subprocess.call(['tmux', 'set-option', 'pane-border-status', 'top'], stderr=null)
     os.execlp('tmux', 'tmux', 'attach', '-t', 'nodeconsole_{0}'.format(
         os.getpid()))
 else:

confluent_client/bin/nodedefine

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -55,4 +55,4 @@ for r in session.create('/noderange/', attribs):
         exitcode |= 1
     if 'created' in r:
         print('{0}: created'.format(r['created']))
-sys.exit(exitcode)
+sys.exit(exitcode)

confluent_client/bin/nodediscover

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -69,7 +69,10 @@ def print_disco(options, session, currmac, outhandler, columns):
             record.append(','.join(rawval))
         else:
             record.append(str(rawval))
-    outhandler.add_row(record)
+    if options.csv:
+        csv.writer(sys.stdout).writerow(record)
+    else:
+        outhandler.add_row(record)
 
 
 def process_header(header):
@@ -92,8 +95,6 @@ def process_header(header):
             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'):
@@ -154,7 +155,6 @@ def import_csv(options, session):
         for field in fields:
             if field in unique_fields:
                 unique_data[field] = set([])
-        broken = False
         for record in records:
             currfields = list(fields)
             nodedatum = {}
@@ -171,16 +171,14 @@ def import_csv(options, session):
                 nodedatum[currfield] = datum
             if not datum_complete(nodedatum):
                 sys.exit(1)
-            if not search_record(nodedatum, options, session) and not broken:
+            if not search_record(nodedatum, options, session):
                 blocking_scan(session)
             if not search_record(nodedatum, options, session):
                 sys.stderr.write(
                     "Could not match the following data: " +
                     repr(nodedatum) + '\n')
-                broken = True
+                sys.exit(1)
             nodedata.append(nodedatum)
-    if broken:
-        sys.exit(1)
     for datum in nodedata:
         maclist = search_record(datum, options, session)
         datum = datum_to_attrib(datum)
@@ -206,6 +204,7 @@ def import_csv(options, session):
 
 
 def list_discovery(options, session):
+    outhandler = None
     orderby = None
     if options.fields:
         columns = []
@@ -220,12 +219,13 @@ def list_discovery(options, session):
         for field in columns:
             if options.order.lower() == field.lower():
                 orderby = field
-    outhandler = client.Tabulator(columns)
+    if options.csv:
+        csv.writer(sys.stdout).writerow(columns)
+    else:
+        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:
+    if outhandler:
         for row in outhandler.get_table(orderby):
             print(row)
 
@@ -237,10 +237,8 @@ def clear_discovery(options, session):
             else:
                 print(repr(res))
 
-def list_matching_macs(options, session, node=None):
+def list_matching_macs(options, session):
     path = '/discovery/'
-    if node:
-        path += 'by-node/{0}/'.format(node)
     if options.model:
         path += 'by-model/{0}/'.format(options.model)
     if options.serial:
@@ -263,25 +261,25 @@ def list_matching_macs(options, session, node=None):
         path += 'by-mac/'
         return [x['item']['href'] for x in session.read(path)]
 
-def assign_discovery(options, session, needid=True):
+def assign_discovery(options, session):
     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):
+    if 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 not options.node:
+        sys.stderr.write("Node (-n) must be specified for assignment\n")
+        abort = True
     if abort:
         sys.exit(1)
-    matches = list_matching_macs(options, session, None if needid else options.node)
+    matches = list_matching_macs(options, session)
     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)
+        matches = list_matching_macs(options, session)
     if not matches:
         sys.stderr.write("No matching discovery candidates found\n")
         sys.exit(1)
@@ -296,7 +294,6 @@ 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():
@@ -339,7 +336,7 @@ def main():
     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'):
+    if len(args) == 0 or args[0] not in ('list', 'assign', 'rescan', 'clear'):
         parser.print_help()
         sys.exit(1)
     session = client.Command()
@@ -349,12 +346,10 @@ def main():
         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()
+    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.
@@ -33,8 +33,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 [options] noderange [clear]")
@@ -65,8 +64,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:
@@ -80,10 +77,7 @@ 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:
@@ -104,4 +98,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
@@ -151,7 +151,7 @@ def show_firmware(session):
                     for prefix in inv:
                         firmware_shown = True
                         printfirm(node, prefix, inv[prefix])
-    if not firmware_shown and not exitcode:
+    if not firmware_shown:
         argparser.print_help()
 
 
@@ -163,4 +163,4 @@ try:
         update_firmware(session, upfile)
 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
@@ -36,9 +36,9 @@ import confluent.client as client
 
 argparser = optparse.OptionParser(
     usage='''\n       %prog [options]   \
-             \n       %prog [options] nodegroup [list of attributes|all]  \
+             \n       %prog [options] nodegroup [list of attributes]  \
              \n       %prog [options] nodegroup nodes=value1,value2   \
-             \n       %prog -e nodegroup <attribute names to set>  \
+             \n       %prog -e nodegroup <attribute names to set>  \             
              \n       %prog [options] nodegroup nodes=value1,value2
              \n ''')
 argparser.add_option('-b', '--blame', action='store_true',
@@ -97,7 +97,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 +123,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,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -55,4 +55,4 @@ for r in session.create('/nodegroups/', attribs):
         exitcode |= 1
     if 'created' in r:
         print('{0}: created'.format(r['created']))
-sys.exit(exitcode)
+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,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -49,4 +49,4 @@ for r in session.delete('/nodegroups/{0}'.format(noderange)):
         exitcode |= 1
     if 'deleted' in r:
         print('{0}: deleted'.format(r['deleted']))
-sys.exit(exitcode)
+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()

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,7 +31,7 @@ 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]
@@ -42,6 +42,9 @@ 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
@@ -34,8 +34,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)
 
 filters = []
 
@@ -51,17 +50,15 @@ def print_mem_info(node, prefix, meminfo):
     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 +66,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
 
@@ -146,7 +142,7 @@ try:
                                 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)

confluent_client/bin/nodelicense

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2019 Lenovo
@@ -36,111 +36,49 @@ exitcode = 0
 
 argparser = optparse.OptionParser(
     usage="Usage: "
-          "%prog <noderange> [list][install <file>|save <directory>|delete <name>]")
+          "%prog <noderange> [list][install <file>]")
 (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)
+        else:
+            components = ['all']
 except IndexError:
     argparser.print_help()
     sys.exit(1)
 client.check_globbing(noderange)
 
-
 def install_license(session, filename):
     global exitcode
-    if not os.path.exists(filename):
-        sys.stderr.write('Unable to locate requested file {0}\n'.format(
-            filename))
-        sys.exit(404)
     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)
-    if not os.path.exists(filename):
-        sys.stderr.write('Unable to locate specified directory {0}\n'.format(
-            filename))
-        sys.exit(404)
-    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))
-            else:
-                sys.stderr.write('{0}: {1}', node, repr(res['databynode'][node]))
-
+        pass # print(repr(res))
+    show_licenses()
 
 def show_licenses(session):
     global exitcode
+    firmware_shown = False
     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)
+                print('{0}: {1}'.format(node, license.get('feature',
+                                                          'Unknown')))
 
 
-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:
-        delete_license(session, delete)
-    else:
+    if upfile is None:
         show_licenses(session)
+    else:
+        install_license(session, upfile)
 except KeyboardInterrupt:
     print('')
-sys.exit(exitcode)
+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
@@ -46,7 +46,10 @@ def main():
         noderange = args[0]
         nodelist = '/noderange/{0}/nodes/'.format(noderange)
     except IndexError:
-        nodelist = '/nodes/'
+        if os.environ.get('TEST_XCAT'):
+            nodelist = "/xcat/nodes/"
+        else:
+            nodelist = '/nodes/'
     client.check_globbing(noderange)
     session = client.Command()
     exitcode = 0
@@ -61,7 +64,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,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2018 Lenovo
@@ -83,8 +83,7 @@ def list_media(noderange, media):
         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)):
+            if url and not res['databynode'][node].get('secure', False):
                 name += ' (insecure)'
             if not name:
                 continue
@@ -188,4 +187,4 @@ def main():
         sys.exit(1)
     handler(noderange, media)
 if __name__ == '__main__':
-    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
@@ -72,4 +72,4 @@ if options.previous:
     # add dictionary to session
     session.add_precede_dict(prev)
 
-sys.exit(session.simple_noderange_command(noderange, '/power/state', setstate))
+sys.exit(session.simple_noderange_command(noderange, '/power/state', setstate))

confluent_client/bin/noderemove

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2017 Lenovo
@@ -49,4 +49,4 @@ for r in session.delete('/noderange/{0}'.format(noderange)):
         exitcode |= 1
     if 'deleted' in r:
         print('{0}: deleted'.format(r['deleted']))
-sys.exit(exitcode)
+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,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
@@ -56,7 +56,7 @@ for node in session.read('/noderange/{0}/nodes/'.format(noderange)):
 goodNodes = allNodes - errorNodes
 
 for node in goodNodes:
-    print(node + ": Reseat successful")
+    print node + ": Reseat successful"
 
 
 sys.exit(success)

confluent_client/bin/nodersync

@@ -1,155 +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('-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
-
-    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] += 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
@@ -39,13 +39,11 @@ import confluent.sortutil as sortutil
 
 def run():
     argparser = optparse.OptionParser(
-        usage="Usage: %prog [options] noderange commandexpression",
+        usage="Usage: %prog 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')
     # 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()
@@ -71,9 +69,7 @@ def run():
             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')
+            cmd = ex[node]['value'].encode('utf-8')
             cmdv = shlex.split(cmd)
             if currprocs < concurrentprocs:
                 currprocs += 1
@@ -97,11 +93,7 @@ def run():
                             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.write('{0}: {1}'.format(node, data))
                         sys.stderr.flush()
                 else:
                     pop = desc['popen']
@@ -115,11 +107,7 @@ def run():
                             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.write('{0}: {1}'.format(node, line))
         sys.stdout.flush()
         if all:
             rdy, _, _ = select.select(all, [], [], 10)

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
@@ -114,8 +114,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
@@ -133,12 +132,11 @@ def sensorpass(showout=True, appendtime=False):
                             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,11 +147,8 @@ 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)
+                        print(u'{0}: {1}:{2}'.format(
+                            node, sensedata['name'], showval).encode('utf-8'))
                         sys.stdout.flush()
     return resultdata
 
@@ -161,7 +156,7 @@ def sensorpass(showout=True, appendtime=False):
 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 +183,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 +196,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 +220,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

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
@@ -39,13 +39,11 @@ import confluent.sortutil as sortutil
 def run():
 
     argparser = optparse.OptionParser(
-        usage="Usage: %prog [options] noderange commandexpression",
+        usage="Usage: %prog 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')
     # 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()
@@ -72,9 +70,7 @@ def run():
             exitcode |= exp.get('errorcode', 1)
         ex = exp.get('databynode', ())
         for node in ex:
-            cmd = ex[node]['value']
-            if not isinstance(cmd, str) and not isinstance(cmd, bytes):
-                cmd = cmd.encode('utf-8')
+            cmd = ex[node]['value'].encode('utf-8')
             cmdv = ['ssh', node, cmd]
             if currprocs < concurrentprocs:
                 currprocs += 1
@@ -98,11 +94,7 @@ def run():
                             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.write('{0}: {1}'.format(node, data))
                         sys.stderr.flush()
                 else:
                     pop = desc['popen']
@@ -116,11 +108,7 @@ def run():
                             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.write('{0}: {1}'.format(node, line))
         sys.stdout.flush()
         if all:
             rdy, _, _ = select.select(all, [], [], 10)

confluent_client/bin/nodestorage

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2018 Lenovo
@@ -115,8 +115,6 @@ def createstorage(noderange, options, args):
              '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))
@@ -149,26 +147,13 @@ def deletestorage(noderange, options, args):
             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()
-    scfg = session.update('/noderange/{0}/configuration/storage/disks/{1}'.format(noderange, names), {'state': args[0]})
-    _print_cfg(scfg)
+def setstorage(noderange, options, args):
+    pass
 
 funmap = {
     'create': createstorage,
     'show': showstorage,
-    'diskset': setdisk,
+    'set': setstorage,
     'delete': deletestorage,
     'rm': deletestorage,
 }
@@ -177,7 +162,7 @@ funmap = {
 
 def main():
     argparser = OptParser(
-        usage='Usage: %prog <noderange> [show|create|delete|diskset]',
+        usage='Usage: %prog <noderange> [show|create|set|delete]',
         epilog='',
     )
     argparser.add_option('-r', '--raidlevel', type='int',
@@ -198,13 +183,7 @@ def main():
                               '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.')
     (options, args) = argparser.parse_args()
-    if len(args) == 1:
-        args.append('show')
     try:
         noderange = args[0]
         operation = args[1]
@@ -221,4 +200,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()

confluent_client/bin/nodesupport

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2018 Lenovo
@@ -114,12 +114,10 @@ class OptParser(optparse.OptionParser):
 
 def main():
     argparser = OptParser(
-        usage="Usage: %prog <noderange> servicedata "
+        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'
+               'directory\n'
                '\n\nSee `man %prog` for more info.\n')
     (options, args) = argparser.parse_args()
     media = None
@@ -144,4 +142,4 @@ def main():
         sys.exit(1)
     handler(noderange, media)
 if __name__ == '__main__':
-    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-2018 Lenovo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,11 +15,7 @@
 # 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
@@ -40,15 +36,6 @@ _attraliases = {
 }
 
 
-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
@@ -83,23 +70,6 @@ class Tabulator(object):
             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
@@ -116,10 +86,7 @@ def printerror(res, node=None):
 
 
 def cprint(txt):
-    try:
-        print(txt)
-    except UnicodeEncodeError:
-        print(txt.encode('utf8'))
+    print(txt)
     sys.stdout.flush()
 
 def _parseserver(string):
@@ -151,8 +118,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)
@@ -337,19 +302,14 @@ class Command(object):
         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:
-                    try:
-                        replace = raw_input(
-                            "MISMATCHED CERTIFICATE DATA, ACCEPT NEW? (y/n):")
-                    except NameError:
-                        replace = input(
-                            "MISMATCHED CERTIFICATE DATA, ACCEPT NEW? (y/n):")
+                    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))
@@ -402,7 +362,7 @@ def printattributes(session, requestargs, showtype, nodetype, noderange, options
     return print_attrib_path(path, session, requestargs, options)
 
 
-def print_attrib_path(path, session, requestargs, options, rename=None, attrprefix=None):
+def print_attrib_path(path, session, requestargs, options, rename=None):
     exitcode = 0
     seenattributes = set([])
     for res in session.read(path):
@@ -413,7 +373,7 @@ def print_attrib_path(path, session, requestargs, options, rename=None, attrpref
         for node in sorted(res['databynode']):
             for attr, val in sorted(
                     res['databynode'][node].items(),
-                    key=lambda k: k[1].get('sortid', k[0]) if isinstance(k[1], dict) else k[0]):
+                    key=lambda (k, v): v.get('sortid', k) if isinstance(v, dict) else k):
                 if attr == 'error':
                     sys.stderr.write('{0}: Error: {1}\n'.format(node, val))
                     continue
@@ -425,8 +385,6 @@ def print_attrib_path(path, session, requestargs, options, rename=None, attrpref
                     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 'value' in currattr:
@@ -486,12 +444,9 @@ def print_attrib_path(path, session, requestargs, options, rename=None, attrpref
                                 (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))
+                                node, printattr, currattr['value'],
+                                currattr['default']))
                     else:
 
                         try:
@@ -500,14 +455,11 @@ def print_attrib_path(path, session, requestargs, options, rename=None, attrpref
                             details = False
                         if details:
                             if currattr.get('help', None):
-                                attrout += u' (Help: {0})'.format(
-                                    currattr['help'])
+                                attrout += ' (Help: {0})'.format(
+                                    currattr['help'].encode('utf-8'))
                             if currattr.get('possible', None):
-                                try:
-                                    attrout += u' (Choices: {0})'.format(
-                                        ','.join(currattr['possible']))
-                                except TypeError:
-                                    pass
+                                attrout += ' (Choices: {0})'.format(
+                                    ','.join(currattr['possible']))
                         cprint(attrout)
     if not exitcode:
         if requestargs:
@@ -677,4 +629,4 @@ def check_globbing(noderange):
                 'bash or change directories such that there is no filename '
                 'that would conflict.'
                 '\n'.format(noderange))
-            sys.exit(1)
+            sys.exit(1)

confluent_client/confluent/screensqueeze.py

@@ -44,8 +44,6 @@ class ScreenPrinter(object):
         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

confluent_client/confluent/textgroup.py

@@ -169,18 +169,13 @@ class GroupedData(object):
         output.flush()
 
     def print_deviants(self, output=sys.stdout, skipmodal=False, reverse=False,
-                       count=False, basenode=None):
+                       count=False):
         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]),
+                self.byoutput, key=lambda x: [0 - len(self.byoutput[x]),
                                               humanify_nodename(
                                                   self.get_group_text(
                                                       self.byoutput[x]

confluent_client/confluent/tlvdata.py

@@ -25,11 +25,6 @@ try:
 except NameError:
     unicode = str
 
-try:
-    range = xrange
-except NameError:
-    pass
-
 def decodestr(value):
     ret = None
     try:
@@ -39,13 +34,11 @@ 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')
@@ -56,7 +49,7 @@ def unicode_dictvalues(dictdata):
 
 
 def _unicode_list(currlist):
-    for i in range(len(currlist)):
+    for i in xrange(len(currlist)):
         if isinstance(currlist[i], str):
             currlist[i] = decodestr(currlist[i])
         elif isinstance(currlist[i], dict):
@@ -71,7 +64,7 @@ def send(handle, data):
             data = data.encode('utf-8')
         except AttributeError:
             pass
-    if isinstance(data, bytes) or isinstance(data, unicode):
+    if isinstance(data, str) or isinstance(data, unicode):
         # plain text, e.g. console data
         tl = len(data)
         if tl == 0:

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

@@ -39,8 +39,6 @@ alias nodesetboot='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export
 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()
@@ -84,7 +82,7 @@ function _confluent_generic_completion()
 }
 _confluent_nodeidentify_completion()
 {
-    COMP_CANDIDATES=("on,off,blink -h")
+    COMP_CANDIDATES=("on,off -h")
     _confluent_generic_completion
 }
 
@@ -160,7 +158,7 @@ _confluent_nodelicense_completion()
 {
     _confluent_get_args
     if [ $NUMARGS == 3 ]; then
-        COMPREPLY=($(compgen -W "install list save delete" -- ${COMP_WORDS[-1]}))
+        COMPREPLY=($(compgen -W "install list" -- ${COMP_WORDS[-1]}))
         return;
     fi
     if [ $NUMARGS == 4 ] && [ ${CMPARGS[2]} == 'install' ]; then
@@ -168,11 +166,6 @@ _confluent_nodelicense_completion()
         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
@@ -197,13 +190,6 @@ _confluent_nodesupport_completion()
     fi
 }
 
-_confluent_nodeattrib_completion()
-{
-    COMP_CANDIDATES=$(nodeattrib '~.>1' all | awk '{print $2}'|sed -e 's/://')
-    _confluent_generic_completion
-}
-
-
 _confluent_nn_completion()
 {
     _confluent_get_args
@@ -264,8 +250,7 @@ _confluent_ng_completion()
 
     COMPREPLY=($(compgen -W "$(confetty show /nodegroups|sed -e 's/\///' -e s/^/$PREFIX/)" -- "${COMP_WORDS[-1]}"))
 }
-complete -F _confluent_nodeattrib_completion nodeattrib
-complete -F _confluent_nodeattrib_completion nodegroupattrib
+complete -F _confluent_nr_completion nodeattrib
 complete -F _confluent_nr_completion nodebmcreset
 complete -F _confluent_nodesetboot_completion nodeboot
 complete -F _confluent_nr_completion nodeconfig
@@ -277,7 +262,7 @@ 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_nr_completion nodelist
 complete -F _confluent_nodemedia_completion nodemedia
 complete -F _confluent_nodepower_completion nodepower
 complete -F _confluent_nr_completion noderemove

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

@@ -23,9 +23,6 @@ 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.
 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.
@@ -91,12 +88,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)

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. 

confluent_client/doc/man/nodeconfig.ronn

@@ -3,8 +3,8 @@ nodeconfig(8) -- Show or change node configuration
 
 ## SYNOPSIS
 
-`nodeconfig <noderange> [options] [<configuration>..]`  
-`nodeconfig <noderange> [options] [<configuration=value>..]`  
+`nodeconfig <noderange> [options] [<configuration>..]`
+`nodeconfig <noderange> [options] [<configuration=value>..]`
 
 ## DESCRIPTION
 

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/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/nodelicense.ronn

@@ -3,15 +3,9 @@ nodelicense(8) -- Manage license keys on BMC
 
 ## SYNOPSIS
 
-`nodelicense <noderange> [list|install <filename>|delete <license>|save <directory>]`
+`nodelicense <noderange> [list|install <filename>]`
 
 ## 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.
+`nodelicense` shows and installs license keys on supported BMCs
 

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/noderange.ronn

@@ -36,13 +36,10 @@ Also, regular expressions may be used to indicate nodes with names matching cert
 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:
+Exclusions can be done by prepending a ‘-‘ before a portion of a noderange:
 `rack1,-n2`
 `compute,-rack1`
 `compute,-location.row=12`
@@ -54,7 +51,7 @@ To indicate nodes that match multiple selections at once (set intersection), the
 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:
+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/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

@@ -10,11 +10,7 @@ nodesupport(8) -- Utilities for interacting with vendor support
 `nodesupport` provides capabilities associated with interactiong 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.
+or multiple nodes) or a file name (only to be used with single node noderange)
 
 ## EXAMPLES
 

confluent_client/samples/nodeattrib_from_switch.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 
 # This is a sample python script for going through all observed mac addresses
 # and assuming they are BMC related and printing nodeattrib commands

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_server/bin/collective

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 
 import argparse
 import errno
@@ -22,7 +22,7 @@ except NameError:
     pass
 
 def make_certificate():
-    umask = os.umask(0o77)
+    umask = os.umask(0077)
     try:
         os.makedirs('/etc/confluent/cfg')
     except OSError as e:
@@ -61,7 +61,7 @@ def join_collective(server, invitation):
         make_certificate()
     s = client.Command().connection
     while not invitation:
-        invitation = input('Paste the invitation here: ')
+        invitation = raw_input('Paste the invitation here: ')
     tlvdata.send(s, {'collective': {'operation': 'join',
                                     'invitation': invitation,
                                     'server': server}})
@@ -69,19 +69,6 @@ def join_collective(server, invitation):
     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():
@@ -114,13 +101,11 @@ def main():
     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')
+                                    'collective member')
     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 = sp.add_parser('join', help='Join a collective')
+    jc.add_argument('server', help='A server currently in the collective')
     jc.add_argument('-i', help='Invitation provided by runniing invite on an '
                                'existing collective member')
     cmdset = a.parse_args()
@@ -132,8 +117,6 @@ def main():
         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

confluent_server/bin/confluentcertutil.py

@@ -1,16 +1,11 @@
-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")
+    # CentOS/RHAT
+    return '/etc/pki/tls/openssl.cnf'
 
 def get_ip_addresses():
     lines = subprocess.check_output('ip addr'.split(' '))
@@ -52,4 +47,4 @@ def create_certificate():
     )
 
 if __name__ == '__main__':
-    create_certificate()
+    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
@@ -82,7 +82,7 @@ elif args[0] == 'dump':
               "or -s to do encrypted backup that requires keys.json from "
               "another backup to restore.")
         sys.exit(1)
-    os.umask(0o77)
+    os.umask(077)
     main._initsecurity(conf.get_config())
     if not os.path.exists(dumpdir):
         os.makedirs(dumpdir)

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/builddeb

@@ -1,64 +0,0 @@
-#!/bin/bash
-cd `dirname $0`
-PKGNAME=$(basename $(pwd))
-DPKGNAME=$(basename $(pwd) | sed -e s/_/-/)
-OPKGNAME=$(basename $(pwd) | sed -e s/_/-/)
-if grep wheezy /etc/os-release; then
-    DPKGNAME=python-$DPKGNAME
-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
-
-python setup.py sdist > /dev/null 2>&1
-py2dsc 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/' debian/control
-    else
-        sed -i 's/^\(Depends:.*\)/\1, confluent-client, python-lxml, python-eficompressor, python-pycryptodome, python-dateutil/' 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/auth.py

@@ -23,15 +23,11 @@ import confluent.config.configmanager as configmanager
 import eventlet
 import eventlet.tpool
 import Cryptodome.Protocol.KDF as KDF
-from fnmatch import fnmatch
 import hashlib
 import hmac
 import multiprocessing
-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
@@ -43,59 +39,24 @@ _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():
@@ -104,9 +65,9 @@ def _prune_passcache():
     while True:
         curtime = time.time()
         for passent in _passcache.iterkeys():
-            if passent[2] < curtime - 90:
+            if passent[2] < curtime - 10:
                 del _passcache[passent]
-        eventlet.sleep(90)
+        eventlet.sleep(10)
 
 
 def _get_usertenant(name, tenant=False):
@@ -120,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
@@ -134,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
 
@@ -156,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.
@@ -217,27 +157,21 @@ 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)
+    credobj = Credentials(user, passphrase)
     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
     if (user, tenant) in _passcache:
         if hashlib.sha256(passphrase).digest() == _passcache[(user, tenant)]:
-            return authorize(user, element, tenant, operation=operation)
+            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)]
+            return None
     if 'cryptpass' in ucfg:
         _passchecking[(user, tenant)] = True
         # TODO(jbjohnso): WORKERPOOL
@@ -266,17 +200,23 @@ def check_user_passphrase(name, passphrase, operation=None, element=None, tenant
         # delay as well
         if crypt == crypted:
             _passcache[(user, tenant)] = hashlib.sha256(passphrase).digest()
-            return authorize(user, element, tenant, operation)
-    if pam:
-        pammy = pam.pam()
-        usergood = pammy.authenticate(user, passphrase)
+            return authorize(user, element, tenant)
+    try:
+        pammy = PAM.pam()
+        pammy.start(_pamservice, user, credobj.pam_conv)
+        pammy.authenticate()
+        pammy.acct_mgmt()
         del pammy
-        if usergood:
-            _passcache[(user, tenant)] = hashlib.sha256(passphrase).digest()
-            return authorize(user, element, tenant, operation, skipuserobj=False)    
+        _passcache[(user, tenant)] = hashlib.sha256(passphrase).digest()
+        return authorize(user, element, tenant, skipuserobj=False)
+    except NameError:
+        pass
+    except PAM.error:
+        pass
     eventlet.sleep(0.05)  # stall even on test for existence of a username
     return None
 
+
 def _apply_pbkdf(passphrase, salt):
     return KDF.PBKDF2(passphrase, salt, 32, 10000,
                       lambda p, s: hmac.new(p, s, hashlib.sha256).digest())
@@ -294,4 +234,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/manager.py

@@ -27,7 +27,6 @@ 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:
@@ -71,22 +70,11 @@ def connect_to_leader(cert=None, name=None, leader=None):
         return False
     with connecting:
         with cfm._initlock:
-            banner = tlvdata.recv(remote)  # the banner
-            vers = banner.split()[2]
-            pvers = 0
-            reqver = 4
-            if vers == b'v0':
-                pvers = 2
-            elif vers == b'v1':
-                pvers = 4
-            if sys.version_info[0] < 3:
-                pvers = 2
-                reqver = 2
+            tlvdata.recv(remote)  # the banner
             tlvdata.recv(remote)  # authpassed... 0..
             if name is None:
                 name = get_myname()
             tlvdata.send(remote, {'collective': {'operation': 'connect',
-                                                 'protover': reqver,
                                                  'name': name,
                                                  'txcount': cfm._txcount}})
             keydata = tlvdata.recv(remote)
@@ -131,7 +119,7 @@ def connect_to_leader(cert=None, name=None, leader=None):
             globaldata = tlvdata.recv(remote)
             dbi = tlvdata.recv(remote)
             dbsize = dbi['dbsize']
-            dbjson = b''
+            dbjson = ''
             while (len(dbjson) < dbsize):
                 ndata = remote.recv(dbsize - len(dbjson))
                 if not ndata:
@@ -160,15 +148,15 @@ def connect_to_leader(cert=None, name=None, leader=None):
                 raise
             currentleader = leader
         #spawn this as a thread...
-        follower = eventlet.spawn(follow_leader, remote, pvers)
+        follower = eventlet.spawn(follow_leader, remote)
     return True
 
 
-def follow_leader(remote, proto):
+def follow_leader(remote):
     global currentleader
     cleanexit = False
     try:
-        cfm.follow_channel(remote, proto)
+        cfm.follow_channel(remote)
     except greenlet.GreenletExit:
         cleanexit = True
     finally:
@@ -220,7 +208,8 @@ def handle_connection(connection, cert, request, local=False):
     else:
         if not local:
             return
-        if operation in ('show', 'delete'):
+
+        if 'show' == operation:
             if not list(cfm.list_collective()):
                 tlvdata.send(connection,
                              {'collective': {'error': 'Collective mode not '
@@ -257,23 +246,7 @@ def handle_connection(connection, cert, request, local=False):
                 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()
+            tlvdata.send(connection, {'collective':  collinfo})
             return
         if 'invite' == operation:
             try:
@@ -294,8 +267,7 @@ def handle_connection(connection, cert, request, local=False):
             invitation = request['invitation']
             try:
                 invitation = base64.b64decode(invitation)
-                name, invitation = invitation.split(b'@', 1)
-                name = util.stringify(name)
+                name, invitation = invitation.split('@', 1)
             except Exception:
                 tlvdata.send(
                     connection,
@@ -403,7 +375,7 @@ def handle_connection(connection, cert, request, local=False):
             connection.close()
             return
         if (currentleader == connection.getpeername()[0] and
-                follower and not follower.dead):
+                follower and follower.isAlive()):
             # if we are happily following this leader already, don't stir
             # the pot
             tlvdata.send(connection, {'status': 0})
@@ -430,7 +402,6 @@ def handle_connection(connection, cert, request, local=False):
         tlvdata.send(connection, collinfo)
     if 'connect' == operation:
         drone = request['name']
-        folver = request.get('protover', 2)
         droneinfo = cfm.get_collective_member(drone)
         if not (droneinfo and util.cert_matches(droneinfo['fingerprint'],
                                                 cert)):
@@ -479,7 +450,7 @@ def handle_connection(connection, cert, request, local=False):
             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, folver):
+        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(),

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,19 +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'),
-    },
-    'api.key': {
-        'description': ('Crypt of api key for self api requests by node'),
-    },
-    'api.armed': {
-        'description': ('Indicates whether an insecure api key request is allowed. '
-                        'The format is an expiration time in ISO8601 format. When '
-                        'the indicated time passes or the first time a node claims '
-                        'the key, key grants will not be allowed.'),
-    },
+    #'type': {
+    #    'description': ('Classification of node as system, vm, etc')
+    #},
     #'id': {
     #    'description': ('Numeric identifier for node')
     #},
@@ -168,11 +158,9 @@ node = {
     },
     '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'),
+                        'upon discovery.  "expiration=no,loginfailures=no" '
+                        'would disable password expiration and login failures '
+                        'triggering a lockout.'
     },
     'discovery.policy': {
         'description':  'Policy to use for auto-configuration of discovered '
@@ -183,7 +171,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 '
@@ -192,9 +179,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',
     },
@@ -274,13 +258,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.'),
-        'validvalues': ('ssh', 'ipmi'),
+                        'the managed node.')
     },
 #    'virtualization.host': {
 #        'description': ('Hypervisor where this node does/should reside'),

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

confluent_server/confluent/consoleserver.py

@@ -94,7 +94,7 @@ def _utf8_normalize(data, shiftin, decoder):
 
 
 def pytechars2line(chars, maxlen=None):
-    line = b'\x1b[m'  # start at default params
+    line = '\x1b[m'  # start at default params
     lb = False  # last bold
     li = False  # last italic
     lu = False  # last underline
@@ -106,7 +106,7 @@ def pytechars2line(chars, maxlen=None):
     len = 1
     for charidx in range(maxlen):
         char = chars[charidx]
-        csi = bytearray([])
+        csi = []
         if char.fg != lfg:
             csi.append(30 + pytecolors2ansi[char.fg])
             lfg = char.fg
@@ -129,13 +129,10 @@ def pytechars2line(chars, maxlen=None):
             lr = char.reverse
             csi.append(7 if lr else 27)
         if csi:
-            line += b'\x1b[' + b';'.join(['{0}'.format(x).encode('utf-8') for x in csi]) + b'm'
-        if not hasdata and char.data.rstrip():
+            line += b'\x1b[' + b';'.join(['{0}'.format(x) for x in csi]) + b'm'
+        if not hasdata and char.data.encode('utf-8').rstrip():
             hasdata = True
-        chardata = char.data
-        if not isinstance(chardata, bytes):
-            chardata = chardata.encode('utf-8')
-        line += chardata
+        line += char.data.encode('utf-8')
         if maxlen and len >= maxlen:
             break
         len += 1
@@ -150,7 +147,6 @@ class ConsoleHandler(object):
 
     def __init__(self, node, configmanager, width=80, height=24):
         self.clearpending = False
-        self.clearerror = False
         self.initsize = (width, height)
         self._dologging = True
         self._is_local = True
@@ -188,7 +184,7 @@ class ConsoleHandler(object):
         if termstate & 1:
             self.appmodedetected = True
         if termstate & 2:
-            self.shiftin = b'0'
+            self.shiftin = '0'
         self.users = {}
         self._attribwatcher = None
         self._console = None
@@ -213,8 +209,6 @@ class ConsoleHandler(object):
         return retrytime + (retrytime * random.random())
 
     def feedbuffer(self, data):
-        if not isinstance(data, bytes):
-            data = data.encode('utf-8')
         try:
             self.termstream.feed(data)
         except StopIteration:  # corrupt parser state, start over
@@ -314,11 +308,8 @@ class ConsoleHandler(object):
 
     def clearbuffer(self):
         self.feedbuffer(
-            '\x1bc[No data has been received from the remote console since ' \
-            'connecting.  This could\r\nbe due to having the console.logging ' \
-            'attribute set to none or interactive,\r\nserial console not '  \
-            'being enabled or incorrectly configured in the OS or\r\nfirmware, ' \
-            'or the console simply not having any output since last connection]')
+            '\x1bc[no replay buffer due to console.logging attribute set to '
+            'none or interactive,\r\nconnection loss, or service restart]')
         self.clearpending = True
 
     def _detach(self):
@@ -380,20 +371,7 @@ class ConsoleHandler(object):
             self.error = 'misconfigured'
             self._send_rcpts({'connectstate': self.connectstate,
                               'error': self.error})
-            self.feedbuffer(
-                '\x1bc\x1b[2J\x1b[1;1H[The console.method attribute for this node is '
-                'not configured,\r\nset it to a valid value for console '
-                'function]')
-            self._send_rcpts(
-                '\x1bc\x1b[2J\x1b[1;1H[The console.method attribute for this node is '
-                'not configured,\r\nset it to a valid value for console '
-                'function]')
-            self.clearerror = True
             return
-        if self.clearerror:
-            self.clearerror = False
-            self.clearbuffer()
-            self._send_rcpts(b'\x1bc\x1b[2J\x1b[1;1H')
         self.send_break = self._console.send_break
         self.resize = self._console.resize
         if self._attribwatcher:
@@ -453,7 +431,6 @@ class ConsoleHandler(object):
 
     def _got_disconnected(self):
         if self.connectstate != 'unconnected':
-            self._console.close()
             self.connectstate = 'unconnected'
             self.log(
                 logdata='console disconnected', ltype=log.DataTypes.event,
@@ -531,19 +508,17 @@ class ConsoleHandler(object):
             if data == conapi.ConsoleEvent.Disconnect:
                 self._got_disconnected()
             return
-        elif data in (b'', u''):
+        elif data == '':
             # ignore empty strings from a cconsole provider
             return
-        if not isinstance(data, bytes):
-            data = data.encode('utf-8')
-        if b'\x1b[?1l' in data:  # request for ansi mode cursor keys
+        if '\x1b[?1l' in data:  # request for ansi mode cursor keys
             self.appmodedetected = False
-        if b'\x1b[?1h' in data:  # remember the session wants the client to use
+        if '\x1b[?1h' in data:  # remember the session wants the client to use
             # 'application mode'  Thus far only observed on esxi
             self.appmodedetected = True
-        if b'\x1b)0' in data:
+        if '\x1b)0' in data:
             # console indicates it wants access to special drawing characters
-            self.shiftin = b'0'
+            self.shiftin = '0'
         eventdata = 0
         if self.appmodedetected:
             eventdata |= 1
@@ -552,11 +527,10 @@ class ConsoleHandler(object):
         # TODO: analyze buffer for registered events, examples:
         #   panics
         #   certificate signing request
-        if self.clearpending or self.clearerror:
+        if self.clearpending:
             self.clearpending = False
-            self.clearerror = False
-            self.feedbuffer(b'\x1bc\x1b[2J\x1b[1;1H')
-            self._send_rcpts(b'\x1bc\x1b[2J\x1b[1;1H')
+            self.feedbuffer(b'\x1bc')
+            self._send_rcpts(b'\x1bc')
         self._send_rcpts(_utf8_normalize(data, self.shiftin, self.utf8decoder))
         self.log(data, eventdata=eventdata)
         self.lasttime = util.monotonic_time()
@@ -596,30 +570,25 @@ class ConsoleHandler(object):
                 if pendingbl:
                     retdata += pendingbl
                     pendingbl = b''
-                retdata += nline + b'\r\n'
+                retdata += nline + '\r\n'
             else:
-                pendingbl += nline + b'\r\n'
+                pendingbl += nline + '\r\n'
         if len(retdata) >  6:
             retdata = retdata[:-2]  # remove the last \r\n
-        cursordata = '\x1b[{0};{1}H'.format(self.buffer.cursor.y + 1,
-                                            self.buffer.cursor.x + 1)
-        if not isinstance(cursordata, bytes):
-            cursordata = cursordata.encode('utf-8')
-        retdata += cursordata
+        retdata += b'\x1b[{0};{1}H'.format(self.buffer.cursor.y + 1,
+                                           self.buffer.cursor.x + 1)
         if self.shiftin is not None:  # detected that terminal requested a
             # shiftin character set, relay that to the terminal that cannected
-            retdata += b'\x1b)' + self.shiftin
+            retdata += '\x1b)' + self.shiftin
         if self.appmodedetected:
-            retdata += b'\x1b[?1h'
+            retdata += '\x1b[?1h'
         else:
-            retdata += b'\x1b[?1l'
+            retdata += '\x1b[?1l'
         return retdata, connstate
 
     def write(self, data):
         if self.connectstate == 'connected':
             try:
-                if isinstance(data, str) and not isinstance(data, bytes):
-                    data = data.encode('utf-8')
                 self._console.write(data)
             except Exception:
                 _tracelog.log(traceback.format_exc(), ltype=log.DataTypes.event,
@@ -634,14 +603,11 @@ def disconnect_node(node, configmanager):
         del _handled_consoles[consk]
 
 
-def _nodechange(added, deleting, renamed, configmanager):
-    for node in deleting:
-        disconnect_node(node, configmanager)
-    for node in renamed:
-        disconnect_node(node, configmanager)
-        connect_node(renamed[node], configmanager)
+def _nodechange(added, deleting, configmanager):
     for node in added:
         connect_node(node, configmanager)
+    for node in deleting:
+        disconnect_node(node, configmanager)
 
 
 def _start_tenant_sessions(cfm):

confluent_server/confluent/core.py

@@ -35,7 +35,6 @@
 
 import confluent
 import confluent.alerts as alerts
-import confluent.log as log
 import confluent.tlvdata as tlvdata
 import confluent.config.attributes as attrscheme
 import confluent.config.configmanager as cfm
@@ -63,10 +62,8 @@ import itertools
 import os
 try:
     import cPickle as pickle
-    pargs = {}
 except ImportError:
     import pickle
-    pargs = {'encoding': 'utf-8'}
 import socket
 import struct
 import sys
@@ -88,10 +85,7 @@ def seek_element(currplace, currkey):
 
 def nested_lookup(nestdict, key):
     try:
-        currloc = nestdict
-        for currk in key:
-            currloc = seek_element(currloc, currk)
-        return currloc
+        return reduce(seek_element, key, nestdict)
     except TypeError:
         raise exc.NotFoundException("Invalid element requested")
 
@@ -111,8 +105,6 @@ def load_plugins():
         for plugin in os.listdir(plugindir):
             if plugin.startswith('.'):
                 continue
-            if '__pycache__' in plugin:
-                continue
             (plugin, plugtype) = os.path.splitext(plugin)
             if plugtype == '.sh':
                 pluginmap[plugin] = shellmodule.Plugin(
@@ -131,7 +123,7 @@ def load_plugins():
 
 
 rootcollections = ['discovery/', 'events/', 'networking/',
-                   'noderange/', 'nodes/', 'nodegroups/', 'usergroups/' , 'users/', 'version']
+                   'noderange/', 'nodes/', 'nodegroups/', 'users/', 'xcat/', 'version']
 
 
 class PluginRoute(object):
@@ -151,7 +143,6 @@ def _init_core():
     # be enumerated in any collection
     noderesources = {
         'attributes': {
-            'rename': PluginRoute({'handler': 'attributes'}),
             'all': PluginRoute({'handler': 'attributes'}),
             'current': PluginRoute({'handler': 'attributes'}),
             'expression': PluginRoute({'handler': 'attributes'}),
@@ -170,10 +161,6 @@ def _init_core():
                         'default': 'ipmi',
                     }),
                 },
-                'clear': PluginRoute({
-                        'pluginattrs': ['hardwaremanagement.method'],
-                        'default': 'ipmi',
-                }),
                 'users': PluginCollection({
                     'pluginattrs': ['hardwaremanagement.method'],
                     'default': 'ipmi',
@@ -182,10 +169,6 @@ def _init_core():
                     'pluginattrs': ['hardwaremanagement.method'],
                     'default': 'ipmi',
                 }),
-                'save_licenses': PluginRoute({
-                    'pluginattrs': ['hardwaremanagement.method'],
-                    'default': 'ipmi',
-                }),
                 'net_interfaces': PluginCollection({
                     'pluginattrs': ['hardwaremanagement.method'],
                     'default': 'ipmi',
@@ -216,16 +199,6 @@ def _init_core():
                         'default': 'ipmi',
                     }),
                 },
-                'extended': {
-                    'all': PluginRoute({
-                        'pluginattrs': ['hardwaremanagement.method'],
-                        'default': 'ipmi',
-                    }),
-                    'advanced': PluginRoute({
-                        'pluginattrs': ['hardwaremanagement.method'],
-                        'default': 'ipmi',
-                    }),                    
-                },
             },
             'storage': {
                 'all': PluginRoute({
@@ -405,8 +378,6 @@ def _init_core():
 
     nodegroupresources = {
         'attributes': {
-            'check': PluginRoute({'handler': 'attributes'}),
-            'rename': PluginRoute({'handler': 'attributes'}),
             'all': PluginRoute({'handler': 'attributes'}),
             'current': PluginRoute({'handler': 'attributes'}),
         },
@@ -422,37 +393,17 @@ def create_user(inputdata, configmanager):
     configmanager.create_user(username, attributemap=inputdata)
 
 
-def create_usergroup(inputdata, configmanager):
-    try:
-        groupname = inputdata['name']
-        del inputdata['name']
-    except (KeyError, ValueError):
-        raise exc.InvalidArgumentException()
-    configmanager.create_usergroup(groupname)
-
-
-def update_usergroup(groupname, attribmap, configmanager):
-    try:
-        configmanager.set_usergroup(groupname, attribmap)
-    except ValueError as e:
-        raise exc.InvalidArgumentException(str(e))
-
 def update_user(name, attribmap, configmanager):
     try:
         configmanager.set_user(name, attribmap)
-    except ValueError as e:
-        raise exc.InvalidArgumentException(str(e))
+    except ValueError:
+        raise exc.InvalidArgumentException()
 
 
-def show_usergroup(groupname, configmanager):
-    groupinfo = configmanager.get_usergroup(groupname)
-    for attr in groupinfo:
-        yield msg.Attributes(kv={attr: groupinfo[attr]})
-
 def show_user(name, configmanager):
     userobj = configmanager.get_user(name)
     rv = {}
-    for attr in attrscheme.user:
+    for attr in attrscheme.user.iterkeys():
         rv[attr] = None
         if attr == 'password':
             if 'cryptpass' in userobj:
@@ -465,10 +416,6 @@ def show_user(name, configmanager):
                 rv[attr] = userobj[attr]
             yield msg.Attributes(kv={attr: rv[attr]},
                                  desc=attrscheme.user[attr]['description'])
-    if 'role' in userobj:
-        yield msg.Attributes(kv={'role': userobj['role']})
-
-
 
 
 def stripnode(iterablersp, node):
@@ -501,10 +448,6 @@ def delete_user(user, configmanager):
     configmanager.del_user(user)
     yield msg.DeletedResource(user)
 
-def delete_usergroup(usergroup, configmanager):
-    configmanager.del_usergroup(usergroup)
-    yield msg.DeletedResource(usergroup)
-
 
 def delete_nodegroup_collection(collectionpath, configmanager):
     if len(collectionpath) == 2:  # just the nodegroup
@@ -689,10 +632,7 @@ def handle_dispatch(connection, cert, dispatch, peername):
             cfm.get_collective_member(peername)['fingerprint'], cert):
         connection.close()
         return
-    pversion = 0
-    if bytearray(dispatch)[0] == 0x80:
-        pversion = bytearray(dispatch)[1]
-    dispatch = pickle.loads(dispatch, **pargs)
+    dispatch = pickle.loads(dispatch)
     configmanager = cfm.ConfigManager(dispatch['tenant'])
     nodes = dispatch['nodes']
     inputdata = dispatch['inputdata']
@@ -711,7 +651,7 @@ def handle_dispatch(connection, cert, dispatch, peername):
                 plugpath = nodeattr[node][attrname]['value']
             elif 'default' in plugroute:
                 plugpath = plugroute['default']
-        if plugpath:
+        if plugpath is not None:
             try:
                 hfunc = getattr(pluginmap[plugpath], operation)
             except KeyError:
@@ -728,18 +668,14 @@ def handle_dispatch(connection, cert, dispatch, peername):
                 configmanager=configmanager,
                 inputdata=inputdata))
         for res in itertools.chain(*passvalues):
-            _forward_rsp(connection, res, pversion)
+            _forward_rsp(connection, res)
     except Exception as res:
-        _forward_rsp(connection, res, pversion)
+        _forward_rsp(connection, res)
     connection.sendall('\x00\x00\x00\x00\x00\x00\x00\x00')
 
 
-def _forward_rsp(connection, res, pversion):
-    try:
-        r = pickle.dumps(res, protocol=pversion)
-    except TypeError:
-        r = pickle.dumps(Exception(
-            'Cannot serialize error, check collective.manager error logs for details' + str(res)), protocol=pversion)
+def _forward_rsp(connection, res):
+    r = pickle.dumps(res)
     rlen = len(r)
     if not rlen:
         return
@@ -749,8 +685,6 @@ def _forward_rsp(connection, res, pversion):
 
 def handle_node_request(configmanager, inputdata, operation,
                         pathcomponents, autostrip=True):
-    if log.logfull:
-        raise exc.TargetResourceUnavailable('Filesystem full, free up space and restart confluent service')
     iscollection = False
     routespec = None
     if pathcomponents[0] == 'noderange':
@@ -875,7 +809,7 @@ def handle_node_request(configmanager, inputdata, operation,
                 elif list(cfm.list_collective()):
                     badcollnodes.append(node)
                     continue
-            if plugpath:
+            if plugpath is not None:
                 try:
                     hfunc = getattr(pluginmap[plugpath], operation)
                 except KeyError:
@@ -948,7 +882,7 @@ def dispatch_request(nodes, manager, element, configmanager, inputdata,
     a = configmanager.get_collective_member(manager)
     try:
         remote = socket.create_connection((a['address'], 13001))
-        remote.settimeout(180)
+        remote.settimeout(90)
         remote = ssl.wrap_socket(remote, cert_reqs=ssl.CERT_NONE,
                                  keyfile='/etc/confluent/privkey.pem',
                                  certfile='/etc/confluent/srvcert.pem')
@@ -968,20 +902,12 @@ def dispatch_request(nodes, manager, element, configmanager, inputdata,
     if not util.cert_matches(a['fingerprint'], remote.getpeercert(
             binary_form=True)):
         raise Exception("Invalid certificate on peer")
-    banner = tlvdata.recv(remote)
-    vers = banner.split()[2]
-    if vers == b'v0':
-        pvers = 2
-    elif vers == b'v1':
-        pvers = 4
-    if sys.version_info[0] < 3:
-        pvers = 2
+    tlvdata.recv(remote)
     tlvdata.recv(remote)
     myname = collective.get_myname()
     dreq = pickle.dumps({'name': myname, 'nodes': list(nodes),
                          'path': element,'tenant': configmanager.tenant,
-                         'operation': operation, 'inputdata': inputdata},
-                         protocol=pvers)
+                         'operation': operation, 'inputdata': inputdata})
     tlvdata.send(remote, {'dispatch': {'name': myname, 'length': len(dreq)}})
     remote.sendall(dreq)
     while True:
@@ -1028,10 +954,7 @@ def dispatch_request(nodes, manager, element, configmanager, inputdata,
                             a['name']))
                 return
             rsp += nrsp
-        try:
-            rsp = pickle.loads(rsp, **pargs)
-        except UnicodeDecodeError:
-            rsp = pickle.loads(rsp, encoding='latin1')
+        rsp = pickle.loads(rsp)
         if isinstance(rsp, Exception):
             raise rsp
         yield rsp
@@ -1054,6 +977,16 @@ def handle_path(path, operation, configmanager, inputdata=None, autostrip=True):
     """
     pathcomponents = path.split('/')
     del pathcomponents[0]  # discard the value from leading /
+    xcat_url = False
+    if pathcomponents and pathcomponents[0] == 'xcat':
+        xcat_url = True
+        if 'xcat/' in rootcollections: 
+            rootcollections.remove('xcat/')
+        del pathcomponents[0]
+    elif 'xcat/' not in rootcollections:
+            rootcollections.insert(-1, 'xcat/')
+    if xcat_url:
+        configmanager.log("Start to deal with xCAT URL: %s" % path)
     if pathcomponents[-1] == '':
         del pathcomponents[-1]
     if not pathcomponents:  # root collection list
@@ -1077,31 +1010,6 @@ def handle_path(path, operation, configmanager, inputdata=None, autostrip=True):
             configmanager, inputdata, operation, pathcomponents)
     elif pathcomponents[0] == 'version':
         return (msg.Attributes(kv={'version': confluent.__version__}),)
-    elif pathcomponents[0] == 'usergroups':
-        # TODO: when non-administrator accounts exist,
-        # they must only be allowed to see their own user
-        try:
-            usergroup = pathcomponents[1]
-        except IndexError:  # it's just users/
-            if operation == 'create':
-                inputdata = msg.get_input_message(
-                    pathcomponents, operation, inputdata,
-                    configmanager=configmanager)
-                create_usergroup(inputdata.attribs, configmanager)
-            return iterate_collections(configmanager.list_usergroups(),
-                                       forcecollection=False)
-        if usergroup not in configmanager.list_usergroups():
-            raise exc.NotFoundException("Invalid usergroup %s" % usergroup)
-        if operation == 'retrieve':
-            return show_usergroup(usergroup, configmanager)
-        elif operation == 'delete':
-            return delete_usergroup(usergroup, configmanager)
-        elif operation == 'update':
-            inputdata = msg.get_input_message(
-                pathcomponents, operation, inputdata,
-                configmanager=configmanager)
-            update_usergroup(usergroup, inputdata.attribs, configmanager)
-            return show_usergroup(usergroup, configmanager)
     elif pathcomponents[0] == 'users':
         # TODO: when non-administrator accounts exist,
         # they must only be allowed to see their own user

confluent_server/confluent/credserver.py

@@ -1,87 +0,0 @@
-# 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 confluent.config.configmanager as cfm
-import datetime
-import eventlet
-import eventlet.green.socket as socket
-import eventlet.greenpool
-import os
-
-class CredServer(object):
-    def __init__(self, bindhost='::', bindport=301, ttl=1):
-        self.srv = socket.socket(socket.AF_INET6)
-        self.srv.setsockopt(socket.SOL_IP, socket.IP_TTL, ttl)
-        self.srv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.srv.bind((bindhost, bindport))
-        self.srv.listen(32)
-        self.gpool = eventlet.greenpool.GreenPool(256)
-        self.cfm = cfm.ConfigManager(None)
-        self.runtime = eventlet.spawn(self.listen)
-
-    def listen(self):
-        while True:
-            client, info = self.srv.accept()
-            if info[1] > 1023:
-                client.close()
-                continue
-            self.gpool.spawn_n(self.handle_client, client)
-    
-    def handle_client(self, client):
-            client.send('\xc2\xd1-\xa8\x80\xd8j\xba')
-            tlv = bytearray(client.recv(2))
-            if tlv[0] != 1:
-                client.close()
-                return
-            nodename = client.recv(tlv[1])
-            tlv = bytearray(client.recv(2))
-            apiarmed = self.cfm.get_node_attributes(nodename, 'api.armed')
-            apiarmed = apiarmed.get(nodename, {}).get('api.armed', {}).get('value', None)
-            if not apiarmed:
-                client.close()
-                return
-            now = datetime.datetime.utcnow()
-            expiry = datetime.datetime.strptime(apiarmed, "%Y-%m-%dT%H:%M:%SZ")
-            if now > expiry:
-                self.cfm.set_node_attributes({nodename: {'api.armed': ''}})
-                client.close()
-                return
-            client.send(b'\x02\x20')
-            rttoken = os.urandom(32)
-            client.send(rttoken)
-            client.send('\x00\x00')
-            tlv = bytearray(client.recv(2))
-            if tlv[0] != 3:
-                client.close()
-                return
-            echotoken = client.recv(tlv[1])
-            if echotoken != rttoken:
-                client.close()
-                return
-            tlv = bytearray(client.recv(2))
-            if tlv[0] != 4:
-                client.close()
-                return
-            echotoken = client.recv(tlv[1])
-            self.cfm.set_node_attributes({nodename: {'api.key': echotoken, 'api.armed': ''}})
-            client.recv(2)  # drain end of message
-            client.send('\x05\x00') # report success     
-            client.close()
-
-if __name__ == '__main__':
-    a = CredServer()
-    while True:
-        eventlet.sleep(86400)

confluent_server/confluent/discovery/core.py

@@ -63,13 +63,10 @@
 
 import base64
 import confluent.config.configmanager as cfm
-import confluent.collective.manager as collective
 import confluent.discovery.protocols.pxe as pxe
-import confluent.discovery.protocols.ssdp as ssdp
+#import confluent.discovery.protocols.ssdp as ssdp
 import confluent.discovery.protocols.slp as slp
 import confluent.discovery.handlers.imm as imm
-import confluent.discovery.handlers.cpstorage as cpstorage
-import confluent.discovery.handlers.tsm as tsm
 import confluent.discovery.handlers.pxe as pxeh
 import confluent.discovery.handlers.smm as smm
 import confluent.discovery.handlers.xcc as xcc
@@ -91,11 +88,6 @@ import eventlet.semaphore
 autosensors = set()
 scanner = None
 
-try:
-    unicode
-except NameError:
-    unicode = str
-
 class nesteddict(dict):
 
     def __missing__(self, key):
@@ -108,8 +100,6 @@ nodehandlers = {
     'service:management-hardware.IBM:integrated-management-module2': imm,
     'pxe-client': pxeh,
     'service:io-device.Lenovo:management-module': None,
-    'service:thinkagile-storage': cpstorage,
-    'service:lenovo-tsm': tsm,
 }
 
 servicenames = {
@@ -118,8 +108,6 @@ servicenames = {
     'service:management-hardware.Lenovo:lenovo-xclarity-controller': 'lenovo-xcc',
     'service:management-hardware.IBM:integrated-management-module2': 'lenovo-imm2',
     'service:io-device.Lenovo:management-module': 'lenovo-switch',
-    'service:thinkagile-storage': 'thinkagile-storagebmc',
-    'service:lenovo-tsm': 'lenovo-tsm',
 }
 
 servicebyname = {
@@ -128,8 +116,6 @@ servicebyname = {
     'lenovo-xcc': 'service:management-hardware.Lenovo:lenovo-xclarity-controller',
     'lenovo-imm2': 'service:management-hardware.IBM:integrated-management-module2',
     'lenovo-switch': 'service:io-device.Lenovo:management-module',
-    'thinkagile-storage': 'service:thinkagile-storagebmc',
-    'lenovo-tsm': 'service:lenovo-tsm',
 }
 
 discopool = eventlet.greenpool.GreenPool(500)
@@ -376,7 +362,7 @@ def handle_autosense_config(operation, inputdata):
         yield msg.KeyValueData({'enabled': autosense})
     elif operation == 'update':
         enabled = inputdata['enabled']
-        if type(enabled) in (unicode, bytes):
+        if type(enabled) in (unicode, str):
             enabled = enabled.lower() in ('true', '1', 'y', 'yes', 'enable',
                                           'enabled')
         if autosense == enabled:
@@ -710,8 +696,7 @@ def detected(info):
 
 def b64tohex(b64str):
     bd = base64.b64decode(b64str)
-    bd = bytearray(bd)
-    return ''.join(['{0:02x}'.format(x) for x in bd])
+    return ''.join(['{0:02x}'.format(ord(x)) for x in bd])
 
 
 def get_enclosure_chain_head(nodename, cfg):
@@ -871,8 +856,6 @@ def get_nodename_from_chained_smms(cfg, handler, info):
                 nodename = newnodename
     return nodename
 
-def get_node_by_uuid(uuid):
-    return nodes_by_uuid.get(uuid, None)
 
 def get_nodename_from_enclosures(cfg, info):
     nodename = None
@@ -897,7 +880,7 @@ def eval_node(cfg, handler, info, nodename, manual=False):
         handler.probe()  # unicast interrogation as possible to get more data
         # switch concurrently
         # do some preconfig, for example, to bring a SMM online if applicable
-        handler.preconfig(nodename)
+        handler.preconfig()
     except Exception as e:
         unknown_info[info['hwaddr']] = info
         info['discostatus'] = 'unidentified'
@@ -1072,14 +1055,6 @@ def discover_node(cfg, handler, info, nodename, manual):
                 traceback.print_exc()
                 return False
             newnodeattribs = {}
-            if cfm.list_collective():
-                # We are in a collective, check collective.manager
-                cmc = cfg.get_node_attributes(nodename, 'collective.manager')
-                cm = cmc.get(nodename, {}).get('collective.manager', {}).get('value', None)
-                if not cm:
-                    # Node is being discovered in collective, but no collective.manager, default
-                    # to the collective member actually able to execute the discovery
-                    newnodeattribs['collective.manager'] = collective.get_myname()
             if 'uuid' in info:
                 newnodeattribs['id.uuid'] = info['uuid']
             if 'serialnumber' in info:
@@ -1154,18 +1129,10 @@ def _handle_nodelist_change(configmanager):
         nodeaddhandler = None
 
 
-def newnodes(added, deleting, renamed, configmanager):
+def newnodes(added, deleting, configmanager):
     global attribwatcher
     global needaddhandled
     global nodeaddhandler
-    alldeleting = set(deleting) | set(renamed)
-    for node in alldeleting:
-        if node not in known_nodes:
-            continue
-        for mac in known_nodes[node]:
-            if mac in known_info:
-                del known_info[mac]
-        del known_nodes[node]
     _map_unique_ids()
     configmanager.remove_watcher(attribwatcher)
     allnodes = configmanager.list_nodes()
@@ -1215,7 +1182,6 @@ def rescan():
 def start_detection():
     global attribwatcher
     global rechecker
-    global rechecktime
     _map_unique_ids()
     cfg = cfm.ConfigManager(None)
     allnodes = cfg.list_nodes()
@@ -1230,7 +1196,8 @@ def start_detection():
     if rechecker is None:
         rechecktime = util.monotonic_time() + 900
         rechecker = eventlet.spawn_after(900, _periodic_recheck, cfg)
-    eventlet.spawn_n(ssdp.snoop, None, None, ssdp, get_node_by_uuid)
+
+    # eventlet.spawn_n(ssdp.snoop, safe_detected)
 
 def stop_autosense():
     for watcher in list(autosensors):

confluent_server/confluent/discovery/handlers/bmc.py

@@ -26,27 +26,16 @@ ipmicommand.session.threading = eventlet.green.threading
 ipmicommand.session.socket.getaddrinfo = eventlet.support.greendns.getaddrinfo
 getaddrinfo = eventlet.support.greendns.getaddrinfo
 
+DEFAULT_USER = 'USERID'
+DEFAULT_PASS = 'PASSW0RD'
 
 
 class NodeHandler(generic.NodeHandler):
-    DEFAULT_USER = 'USERID'
-    DEFAULT_PASS = 'PASSW0RD'
 
-    def _get_ipmicmd(self, user=None, password=None):
-        priv = None
-        if user is None or password is None:
-            if self.trieddefault:
-                raise pygexc.IpmiException()
-            priv = 4  # manually indicate priv to avoid double-attempt
-        if user is None:
-            user = self.DEFAULT_USER
-        if password is None:
-            password = self.DEFAULT_PASS
-        return ipmicommand.Command(self.ipaddr, user, password,
-                                   privlevel=priv, keepalive=False)
+    def _get_ipmicmd(self, user=DEFAULT_USER, password=DEFAULT_PASS):
+        return ipmicommand.Command(self.ipaddr, user, password)
 
     def __init__(self, info, configmanager):
-        self.trieddefault = None
         super(NodeHandler, self).__init__(info, configmanager)
 
     def probe(self):
@@ -56,37 +45,37 @@ class NodeHandler(generic.NodeHandler):
     def config(self, nodename, reset=False):
         self._bmcconfig(nodename, reset)
 
-    def _bmcconfig(self, nodename, reset=False, customconfig=None, vc=None):
+    def _bmcconfig(self, nodename, reset=False, customconfig=None):
         # TODO(jjohnson2): set ip parameters, user/pass, alert cfg maybe
         # In general, try to use https automation, to make it consistent
         # between hypothetical secure path and today.
-        creds = self.configmanager.get_node_attributes(
-            nodename,
-            ['secret.hardwaremanagementuser',
-             'secret.hardwaremanagementpassword'], decrypt=True)
-        user = creds.get(nodename, {}).get(
-            'secret.hardwaremanagementuser', {}).get('value', None)
-        passwd = creds.get(nodename, {}).get(
-            'secret.hardwaremanagementpassword', {}).get('value', None)
         try:
             ic = self._get_ipmicmd()
-            passwd = self.DEFAULT_PASS
+            passwd = DEFAULT_PASS
         except pygexc.IpmiException as pi:
+            creds = self.configmanager.get_node_attributes(
+                nodename,
+                ['secret.hardwaremanagementuser',
+                 'secret.hardwaremanagementpassword'], decrypt=True)
+            user = creds.get(nodename, {}).get(
+                'secret.hardwaremanagementuser', {}).get('value', None)
             havecustomcreds = False
-            if user is not None and user != self.DEFAULT_USER:
+            if user is not None and user != DEFAULT_USER:
                 havecustomcreds = True
             else:
-                user = self.DEFAULT_USER
-            if passwd is not None and passwd != self.DEFAULT_PASS:
+                user = DEFAULT_USER
+            passwd = creds.get(nodename, {}).get(
+                'secret.hardwaremanagementpassword', {}).get('value', None)
+            if passwd is not None and passwd != DEFAULT_PASS:
                 havecustomcreds = True
             else:
-                passwd = self.DEFAULT_PASS
+                passwd = DEFAULT_PASS
             if havecustomcreds:
                 ic = self._get_ipmicmd(user, passwd)
             else:
                 raise
-        if vc:
-            ic.register_key_handler(vc)
+        if customconfig:
+            customconfig(ic)
         currusers = ic.get_users()
         lanchan = ic.get_network_channel()
         userdata = ic.xraw_command(netfn=6, command=0x44, data=(lanchan,
@@ -106,6 +95,29 @@ class NodeHandler(generic.NodeHandler):
             raise exc.TargetEndpointBadCredentials(
                 'secret.hardwaremanagementuser and/or '
                 'secret.hardwaremanagementpassword was not configured')
+        if ('hardwaremanagement.manager' in cd and
+                cd['hardwaremanagement.manager']['value'] and
+                not cd['hardwaremanagement.manager']['value'].startswith(
+                    'fe80::')):
+            newip = cd['hardwaremanagement.manager']['value']
+            newipinfo = getaddrinfo(newip, 0)[0]
+            # This getaddrinfo is repeated in get_nic_config, could be
+            # optimized, albeit with a more convoluted api..
+            newip = newipinfo[-1][0]
+            if ':' in newip:
+                raise exc.NotImplementedException('IPv6 remote config TODO')
+            netconfig = netutil.get_nic_config(cfg, nodename, ip=newip)
+            plen = netconfig['prefix']
+            newip = '{0}/{1}'.format(newip, plen)
+            ic.set_net_configuration(ipv4_address=newip,
+                                     ipv4_configuration='static',
+                                     ipv4_gateway=netconfig['ipv4_gateway'])
+        elif self.ipaddr.startswith('fe80::'):
+            cfg.set_node_attributes(
+                {nodename: {'hardwaremanagement.manager': self.ipaddr}})
+        else:
+            raise exc.TargetEndpointUnreachable(
+                'hardwaremanagement.manager must be set to desired address')
         newuser = cd['secret.hardwaremanagementuser']['value']
         newpass = cd['secret.hardwaremanagementpassword']['value']
         for uid in currusers:
@@ -114,9 +126,6 @@ class NodeHandler(generic.NodeHandler):
                 newuserslot = uid
                 if newpass != passwd:  # don't mess with existing if no change
                     ic.set_user_password(newuserslot, password=newpass)
-                    ic = self._get_ipmicmd(user, passwd)
-                    if vc:
-                        ic.register_key_handler(vc)
                 break
         else:
             newuserslot = lockedusers + 1
@@ -125,14 +134,8 @@ class NodeHandler(generic.NodeHandler):
             if newpass != passwd:  # don't mess with existing if no change
                 ic.set_user_password(newuserslot, password=newpass)
             ic.set_user_name(newuserslot, newuser)
-            if havecustomcreds:
-                ic = self._get_ipmicmd(user, passwd)
-                if vc:
-                    ic.register_key_handler(vc)
-            #We are remote operating on the account we are
-            #using, no need to try to set user access
-            #ic.set_user_access(newuserslot, lanchan,
-            #                   privilege_level='administrator')
+            ic.set_user_access(newuserslot, lanchan,
+                               privilege_level='administrator')
         # Now to zap others
         for uid in currusers:
             if uid != newuserslot:
@@ -153,36 +156,6 @@ class NodeHandler(generic.NodeHandler):
                             # name...
                             # the user will remain, but that is life
                             raise
-        if customconfig:
-            customconfig(ic)
-        if ('hardwaremanagement.manager' in cd and
-                cd['hardwaremanagement.manager']['value'] and
-                not cd['hardwaremanagement.manager']['value'].startswith(
-                    'fe80::')):
-            newip = cd['hardwaremanagement.manager']['value']
-            newipinfo = getaddrinfo(newip, 0)[0]
-            # This getaddrinfo is repeated in get_nic_config, could be
-            # optimized, albeit with a more convoluted api..
-            newip = newipinfo[-1][0]
-            if ':' in newip:
-                raise exc.NotImplementedException('IPv6 remote config TODO')
-            netconfig = netutil.get_nic_config(cfg, nodename, ip=newip)
-            plen = netconfig['prefix']
-            newip = '{0}/{1}'.format(newip, plen)
-            currcfg = ic.get_net_configuration()
-            if currcfg['ipv4_address'] != newip:
-                # do not change the ipv4_config if the current config looks
-                # like it is already accurate
-                ic.set_net_configuration(ipv4_address=newip,
-                                         ipv4_configuration='static',
-                                         ipv4_gateway=netconfig[
-                                             'ipv4_gateway'])
-        elif self.ipaddr.startswith('fe80::'):
-            cfg.set_node_attributes(
-                {nodename: {'hardwaremanagement.manager': self.ipaddr}})
-        else:
-            raise exc.TargetEndpointUnreachable(
-                'hardwaremanagement.manager must be set to desired address')
         if reset:
             ic.reset_bmc()
         return ic

confluent_server/confluent/discovery/handlers/cpstorage.py

@@ -1,21 +0,0 @@
-# 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 confluent.discovery.handlers.bmc as bmchandler
-
-class NodeHandler(bmchandler.NodeHandler):
-    DEFAULT_USER = 'admin'
-    DEFAULT_PASS = 'admin'
-    devname = 'BMC'
-    maxmacs = 2

confluent_server/confluent/discovery/handlers/generic.py

@@ -57,7 +57,7 @@ class NodeHandler(object):
         # serial number and uuid to flesh out data as needed
         return
 
-    def preconfig(self, possiblenode):
+    def preconfig(self):
         return
 
     def discoverable_by_switch(self, macs):
@@ -68,23 +68,6 @@ class NodeHandler(object):
     def _savecert(self, certificate):
         self._fp = certificate
         return True
-    
-    def get_node_credentials(self, nodename, creds, defuser, defpass):
-        user = creds.get(nodename, {}).get(
-            'secret.hardwaremanagementuser', {}).get('value', None)
-        havecustomcreds = False
-        if user is not None and user != defuser:
-            havecustomcreds = True
-        else:
-            user = defuser
-        passwd = creds.get(nodename, {}).get(
-            'secret.hardwaremanagementpassword', {}).get('value', None)
-        if passwd is not None and passwd != defpass:
-            havecustomcreds = True
-        else:
-            passwd = defpass
-        return user, passwd, not havecustomcreds
-
 
     @property
     def cert_fail_reason(self):

confluent_server/confluent/discovery/handlers/imm.py

@@ -12,11 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import codecs
 import confluent.discovery.handlers.bmc as bmchandler
 import pyghmi.exceptions as pygexc
 import pyghmi.ipmi.private.util as pygutil
-import confluent.util as util
+import string
 import struct
 
 class NodeHandler(bmchandler.NodeHandler):
@@ -26,7 +25,7 @@ class NodeHandler(bmchandler.NodeHandler):
     def adequate(cls, info):
         # We can sometimes receive a partially initialized SLP packet
         # This is not adequate for being satisfied
-        return bool(info.get('attributes', {}))
+        return bool(info['attributes'])
 
     def scan(self):
         slpattrs = self.info.get('attributes', {})
@@ -39,14 +38,13 @@ class NodeHandler(bmchandler.NodeHandler):
         if wronguuid:
             # we need to fix the first three portions of the uuid
             uuidprefix = wronguuid.split('-')[:3]
-            uuidprefix = codecs.encode(struct.pack(
-                '<IHH', *[int(x, 16) for x in uuidprefix]), 'hex')
-            uuidprefix = util.stringify(uuidprefix)
+            uuidprefix = struct.pack(
+                '<IHH', *[int(x, 16) for x in uuidprefix]).encode('hex')
             uuidprefix = uuidprefix[:8] + '-' + uuidprefix[8:12] + '-' + \
                          uuidprefix[12:16]
             self.info['uuid'] = uuidprefix + '-' + '-'.join(
                 wronguuid.split('-')[3:])
-            self.info['uuid'] = self.info['uuid'].lower()
+            self.info['uuid'] = string.lower(self.info['uuid'])
         if ff not in ('dense-computing', 'BC2'):
             # do not probe unless it's a dense platform
             return

confluent_server/confluent/discovery/handlers/smm.py

@@ -12,36 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import codecs
 import confluent.discovery.handlers.bmc as bmchandler
-import confluent.exceptions as exc
-import eventlet
-webclient = eventlet.import_patched('pyghmi.util.webclient')
 import struct
-try:
-    from urllib import urlencode
-except ImportError:
-    from urllib.parse import urlencode
-import eventlet.support.greendns
-import confluent.netutil as netutil
-import confluent.util as util
-getaddrinfo = eventlet.support.greendns.getaddrinfo
-
-from xml.etree.ElementTree import fromstring
 
 def fixuuid(baduuid):
     # SMM dumps it out in hex
     uuidprefix = (baduuid[:8], baduuid[8:12], baduuid[12:16])
-    a = codecs.encode(struct.pack('<IHH', *[int(x, 16) for x in uuidprefix]),
+    a = struct.pack('<IHH', *[int(x, 16) for x in uuidprefix]).encode(
         'hex')
-    a = util.stringify(a)
     uuid = (a[:8], a[8:12], a[12:16], baduuid[16:20], baduuid[20:])
     return '-'.join(uuid).lower()
 
 class NodeHandler(bmchandler.NodeHandler):
     is_enclosure = True
     devname = 'SMM'
-    maxmacs = 6  # support an enclosure, but try to avoid catching daisy chain
+    maxmacs = 5  # support an enclosure, but try to avoid catching daisy chain
 
     def scan(self):
         # the UUID is in a weird order, fix it up to match
@@ -51,147 +36,9 @@ class NodeHandler(bmchandler.NodeHandler):
             uuid = fixuuid(uuid[0])
             self.info['uuid'] = uuid
 
-    def _validate_cert(self, certificate):
-        # Assumption is by the time we call config, that discovery core has
-        # vetted self._fp.  Our job here then is just to make sure that
-        # the currect connection matches the previously saved cert
-        if not self._fp:  # circumstances are that we haven't validated yet
-            self._fp = certificate
-        return certificate == self._fp
-
-    def _webconfigrules(self, wc):
-        rules = []
-        for rule in self.ruleset.split(','):
-            if '=' not in rule:
-                continue
-            name, value = rule.split('=')
-            if value.lower() in ('no', 'none', 'disable', 'disabled'):
-                value = '0'
-            if name.lower() in ('expiry', 'expiration'):
-                rules.append('passwordDurationDays:' + value)
-                warndays = '5' if int(value) > 5 else value
-                rules.append('passwordExpireWarningDays:' + warndays)
-            if name.lower() in ('lockout', 'loginfailures'):
-                rules.append('passwordFailAllowdNum:' + value)
-            if name.lower() == 'reuse':
-                rules.append('passwordReuseCheckNum:' + value)
-        if rules:
-            apirequest = 'set={0}'.format(','.join(rules))
-            wc.request('POST', '/data', apirequest)
-            wc.getresponse().read()
-
-    def _webconfignet(self, wc, nodename):
-        cfg = self.configmanager
-        cd = cfg.get_node_attributes(
-            nodename, ['hardwaremanagement.manager'])
-        smmip = cd.get(nodename, {}).get('hardwaremanagement.manager', {}).get('value', None)
-        if smmip and ':' not in smmip:
-            smmip = getaddrinfo(smmip, 0)[0]
-            smmip = smmip[-1][0]
-            if smmip and ':' in smmip:
-                raise exc.NotImplementedException('IPv6 not supported')
-            netconfig = netutil.get_nic_config(cfg, nodename, ip=smmip)
-            netmask = netutil.cidr_to_mask(netconfig['prefix'])
-            setdata = 'set=ifIndex:0,v4DHCPEnabled:0,v4IPAddr:{0},v4NetMask:{1}'.format(smmip, netmask)
-            gateway = netconfig.get('ipv4_gateway', None)
-            if gateway:
-                setdata += ',v4Gateway:{0}'.format(gateway)
-            wc.request('POST', '/data', setdata)
-            rsp = wc.getresponse()
-            rspdata = rsp.read()
-            if '<statusCode>0' not in rspdata:
-                raise Exception("Error configuring SMM Network")
-            return
-        if smmip and ':' in smmip and not smmip.startswith('fe80::'):
-            raise exc.NotImplementedException('IPv6 configuration TODO')
-        if self.ipaddr.startswith('fe80::'):
-            cfg.set_node_attributes(
-                    {nodename: {'hardwaremanagement.manager': self.ipaddr}})
-
-    def _webconfigcreds(self, username, password):
-        wc = webclient.SecureHTTPConnection(self.ipaddr, 443, verifycallback=self._validate_cert)
-        wc.connect()
-        authdata = {  # start by trying factory defaults
-            'user': 'USERID',
-            'password': 'PASSW0RD',
-        }
-        headers = {'Connection': 'keep-alive', 'Content-Type': 'application/x-www-form-urlencoded'}
-        wc.request('POST', '/data/login', urlencode(authdata), headers)
-        rsp = wc.getresponse()
-        rspdata = util.stringify(rsp.read())
-        if 'authResult>0' not in rspdata:
-            # default credentials are refused, try with the actual
-            authdata['user'] = username
-            authdata['password'] = password
-            wc.request('POST', '/data/login', urlencode(authdata), headers)
-            rsp = wc.getresponse()
-            rspdata = util.stringify(rsp.read())
-            if 'renew_account' in rspdata:
-                raise Exception('Configured password has expired')
-            if 'authResult>0' not in rspdata:
-                raise Exception('Unknown username/password on SMM')
-            tokens = fromstring(rspdata)
-            st2 = tokens.findall('st2')[0].text
-            wc.set_header('ST2', st2)
-            return wc
-        if 'renew_account' in rspdata:
-            passwdchange = {'oripwd': 'PASSW0RD', 'newpwd': password}
-            tokens = fromstring(rspdata)
-            st2 = tokens.findall('st2')[0].text
-            wc.set_header('ST2', st2)
-            wc.request('POST', '/data/changepwd', urlencode(passwdchange))
-            rsp = wc.getresponse()
-            rspdata = rsp.read()
-            authdata['password'] = password
-            wc.request('POST', '/data/login', urlencode(authdata), headers)
-            rsp = wc.getresponse()
-            rspdata = rsp.read()
-        if 'authResult>0' in rspdata:
-            tokens = fromstring(rspdata)
-            st2 = tokens.findall('st2')[0].text
-            wc.set_header('ST2', st2)
-            if username == 'USERID':
-                return wc
-            wc.request('POST', '/data', 'set=user(2,1,{0},511,,4,15,0)'.format(username))
-            rsp = wc.getresponse()
-            rspdata = rsp.read()
-            wc.request('POST', '/data/logout')
-            rsp = wc.getresponse()
-            rspdata = rsp.read()
-            authdata['user'] = username
-            wc.request('POST', '/data/login', urlencode(authdata, headers))
-            rsp = wc.getresponse()
-            rspdata = rsp.read()
-            tokens = fromstring(rspdata)
-            st2 = tokens.findall('st2')[0].text
-            wc.set_header('ST2', st2)
-            return wc
-
     def config(self, nodename):
         # SMM for now has to reset to assure configuration applies
-        dpp = self.configmanager.get_node_attributes(
-            nodename, 'discovery.passwordrules')
-        self.ruleset = dpp.get(nodename, {}).get(
-            'discovery.passwordrules', {}).get('value', '')
-        creds = self.configmanager.get_node_attributes(
-            nodename,
-            ['secret.hardwaremanagementuser',
-             'secret.hardwaremanagementpassword'], decrypt=True)
-        username = creds.get(nodename, {}).get(
-            'secret.hardwaremanagementuser', {}).get('value', 'USERID')
-        passwd = creds.get(nodename, {}).get(
-            'secret.hardwaremanagementpassword', {}).get('value', 'PASSW0RD')
-        if passwd == 'PASSW0RD' and self.ruleset:
-            raise Exception('Cannot support default password and setting password rules at same time')
-        if passwd == 'PASSW0RD':
-            # We must avoid hitting the web interface due to forced password change, best effert
-            self._bmcconfig(nodename)
-        else:
-            # Switch to full web based configuration, to mitigate risks with the SMM
-            wc = self._webconfigcreds(username, passwd)
-            self._webconfigrules(wc)
-            self._webconfignet(wc, nodename)
-
+        super(NodeHandler, self).config(nodename)
 
 # notes for smm:
 # POST to:
@@ -206,4 +53,4 @@ class NodeHandler(bmchandler.NodeHandler):
 # with body user=USERID&password=Passw0rd!4321
 # yields:
 # <?xml version="1.0" encoding="UTF-8"?><root> <status>ok</status> <authResult>0</authResult> <forwardUrl>index.html</forwardUrl> </root>
-# note forwardUrl, if password change needed, will indicate something else
+# note forwardUrl, if password change needed, will indicate something else

confluent_server/confluent/discovery/handlers/tsm.py

@@ -1,191 +0,0 @@
-# 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 confluent.discovery.handlers.generic as generic
-import confluent.exceptions as exc
-import confluent.netutil as netutil
-import confluent.util as util
-import eventlet.support.greendns
-import json
-try:
-    from urllib import urlencode
-except ImportError:
-    from urllib.parse import urlencode
-getaddrinfo = eventlet.support.greendns.getaddrinfo
-
-webclient = eventlet.import_patched('pyghmi.util.webclient')
-
-class NodeHandler(generic.NodeHandler):
-    devname = 'TSM'
-    DEFAULT_USER = 'USERID'
-    DEFAULT_PASS = 'PASSW0RD'
-
-    def __init__(self, info, configmanager):
-        self.trieddefault = None
-        self.targuser = None
-        self.curruser = None
-        self.currpass = None
-        self.targpass = None
-        self.nodename = None
-        self.csrftok = None
-        self.channel = None
-        self.atdefault = True
-        super(NodeHandler, self).__init__(info, configmanager)
-
-    def validate_cert(self, certificate):
-        # broadly speaking, merely checks consistency moment to moment,
-        # but if https_cert gets stricter, this check means something
-        fprint = util.get_fingerprint(self.https_cert)
-        return util.cert_matches(fprint, certificate)
-
-    def _get_wc(self):
-        authdata = {  # start by trying factory defaults
-            'username': self.DEFAULT_USER,
-            'password': self.DEFAULT_PASS,
-        }
-        if not self.trieddefault:
-            wc = webclient.SecureHTTPConnection(self.ipaddr, 443, verifycallback=self.validate_cert)
-            rsp, status = wc.grab_json_response_with_status('/api/session', urlencode(authdata))
-            if status > 400:
-                rsp = util.stringify(rsp)
-                self.trieddefault = True
-                if '555' in rsp:
-                    passchange = {
-                        'Password': self.targpass, 
-                        'RetypePassword': self.targpass,
-                        'param': 4,
-                        'default_password': self.DEFAULT_PASS,
-                        'username': self.DEFAULT_USER
-                        }
-                    rsp, status = wc.grab_json_response_with_status('/api/reset-pass', urlencode(passchange))
-                    authdata['password'] = self.targpass
-                    rsp, status = wc.grab_json_response_with_status('/api/session', urlencode(authdata))
-                    self.csrftok = rsp['CSRFToken']
-                    self.channel = rsp['channel']
-                    self.curruser = self.DEFAULT_USER
-                    self.currpass = self.targpass
-                    return wc
-            else:
-                self.curruser = self.DEFAULT_USER
-                self.currpass = self.DEFAULT_PASS
-                self.csrftok = rsp['CSRFToken']
-                self.channel = rsp['channel']
-                return wc
-        if self.curruser:
-            authdata['username'] = self.curruser
-            authdata['password'] = self.currpass
-            rsp, status = wc.grab_json_response_with_status('/api/session', urlencode(authdata))
-            if rsp.status != 200:
-                return None
-            self.csrftok = rsp['CSRFToken']
-            self.channel = rsp['channel']
-            return wc
-        authdata['username'] = self.targuser
-        authdata['password'] = self.targpass
-        rsp, status = wc.grab_json_response_with_status('/api/session', urlencode(authdata))
-        if status != 200:
-            return None
-        self.curruser = self.targuser
-        self.currpass = self.targpass
-        self.csrftok = rsp['CSRFToken']
-        self.channel = rsp['channel']
-        return wc
-
-    def config(self, nodename):
-        self.nodename = nodename
-        creds = self.configmanager.get_node_attributes(
-            nodename, ['secret.hardwaremanagementuser',
-                       'secret.hardwaremanagementpassword',
-                       'hardwaremanagement.manager', 'hardwaremanagement.method', 'console.method'],
-                       True)
-        cd = creds.get(nodename, {})
-        user, passwd, _ = self.get_node_credentials(
-                nodename, creds, self.DEFAULT_USER, self.DEFAULT_PASS)
-        user = util.stringify(user)
-        passwd = util.stringify(passwd)
-        self.targuser = user
-        self.targpass = passwd
-        wc = self._get_wc()
-        wc.set_header('X-CSRFTOKEN', self.csrftok)
-        curruserinfo = {}
-        authupdate = False
-        wc.set_header('Content-Type', 'application/json')
-        if user != self.curruser:
-            authupdate = True
-            if not curruserinfo:
-                curruserinfo = wc.grab_json_response('/api/settings/users')
-                authchg = curruserinfo[1]
-            authchg['name'] = user
-        if passwd != self.currpass:
-            authupdate = True
-            if not curruserinfo:
-                curruserinfo = wc.grab_json_response('/api/settings/users')
-                authchg = curruserinfo[1]
-            authchg['changepassword'] = 0
-            authchg['password_size'] = 'bytes_20'
-            authchg['password'] = passwd
-            authchg['confirm_password'] = passwd
-        if authupdate:
-            rsp, status = wc.grab_json_response_with_status('/api/settings/users/2', authchg, method='PUT')
-        if (cd.get('hardwaremanagement.method', {}).get('value', 'ipmi') != 'redfish'
-                or cd.get('console.method', {}).get('value', None) == 'ipmi'):
-            # IPMI must be enabled per user config
-            wc.grab_json_response('/api/settings/ipmilanconfig', {
-                'ipv4_enable': 1, 'ipv6_enable': 1,
-                'uncheckedipv4lanEnable': 0, 'uncheckedipv6lanEnable': 0,
-                'checkedipv4lanEnable': 1, 'checkedipv6lanEnable': 1})
-        if ('hardwaremanagement.manager' in cd and
-                cd['hardwaremanagement.manager']['value'] and
-                not cd['hardwaremanagement.manager']['value'].startswith(
-                    'fe80::')):
-            newip = cd['hardwaremanagement.manager']['value']
-            newipinfo = getaddrinfo(newip, 0)[0]
-            newip = newipinfo[-1][0]
-            if ':' in newip:
-                raise exc.NotImplementedException('IPv6 remote config TODO')
-            currnet = wc.grab_json_response('/api/settings/network')
-            for net in currnet:
-                if net['channel_number'] == self.channel and net['lan_enable'] == 0:
-                    # ignore false indication and switch to 8 (dedicated)
-                    self.channel = 8
-                if net['channel_number'] == self.channel:
-                    # we have found the interface to potentially manipulate
-                    if net['ipv4_address'] != newip:
-                        netconfig = netutil.get_nic_config(self.configmanager, nodename, ip=newip)
-                        newmask = netutil.cidr_to_mask(netconfig['prefix'])
-                        net['ipv4_address'] = newip
-                        net['ipv4_subnet'] = newmask
-                        if netconfig['ipv4_gateway']:
-                            net['ipv4_gateway'] = netconfig['ipv4_gateway']
-                        net['ipv4_dhcp_enable'] = 0
-                        rsp, status = wc.grab_json_response_with_status(
-                            '/api/settings/network/{0}'.format(net['id']), net, method='PUT')
-                    break
-        elif self.ipaddr.startswith('fe80::'):
-            self.configmanager.set_node_attributes(
-                {nodename: {'hardwaremanagement.manager': self.ipaddr}})
-        else:
-            raise exc.TargetEndpointUnreachable(
-                'hardwaremanagement.manager must be set to desired address (No IPv6 Link Local detected)')
-        rsp, status = wc.grab_json_response_with_status('/api/session', method='DELETE')
-
-
-if __name__ == '__main__':
-    import confluent.config.configmanager as cfm
-    c = cfm.ConfigManager(None)
-    import sys
-    info = {'addresses': [[sys.argv[1]]] }
-    print(repr(info))
-    testr = NodeHandler(info, c)
-    testr.config(sys.argv[2])

confluent_server/confluent/discovery/handlers/xcc.py

@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Lenovo
+# 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.
@@ -12,30 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import base64
-import codecs
 import confluent.discovery.handlers.imm as immhandler
-import confluent.netutil as netutil
 import confluent.util as util
-import errno
-import eventlet
-import eventlet.support.greendns
-import json
-import os
 import pyghmi.exceptions as pygexc
-import eventlet.green.socket as socket
-webclient = eventlet.import_patched('pyghmi.util.webclient')
-import struct
-getaddrinfo = eventlet.support.greendns.getaddrinfo
-
-
-def fixup_uuid(uuidprop):
-    baduuid = ''.join(uuidprop.split())
-    uuidprefix = (baduuid[:8], baduuid[8:12], baduuid[12:16])
-    a = codecs.encode(struct.pack('<IHH', *[int(x, 16) for x in uuidprefix]), 'hex')
-    a = util.stringify(a)
-    uuid = (a[:8], a[8:12], a[12:16], baduuid[16:20], baduuid[20:])
-    return '-'.join(uuid).upper()
+import pyghmi.ipmi.oem.lenovo.imm as imm
 
 
 
@@ -43,70 +23,27 @@ def fixup_uuid(uuidprop):
 class NodeHandler(immhandler.NodeHandler):
     devname = 'XCC'
 
-    def __init__(self, info, configmanager):
-        self._wc = None
-        self.nodename = None
-        self.tmpnodename = None
-        self.tmppasswd = None
-        self._atdefaultcreds = True
-        self._needpasswordchange = True
-        self._currcreds = (None, None)
-        super(NodeHandler, self).__init__(info, configmanager)
-
     @classmethod
     def adequate(cls, info):
         # We can sometimes receive a partially initialized SLP packet
         # This is not adequate for being satisfied
         return bool(info.get('attributes', {}))
 
-    def preconfig(self, possiblenode):
-        self.tmpnodename = possiblenode
+    def preconfig(self):
         ff = self.info.get('attributes', {}).get('enclosure-form-factor', '')
         if ff not in ('dense-computing', [u'dense-computing']):
-            # skip preconfig for non-SD530 servers
             return
-        self.trieddefault = None  # Reset state on a preconfig attempt
         # attempt to enable SMM
         #it's normal to get a 'not supported' (193) for systems without an SMM
-        # need to branch on 3.00+ firmware
-        currfirm = self.info.get('attributes', {}).get('firmware-image-info', [''])[0]
-        currfirm = currfirm.split(':')
-        if len(currfirm) > 1:
-            currfirm = float(currfirm[1])
-        disableipmi = False
-        if currfirm >= 3:
-            # IPMI is disabled and we need it, also we need to go to *some* password
-            wc = self.wc
-            if not wc:
-                # We cannot try to enable SMM here without risking real credentials
-                # on the wire to untrusted parties
-                return
-            wc.grab_json_response('/api/providers/logout')
-            wc.set_basic_credentials(self._currcreds[0], self._currcreds[1])
-            rsp = wc.grab_json_response('/redfish/v1/Managers/1/NetworkProtocol')
-            if not rsp.get('IPMI', {}).get('ProtocolEnabled', True):
-                disableipmi = True
-                _, _ = wc.grab_json_response_with_status(
-                    '/redfish/v1/Managers/1/NetworkProtocol',
-                    {'IPMI': {'ProtocolEnabled': True}}, method='PATCH')
         ipmicmd = None
         try:
-            ipmicmd = self._get_ipmicmd(self._currcreds[0], self._currcreds[1])
+            ipmicmd = self._get_ipmicmd()
             ipmicmd.xraw_command(netfn=0x3a, command=0xf1, data=(1,))
         except pygexc.IpmiException as e:
             if (e.ipmicode != 193 and 'Unauthorized name' not in str(e) and
                     'Incorrect password' not in str(e)):
                 # raise an issue if anything other than to be expected
-                if disableipmi:
-                    _, _ = wc.grab_json_response_with_status(
-                        '/redfish/v1/Managers/1/NetworkProtocol',
-                        {'IPMI': {'ProtocolEnabled': False}}, method='PATCH')
                 raise
-            self.trieddefault = True
-        if disableipmi:
-            _, _ = wc.grab_json_response_with_status(
-                '/redfish/v1/Managers/1/NetworkProtocol',
-                {'IPMI': {'ProtocolEnabled': False}}, method='PATCH')
         #TODO: decide how to clean out if important
         #as it stands, this can step on itself
         #if ipmicmd:
@@ -118,115 +55,7 @@ class NodeHandler(immhandler.NodeHandler):
         fprint = util.get_fingerprint(self.https_cert)
         return util.cert_matches(fprint, certificate)
 
-    def get_webclient(self, username, password, newpassword):
-        wc = self._wc.dupe()
-        try:
-            wc.connect()
-        except socket.error as se:
-            if se.errno != errno.ECONNREFUSED:
-                raise
-            return (None, None)
-        pwdchanged = False
-        adata = json.dumps({'username': util.stringify(username),
-                            'password': util.stringify(password)
-                            })
-        headers = {'Connection': 'keep-alive',
-                   'Content-Type': 'application/json'}
-        wc.request('POST', '/api/login', adata, headers)
-        rsp = wc.getresponse()
-        if rsp.status != 200 and password == 'PASSW0RD':
-            rsp.read()
-            adata = json.dumps({
-                'username': username,
-                'password': newpassword,
-                })
-            headers = {'Connection': 'keep-alive',
-                       'Content-Type': 'application/json'}
-            wc.request('POST', '/api/login', adata, headers)
-            rsp = wc.getresponse()
-            if rsp.status == 200:
-                pwdchanged = True
-                password = newpassword
-            else:
-                rsp.read()
-                return (None, None)
-        if rsp.status == 200:
-            self._currcreds = (username, password)
-            wc.set_basic_credentials(username, password)
-            rspdata = json.loads(rsp.read())
-            wc.set_header('Content-Type', 'application/json')
-            wc.set_header('Authorization', 'Bearer ' + rspdata['access_token'])
-            if '_csrf_token' in wc.cookies:
-                wc.set_header('X-XSRF-TOKEN', wc.cookies['_csrf_token'])
-            if rspdata.get('pwchg_required', None) == 'true':
-                wc.request('POST', '/api/function', json.dumps(
-                    {'USER_UserPassChange': '1,{0}'.format(newpassword)}))
-                rsp = wc.getresponse()
-                rsp.read()
-                if rsp.status != 200:
-                    return (None, None)
-                self._currcreds = (username, newpassword)
-                wc.set_basic_credentials(username, newpassword)
-                pwdchanged = True
-            if '_csrf_token' in wc.cookies:
-                wc.set_header('X-XSRF-TOKEN', wc.cookies['_csrf_token'])
-            return (wc, pwdchanged)
-
-    @property
-    def wc(self):
-        passwd = None
-        isdefault = True
-        if self._wc is None:
-            self._wc = webclient.SecureHTTPConnection(
-                self.ipaddr, 443, verifycallback=self.validate_cert)
-            self._wc.connect()
-        nodename = None
-        if self.nodename:
-            nodename = self.nodename
-            inpreconfig = False
-        elif self.tmpnodename:
-            nodename = None
-            inpreconfig = True
-        if self._currcreds[0] is not None:
-            wc, pwdchanged = self.get_webclient(self._currcreds[0], self._currcreds[1], None)
-            if wc:
-                return wc
-        if nodename:
-            creds = self.configmanager.get_node_attributes(
-                nodename, ['secret.hardwaremanagementuser',
-                'secret.hardwaremanagementpassword'], decrypt=True)
-            user, passwd, isdefault = self.get_node_credentials(
-                nodename, creds, 'USERID', 'PASSW0RD')
-        if not self.trieddefault:
-            if not passwd:
-                # So in preconfig context, we don't have admin permission to
-                # actually divulge anything to the target
-                # however the target *will* demand a new password... if it's currently
-                # PASSW0RD
-                # use TempW0rd42 to avoid divulging a real password on the line
-                # This is replacing one well known password (PASSW0RD) with another 
-                # (TempW0rd42)
-                passwd = 'TempW0rd42'
-            wc, pwdchanged = self.get_webclient('USERID', 'PASSW0RD', passwd)
-            if wc:
-                if pwdchanged:
-                    if inpreconfig:
-                        self.tmppasswd = passwd
-                    else:
-                        self._needpasswordchange = False
-                return wc
-        self.trieddefault = True
-        if isdefault:
-            return
-        self._atdefaultcreds = False
-        if self.tmppasswd:
-            wc, _ = self.get_webclient('USERID', self.tmppasswd, passwd)
-        else:
-            wc, _ = self.get_webclient(user, passwd, None)
-        if wc:
-            return wc
-
-    def set_password_policy(self):
+    def set_password_policy(self, ic):
         ruleset = {'USER_GlobalMinPassChgInt': '0'}
         for rule in self.ruleset.split(','):
             if '=' not in rule:
@@ -242,109 +71,11 @@ class NodeHandler(immhandler.NodeHandler):
                 if value.lower() in ('no', 'none', 'disable', 'disabled'):
                     value = '0'
                 ruleset['USER_GlobalMaxLoginFailures'] = value
-            if name.lower() == 'complexity':
-                ruleset['USER_GlobalPassComplexRequired'] = value
-            if name.lower() == 'reuse':
-                ruleset['USER_GlobalMinPassReuseCycle'] = value
-        try:
-            wc = self.wc
-            wc.grab_json_response('/api/dataset', ruleset)
-            wc.grab_json_response('/api/providers/logout')
-        except Exception as e:
-            print(repr(e))
-            pass
-
-    def _get_next_userid(self, wc):
-        userinfo = wc.grab_json_response('/api/dataset/imm_users')
-        userinfo = userinfo['items'][0]['users']
-        for user in userinfo:
-            if user['users_user_name'] == '':
-                return user['users_user_id']
-
-    def _setup_xcc_account(self, username, passwd, wc):
-        userinfo = wc.grab_json_response('/api/dataset/imm_users')
-        uid = None
-        for user in userinfo['items'][0]['users']:
-            if user['users_user_name'] == username:
-                uid = user['users_user_id']
-                break
-        else:
-            for user in userinfo['items'][0]['users']:
-                if user['users_user_name'] == 'USERID':
-                    uid = user['users_user_id']
-                    break
-        if not uid:
-            raise Exception("XCC has neither the default user nor configured user")
-        # The following will work if the password is force change or normal..
-        if self._needpasswordchange and self.tmppasswd != passwd:
-            wc.grab_json_response('/api/function',
-                                {'USER_UserPassChange': '{0},{1}'.format(uid, passwd)})
-        if username != 'USERID':
-            wc.grab_json_response(
-                '/api/function',
-                {'USER_UserModify': '{0},{1},,1,4,0,0,0,0,,8,'.format(uid, username)})
-            self.tmppasswd = None
-        self._currcreds = (username, passwd)
-
-    def _convert_sha256account(self, user, passwd, wc):
-        # First check if the specified user is sha256...
-        userinfo = wc.grab_json_response('/api/dataset/imm_users')
-        curruser = None
-        uid = None
-        user = util.stringify(user)
-        passwd = util.stringify(passwd)
-        for userent in userinfo['items'][0]['users']:
-            if userent['users_user_name'] == user:
-                curruser = userent
-                break
-        if curruser.get('users_pass_is_sha256', 0):
-            self._wc = None
-            wc = self.wc
-            nwc = wc.dupe()
-            # Have to convert it for being useful with most Lenovo automation tools
-            # This requires deleting the account entirely and trying again
-            tmpuid = self._get_next_userid(wc)
-            try:
-                tpass = base64.b64encode(os.urandom(9)) + 'Iw47$'
-                userparams = "{0},6pmu0ezczzcp,{1},1,4,0,0,0,0,,8,".format(tmpuid, tpass)
-                result = wc.grab_json_response('/api/function', {'USER_UserCreate': userparams})
-                wc.grab_json_response('/api/providers/logout')
-                adata = json.dumps({
-                    'username': '6pmu0ezczzcp',
-                    'password': tpass,
-                })
-                headers = {'Connection': 'keep-alive', 'Content-Type': 'application/json'}
-                nwc.request('POST', '/api/login', adata, headers)
-                rsp = nwc.getresponse()
-                if rsp.status == 200:
-                    rspdata = json.loads(rsp.read())
-                    nwc.set_header('Content-Type', 'application/json')
-                    nwc.set_header('Authorization', 'Bearer ' + rspdata['access_token'])
-                    if '_csrf_token' in wc.cookies:
-                        nwc.set_header('X-XSRF-TOKEN', wc.cookies['_csrf_token'])
-                    if rspdata.get('reason', False):
-                        newpass = base64.b64encode(os.urandom(9)) + 'q4J$'
-                        nwc.grab_json_response(
-                            '/api/function',
-                            {'USER_UserPassChange': '{0},{1}'.format(tmpuid, newpass)})
-                    nwc.grab_json_response('/api/function', {'USER_UserDelete': "{0},{1}".format(curruser['users_user_id'], user)})
-                    userparams = "{0},{1},{2},1,4,0,0,0,0,,8,".format(curruser['users_user_id'], user, tpass)
-                    nwc.grab_json_response('/api/function', {'USER_UserCreate': userparams})
-                    nwc.grab_json_response('/api/providers/logout')
-                    nwc, pwdchanged = self.get_webclient(user, tpass, passwd)
-                    if not pwdchanged:
-                        nwc.grab_json_response(
-                            '/api/function',
-                            {'USER_UserPassChange': '{0},{1}'.format(curruser['users_user_id'], passwd)})
-                    nwc.grab_json_response('/api/providers/logout')
-            finally:
-                self._wc = None
-                wc = self.wc
-                wc.grab_json_response('/api/function', {'USER_UserDelete': "{0},{1}".format(tmpuid, '6pmu0ezczzcp')})
-                wc.grab_json_response('/api/providers/logout')
+        ic.register_key_handler(self.validate_cert)
+        ic.oem_init()
+        ic._oem.immhandler.wc.grab_json_response('/api/dataset', ruleset)
 
     def config(self, nodename, reset=False):
-        self.nodename = nodename
         # TODO(jjohnson2): set ip parameters, user/pass, alert cfg maybe
         # In general, try to use https automation, to make it consistent
         # between hypothetical secure path and today.
@@ -352,68 +83,17 @@ class NodeHandler(immhandler.NodeHandler):
             nodename, 'discovery.passwordrules')
         self.ruleset = dpp.get(nodename, {}).get(
             'discovery.passwordrules', {}).get('value', '')
-        wc = self.wc
-        creds = self.configmanager.get_node_attributes(
-            self.nodename, ['secret.hardwaremanagementuser',
-            'secret.hardwaremanagementpassword'], decrypt=True)
-        user, passwd, isdefault = self.get_node_credentials(nodename, creds, 'USERID', 'PASSW0RD')
-        self.set_password_policy()
-        if self._atdefaultcreds:
-            if not isdefault:
-                self._setup_xcc_account(user, passwd, wc)
-        self._convert_sha256account(user, passwd, wc)
-        cd = self.configmanager.get_node_attributes(
-            nodename, ['secret.hardwaremanagementuser',
-                       'secret.hardwaremanagementpassword',
-                       'hardwaremanagement.manager', 'hardwaremanagement.method', 'console.method'],
-                       True)
-        cd = cd.get(nodename, {})
-        if (cd.get('hardwaremanagement.method', {}).get('value', 'ipmi') != 'redfish'
-                or cd.get('console.method', {}).get('value', None) == 'ipmi'):
-            nwc = wc.dupe()
-            nwc.set_basic_credentials(self._currcreds[0], self._currcreds[1])
-            rsp = nwc.grab_json_response('/redfish/v1/Managers/1/NetworkProtocol')
-            if not rsp.get('IPMI', {}).get('ProtocolEnabled', True):
-                # User has indicated IPMI support, but XCC is currently disabled
-                # change XCC to be consistent
-                _, _ = nwc.grab_json_response_with_status(
-                        '/redfish/v1/Managers/1/NetworkProtocol',
-                        {'IPMI': {'ProtocolEnabled': True}}, method='PATCH')
-        if ('hardwaremanagement.manager' in cd and
-                cd['hardwaremanagement.manager']['value'] and
-                not cd['hardwaremanagement.manager']['value'].startswith(
-                    'fe80::')):
-            newip = cd['hardwaremanagement.manager']['value']
-            newipinfo = getaddrinfo(newip, 0)[0]
-            newip = newipinfo[-1][0]
-            if ':' in newip:
-                raise exc.NotImplementedException('IPv6 remote config TODO')
-            netconfig = netutil.get_nic_config(self.configmanager, nodename, ip=newip)
-            newmask = netutil.cidr_to_mask(netconfig['prefix'])
-            currinfo = wc.grab_json_response('/api/providers/logoninfo')
-            currip = currinfo.get('items', [{}])[0].get('ipv4_address', '')
-            # do not change the ipv4_config if the current config looks right already
-            if currip != newip:
-                statargs = {
-                    'ENET_IPv4Ena': '1', 'ENET_IPv4AddrSource': '0',
-                    'ENET_IPv4StaticIPAddr': newip, 'ENET_IPv4StaticIPNetMask': newmask
-                    }
-                if netconfig['ipv4_gateway']:
-                    statargs['ENET_IPv4GatewayIPAddr'] = netconfig['ipv4_gateway']
-                wc.grab_json_response('/api/dataset', statargs)
-        elif self.ipaddr.startswith('fe80::'):
-            self.configmanager.set_node_attributes(
-                {nodename: {'hardwaremanagement.manager': self.ipaddr}})
-        else:
-            raise exc.TargetEndpointUnreachable(
-                'hardwaremanagement.manager must be set to desired address (No IPv6 Link Local detected)')
-        wc.grab_json_response('/api/providers/logout')
+        ic = self._bmcconfig(nodename, customconfig=self.set_password_policy)
         ff = self.info.get('attributes', {}).get('enclosure-form-factor', '')
         if ff not in ('dense-computing', [u'dense-computing']):
             return
-        enclosureuuid = self.info.get('attributes', {}).get('chassis-uuid', [None])[0]
+        # Ok, we can get the enclosure uuid now..
+        enclosureuuid = ic._oem.immhandler.get_property(
+            '/v2/ibmc/smm/chassis/uuid')
+        enclosureuuid = ic._oem.immhandler.get_property(
+            '/v2/ibmc/smm/chassis/uuid')
         if enclosureuuid:
-            enclosureuuid = enclosureuuid.lower()
+            enclosureuuid = imm.fixup_uuid(enclosureuuid).lower()
             em = self.configmanager.get_node_attributes(nodename,
                                                         'enclosure.manager')
             em = em.get(nodename, {}).get('enclosure.manager', {}).get(
@@ -422,3 +102,8 @@ class NodeHandler(immhandler.NodeHandler):
             if em:
                 self.configmanager.set_node_attributes(
                     {em: {'id.uuid': enclosureuuid}})
+
+# TODO(jjohnson2): web based init config for future prevalidated cert scheme
+#    def config(self, nodename):
+#        return
+

confluent_server/confluent/discovery/protocols/pxe.py

@@ -34,8 +34,8 @@ pxearchs = {
 
 
 def decode_uuid(rawguid):
-    lebytes = struct.unpack_from('<IHH', rawguid[:8])
-    bebytes = struct.unpack_from('>HHI', rawguid[8:])
+    lebytes = struct.unpack_from('<IHH', buffer(rawguid[:8]))
+    bebytes = struct.unpack_from('>HHI', buffer(rawguid[8:]))
     return '{0:08X}-{1:04X}-{2:04X}-{3:04X}-{4:04X}{5:08X}'.format(
         lebytes[0], lebytes[1], lebytes[2], bebytes[0], bebytes[1], bebytes[2]).lower()
 
@@ -98,7 +98,7 @@ def snoop(handler, protocol=None):
             netaddr = ':'.join(['{0:02x}'.format(x) for x in netaddr])
             optidx = 0
             try:
-                optidx = rq.index(b'\x63\x82\x53\x63') + 4
+                optidx = rq.index('\x63\x82\x53\x63') + 4
             except ValueError:
                 continue
             uuid, arch = find_info_in_options(rq, optidx)

confluent_server/confluent/discovery/protocols/slp.py

@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2017-2019 Lenovo
+# 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.
@@ -27,8 +27,6 @@ import traceback
 _slp_services = set([
     'service:management-hardware.IBM:integrated-management-module2',
     'service:lenovo-smm',
-    'service:ipmi',
-    'service:lighttpd',
     'service:management-hardware.Lenovo:lenovo-xclarity-controller',
     'service:management-hardware.IBM:chassis-management-module',
     'service:management-hardware.Lenovo:chassis-management-module',
@@ -49,6 +47,7 @@ except AttributeError:
     IPPROTO_IPV6 = 41  # Assume Windows value if socket is missing it
 
 
+
 def _parse_slp_header(packet):
     packet = bytearray(packet)
     if len(packet) < 16 or packet[0] != 2:
@@ -246,23 +245,24 @@ def _grab_rsps(socks, rsps, interval, xidmap):
 
 def _parse_attrlist(attrstr):
     attribs = {}
-    previousattrlen = None
-    attrstr = util.stringify(attrstr)
     while attrstr:
-        if len(attrstr) == previousattrlen:
-            raise Exception('Looping in attrstr parsing')
-        previousattrlen = len(attrstr)
         if attrstr[0] == '(':
             if ')' not in attrstr:
                 attribs['INCOMPLETE'] = True
                 return attribs
             currattr = attrstr[1:attrstr.index(')')]
             if '=' not in currattr:  # Not allegedly kosher, but still..
+                currattr = currattr.decode('utf-8')
                 attribs[currattr] = None
             else:
                 attrname, attrval = currattr.split('=', 1)
+                attrname = attrname.decode('utf-8')
                 attribs[attrname] = []
                 for val in attrval.split(','):
+                    try:
+                        val = val.decode('utf-8')
+                    except UnicodeDecodeError:
+                        val = '*DECODEERROR*'
                     if val[:3] == '\\FF':  # we should make this bytes
                         finalval = bytearray([])
                         for bnum in attrval[3:].split('\\'):
@@ -272,9 +272,9 @@ def _parse_attrlist(attrstr):
                         val = finalval
                         if 'uuid' in attrname and len(val) == 16:
                             lebytes = struct.unpack_from(
-                                '<IHH', memoryview(val[:8]))
+                                '<IHH', buffer(val[:8]))
                             bebytes = struct.unpack_from(
-                                '>HHI', memoryview(val[8:]))
+                                '>HHI', buffer(val[8:]))
                             val = '{0:08X}-{1:04X}-{2:04X}-{3:04X}-' \
                                   '{4:04X}{5:08X}'.format(
                                 lebytes[0], lebytes[1], lebytes[2], bebytes[0],
@@ -282,7 +282,7 @@ def _parse_attrlist(attrstr):
                             ).lower()
                     attribs[attrname].append(val)
             attrstr = attrstr[attrstr.index(')'):]
-        elif attrstr[0] == ','[0]:
+        elif attrstr[0] == ',':
             attrstr = attrstr[1:]
         elif ',' in attrstr:
             currattr = attrstr[:attrstr.index(',')]
@@ -335,7 +335,6 @@ def _add_attributes(parsed):
     else:
         net = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     try:
-        net.settimeout(1.0)
         net.connect(target)
     except socket.error:
         return
@@ -364,7 +363,6 @@ def query_srvtypes(target):
     while tries and not connected:
         tries -= 1
         try:
-            net.settimeout(1.0)
             net.connect(target)
             connected = True
         except socket.error:
@@ -484,18 +482,6 @@ def snoop(handler, protocol=None):
                 _add_attributes(peerbymacaddress[mac])
                 peerbymacaddress[mac]['hwaddr'] = mac
                 peerbymacaddress[mac]['protocol'] = protocol
-                if 'service:ipmi' in peerbymacaddress[mac]['services']:
-                    if 'service:ipmi//Athena:623' in peerbymacaddress[mac].get('urls', ()):
-                        peerbymacaddress[mac]['services'] = ['service:thinkagile-storage']
-                    else:
-                        continue
-                if 'service:lightttpd' in peerbymacaddress[mac]['services']:
-                    currinf = peerbymacaddress[mac]
-                    curratt = currinf.get('attributes', {})
-                    if curratt.get('System-Manufacturing', [None])[0] == 'Lenovo' and curratt.get('type', [None])[0] == 'LenovoThinkServer':
-                        peerbymacaddress[mac]['services'] = ['service:lenovo-tsm']
-                    else:
-                        continue
                 handler(peerbymacaddress[mac])
         except Exception as e:
             tracelog.log(traceback.format_exc(), ltype=log.DataTypes.event,
@@ -559,11 +545,6 @@ def scan(srvtypes=_slp_services, addresses=None, localonly=False):
     _grab_rsps((net, net4), rsps, 1, xidmap)
     # now to analyze and flesh out the responses
     for id in rsps:
-        if 'service:ipmi' in rsps[id]['services']:
-            if 'service:ipmi://Athena:623' in rsps[id]['urls']:
-                rsps[id]['services'] = ['service:thinkagile-storage']
-            else:
-                continue
         if localonly:
             for addr in rsps[id]['addresses']:
                 if 'fe80' in addr[0]:
@@ -571,15 +552,6 @@ def scan(srvtypes=_slp_services, addresses=None, localonly=False):
             else:
                 continue
         _add_attributes(rsps[id])
-        if 'service:lighttpd' in rsps[id]['services']:
-            currinf = rsps[id]
-            curratt = currinf.get('attributes', {})
-            if curratt.get('System-Manufacturing', [None])[0] == 'Lenovo' and curratt.get('type', [None])[0] == 'LenovoThinkServer':
-               currinf['services'] = ['service:lenovo-tsm']
-               curratt['enclosure-serial-number'] = curratt['Product-Serial']
-               curratt['enclosure-machinetype-model'] = curratt['Machine-Type']
-            else:
-                continue
         del rsps[id]['payload']
         del rsps[id]['function']
         del rsps[id]['xid']

confluent_server/confluent/discovery/protocols/ssdp.py

@@ -30,11 +30,9 @@
 
 import confluent.neighutil as neighutil
 import confluent.util as util
-import confluent.log as log
 import eventlet.green.select as select
 import eventlet.green.socket as socket
 import struct
-import traceback
 
 mcastv4addr = '239.255.255.250'
 mcastv6addr = 'ff02::c'
@@ -53,7 +51,7 @@ def scan(services, target=None):
             yield rply
 
 
-def snoop(handler, byehandler=None, protocol=None, uuidlookup=None):
+def snoop(handler, byehandler=None):
     """Watch for SSDP notify messages
 
     The handler shall be called on any service coming online.
@@ -69,7 +67,6 @@ def snoop(handler, byehandler=None, protocol=None, uuidlookup=None):
     # Normally, I like using v6/v4 agnostic socket. However, since we are
     # dabbling in multicast wizardry here, such sockets can cause big problems,
     # so we will have two distinct sockets
-    tracelog = log.Logger('trace')
     known_peers = set([])
     net6 = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
     net6.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 1)
@@ -81,85 +78,57 @@ def snoop(handler, byehandler=None, protocol=None, uuidlookup=None):
     for i4 in util.list_ips():
         ssdp4mcast = socket.inet_pton(socket.AF_INET, mcastv4addr) + \
                      socket.inet_aton(i4['addr'])
-        try:
-            net4.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP,
-                            ssdp4mcast)
-        except socket.error as e:
-            if e.errno != 98:
-                # errno 98 can happen if aliased, skip for now
-                raise
+        net4.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP,
+                        ssdp4mcast)
     net4.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     net4.bind(('', 1900))
     net6.bind(('', 1900))
     peerbymacaddress = {}
     while True:
-        try:
-            newmacs = set([])
-            machandlers = {}
-            r, _, _ = select.select((net4, net6), (), (), 60)
-            neighutil.update_neigh()
-            while r:
-                for s in r:
-                    (rsp, peer) = s.recvfrom(9000)
-                    rsp = rsp.split('\r\n')
-                    method, _, _ = rsp[0].split(' ', 2)
-                    if method == 'NOTIFY':
-                        ip = peer[0].partition('%')[0]
-                        if ip not in neighutil.neightable:
-                            continue
-                        if peer in known_peers:
-                            continue
-                        mac = neighutil.neightable[ip]
-                        known_peers.add(peer)
-                        newmacs.add(mac)
-                        if mac in peerbymacaddress:
-                            peerbymacaddress[mac]['peers'].append(peer)
-                        else:
-                            peerbymacaddress[mac] = {
-                                'hwaddr': mac,
-                                'peers': [peer],
-                            }
-                            peerdata = peerbymacaddress[mac]
-                            for headline in rsp[1:]:
-                                if not headline:
-                                    continue
-                                header, _, value = headline.partition(':')
-                                header = header.strip()
-                                value = value.strip()
-                                if header == 'NT':
-                                    peerdata['service'] = value
-                                elif header == 'NTS':
-                                    if value == 'ssdp:byebye':
-                                        machandlers[mac] = byehandler
-                                    elif value == 'ssdp:alive':
-                                        machandlers[mac] = None # handler
-                    elif method == 'M-SEARCH':
-                        if not uuidlookup:
-                            continue
-                        #ip = peer[0].partition('%')[0]
+        newmacs = set([])
+        machandlers = {}
+        r, _, _ = select.select((net4, net6), (), (), 60)
+        neighutil.update_neigh()
+        while r:
+            for s in r:
+                (rsp, peer) = s.recvfrom(9000)
+                rsp = rsp.split('\r\n')
+                method, _, _ = rsp[0].split(' ', 2)
+                if method == 'NOTIFY':
+                    ip = peer[0].partition('%')[0]
+                    if ip not in neighutil.neightable:
+                        continue
+                    if peer in known_peers:
+                        continue
+                    mac = neighutil.neightable[ip]
+                    known_peers.add(peer)
+                    newmacs.add(mac)
+                    if mac in peerbymacaddress:
+                        peerbymacaddress[mac]['peers'].append(peer)
+                    else:
+                        peerbymacaddress[mac] = {
+                            'hwaddr': mac,
+                            'peers': [peer],
+                        }
+                        peerdata = peerbymacaddress[mac]
                         for headline in rsp[1:]:
                             if not headline:
                                 continue
-                            headline = headline.partition(':')
-                            if len(headline) < 3:
-                                continue
-                            if  headline[0] == 'ST' and headline[-1].startswith(' urn:xcat.org:service:confluent:'):
-                                for query in headline[-1].split('/'):
-                                    if query.startswith('uuid='):
-                                        curruuid = query.split('=', 1)[1].lower()
-                                        node = uuidlookup(curruuid)
-                                        if not node:
-                                            break
-                                        reply = 'HTTP/1.1 200 OK\r\nNODENAME: {0}'.format(node)
-                                        s.sendto(reply, peer)
-                r, _, _ = select.select((net4, net6), (), (), 0.2)
-            for mac in newmacs:
-                thehandler = machandlers.get(mac, None)
-                if thehandler:
-                    thehandler(peerbymacaddress[mac])
-        except Exception:
-                tracelog.log(traceback.format_exc(), ltype=log.DataTypes.event,
-                             event=log.Events.stacktrace)
+                            header, _, value = headline.partition(':')
+                            header = header.strip()
+                            value = value.strip()
+                            if header == 'NT':
+                                peerdata['service'] = value
+                            elif header == 'NTS':
+                                if value == 'ssdp:byebye':
+                                    machandlers[mac] = byehandler
+                                elif value == 'ssdp:alive':
+                                    machandlers[mac] = handler
+            r, _, _ = select.select((net4, net6), (), (), 0.1)
+        for mac in newmacs:
+            thehandler = machandlers.get(mac, None)
+            if thehandler:
+                thehandler(peerbymacaddress[mac])
 
 
 def _find_service(service, target):
@@ -198,7 +167,6 @@ def _find_service(service, target):
             net4.sendto(smsg.format(bcast, service), (bcast, 1900))
     # SSDP by spec encourages responses to spread out over a 3 second interval
     # hence we must be a bit more patient
-    deadline = util.monotonic_time() + 4
     r, _, _ = select.select((net4, net6), (), (), 4)
     peerdata = {}
     while r:
@@ -206,10 +174,7 @@ def _find_service(service, target):
             (rsp, peer) = s.recvfrom(9000)
             neighutil.refresh_neigh()
             _parse_ssdp(peer, rsp, peerdata)
-        timeout = deadline - util.monotonic_time()
-        if timeout < 0:
-            timeout = 0
-        r, _, _ = select.select((net4, net6), (), (), timeout)
+        r, _, _ = select.select((net4, net6), (), (), 4)
     for nid in peerdata:
         yield peerdata[nid]
 
@@ -229,8 +194,6 @@ def _parse_ssdp(peer, rsp, peerdata):
     if code == '200':
         if nid in peerdata:
             peerdatum = peerdata[nid]
-            if peer not in peerdatum['peers']:
-                peerdatum['peers'].append(peer)
         else:
             peerdatum = {
                 'peers': [peer],

confluent_server/confluent/firmwaremanager.py

@@ -19,23 +19,19 @@
 # the time comes
 
 import confluent.exceptions as exc
-import confluent.log as log
 import confluent.messages as msg
 import eventlet
 import os
 import pwd
 import socket
-import traceback
 
 updatesbytarget = {}
 uploadsbytarget = {}
 downloadsbytarget = {}
 updatepool = eventlet.greenpool.GreenPool(256)
-_tracelog = None
 
 
 def execupdate(handler, filename, updateobj, type, owner, node):
-    global _tracelog
     if type != 'ffdc' and not os.path.exists(filename):
         errstr =  '{0} does not appear to exist on {1}'.format(
             filename, socket.gethostname())
@@ -62,9 +58,6 @@ def execupdate(handler, filename, updateobj, type, owner, node):
         updateobj.handle_progress({'phase': 'error', 'progress': 0.0,
                                    'detail': errstr})
     except Exception as e:
-        if _tracelog is None:
-            _tracelog = log.Logger('trace')
-        _tracelog.log(traceback.format_exc(), ltype=log.DataTypes.event, event=log.Events.stacktrace)
         updateobj.handle_progress({'phase': 'error', 'progress': 0.0,
                                    'detail': str(e)})
 

confluent_server/confluent/forwarder.py

@@ -49,7 +49,6 @@ def forward_port(sock, target, clientip, sessionid):
             continue
         try:
             client = socket.create_connection((target, 443))
-            client.setsockopt(socket.IPPROTO_TCP, socket.TCP_MAXSEG, 1456)
         except Exception:
             conn.close()
             continue
@@ -69,7 +68,6 @@ def forward_video():
         try:
             vidclient = socket.create_connection((vidtargetbypeer[cli[0]],
                                                   3900))
-            vidclient.setsockopt(socket.IPPROTO_TCP, socket.TCP_MAXSEG, 1456)
         except Exception:
             conn.close()
             continue

confluent_server/confluent/httpapi.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.
@@ -17,10 +17,7 @@
 # This SCGI server provides a http wrap to confluent api
 # It additionally manages httprequest console sessions
 import base64
-try:
-    import Cookie
-except ModuleNotFoundError:
-    import http.cookies as Cookie
+import Cookie
 import confluent.auth as auth
 import confluent.config.attributes as attribs
 import confluent.consoleserver as consoleserver
@@ -33,6 +30,7 @@ import confluent.asynchttp
 import confluent.shellserver as shellserver
 import confluent.tlvdata
 import confluent.util as util
+from confluent.xcclient.xcat_manager import xCATConfigManager
 import copy
 import eventlet
 import eventlet.greenthread
@@ -42,10 +40,7 @@ import socket
 import sys
 import traceback
 import time
-try:
-    import urlparse
-except ModuleNotFoundError:
-    import urllib.parse as urlparse
+import urlparse
 import eventlet.wsgi
 #scgi = eventlet.import_patched('flup.server.scgi')
 tlvdata = confluent.tlvdata
@@ -62,7 +57,7 @@ opmap = {
     'PUT': 'update',
     'DELETE': 'delete',
 }
-
+xcat_cfm = None
 
 class RobustCookie(Cookie.SimpleCookie):
     # this is very bad form, but BaseCookie has a terrible flaw
@@ -80,7 +75,7 @@ def group_creation_resources():
     yield confluent.messages.ListAttributes(kv={'nodes': []},
                                             desc='Nodes to add to the group'
                                             ).html() + '<br>\n'
-    for attr in sorted(attribs.node):
+    for attr in sorted(attribs.node.iterkeys()):
         if attr == 'groups':
             continue
         if attr.startswith("secret."):
@@ -101,7 +96,7 @@ def group_creation_resources():
 def node_creation_resources():
     yield confluent.messages.Attributes(
         kv={'name': None}, desc="Name of the node").html() + '<br>'
-    for attr in sorted(attribs.node):
+    for attr in sorted(attribs.node.iterkeys()):
         if attr.startswith("secret."):
             yield confluent.messages.CryptedAttributes(
                 kv={attr: None},
@@ -132,7 +127,7 @@ def user_creation_resources():
             'description': (''),
         },
     }
-    for attr in sorted(credential):
+    for attr in sorted(credential.iterkeys()):
         if attr == "password":
             yield confluent.messages.CryptedAttributes(
                 kv={attr: None},
@@ -182,7 +177,7 @@ def _get_query_dict(env, reqbody, reqtype):
     if reqbody is not None:
         if "application/x-www-form-urlencoded" in reqtype:
             pbody = urlparse.parse_qs(reqbody, True)
-            for ky in pbody:
+            for ky in pbody.iterkeys():
                 if len(pbody[ky]) > 1:  # e.g. REST explorer
                     na = [i for i in pbody[ky] if i != '']
                     qdict[ky] = na
@@ -190,7 +185,7 @@ def _get_query_dict(env, reqbody, reqtype):
                     qdict[ky] = pbody[ky][0]
         elif 'application/json' in reqtype:
             pbody = json.loads(reqbody)
-            for key in pbody:
+            for key in pbody.iterkeys():
                 qdict[key] = pbody[key]
     if 'restexplorerhonorkey' in qdict:
         nqdict = {}
@@ -275,9 +270,6 @@ def _authorize_request(env, operation):
     name = ''
     sessionid = None
     cookie = Cookie.SimpleCookie()
-    element = env['PATH_INFO']
-    if element.startswith('/sessions/current/'):
-        element = None
     if 'HTTP_COOKIE' in env:
         #attempt to use the cookie.  If it matches
         cc = RobustCookie()
@@ -299,7 +291,7 @@ def _authorize_request(env, operation):
                     httpsessions[sessionid]['expiry'] = time.time() + 90
                     name = httpsessions[sessionid]['name']
                     authdata = auth.authorize(
-                        name, element=element, operation=operation,
+                        name, element=None,
                         skipuserobj=httpsessions[sessionid]['skipuserobject'])
     if (not authdata) and 'HTTP_AUTHORIZATION' in env:
         if env['PATH_INFO'] == '/sessions/current/logout':
@@ -311,11 +303,9 @@ def _authorize_request(env, operation):
                 return {'code': 401}
             return ('logout',)
         name, passphrase = base64.b64decode(
-            env['HTTP_AUTHORIZATION'].replace('Basic ', '')).split(b':', 1)
-        authdata = auth.check_user_passphrase(name, passphrase, operation=operation, element=element)
-        if authdata is False:
-            return {'code': 403}
-        elif not authdata:
+            env['HTTP_AUTHORIZATION'].replace('Basic ', '')).split(':', 1)
+        authdata = auth.check_user_passphrase(name, passphrase, element=None)
+        if not authdata:
             return {'code': 401}
         sessid = util.randomstring(32)
         while sessid in httpsessions:
@@ -325,14 +315,14 @@ def _authorize_request(env, operation):
                                 'inflight': set([])}
         if 'HTTP_CONFLUENTAUTHTOKEN' in env:
             httpsessions[sessid]['csrftoken'] = util.randomstring(32)
-        cookie['confluentsessionid'] = util.stringify(sessid)
+        cookie['confluentsessionid'] = sessid
         cookie['confluentsessionid']['secure'] = 1
         cookie['confluentsessionid']['httponly'] = 1
         cookie['confluentsessionid']['path'] = '/'
     skiplog = _should_skip_authlog(env)
     if authdata:
         auditmsg = {
-            'user': util.stringify(name),
+            'user': name,
             'operation': operation,
             'target': env['PATH_INFO'],
         }
@@ -344,7 +334,7 @@ def _authorize_request(env, operation):
         if authdata[3] is not None:
             auditmsg['tenant'] = authdata[3]
             authinfo['tenant'] = authdata[3]
-        auditmsg['user'] = util.stringify(authdata[2])
+        auditmsg['user'] = authdata[2]
         if sessid is not None:
             authinfo['sessionid'] = sessid
         if not skiplog:
@@ -352,10 +342,15 @@ def _authorize_request(env, operation):
         if 'csrftoken' in httpsessions[sessid]:
             authinfo['authtoken'] = httpsessions[sessid]['csrftoken']
         return authinfo
-    elif authdata is None:
-        return {'code': 401}
     else:
-        return {'code': 403}
+        return {'code': 401}
+        # TODO(jbjohnso): actually evaluate the request for authorization
+        # In theory, the x509 or http auth stuff will get translated and then
+        # passed on to the core authorization function in an appropriate form
+        # expresses return in the form of http code
+        # 401 if there is no known identity
+        # 403 if valid identity, but no access
+        # going to run 200 just to get going for now
 
 
 def _pick_mimetype(env):
@@ -390,11 +385,11 @@ def resourcehandler(env, start_response):
     try:
         for rsp in resourcehandler_backend(env, start_response):
             yield rsp
-    except Exception as e:
+    except:
         tracelog.log(traceback.format_exc(), ltype=log.DataTypes.event,
                      event=log.Events.stacktrace)
-        start_response('500 - ' + str(e), [])
-        yield '500 - ' + str(e)
+        start_response('500 - Internal Server Error', [])
+        yield '500 - Internal Server Error'
         return
 
 
@@ -435,7 +430,7 @@ def resourcehandler_backend(env, start_response):
         return
     if authorized['code'] == 403:
         start_response('403 Forbidden', badauth)
-        yield 'Forbidden'
+        yield 'authorization failed'
         return
     if authorized['code'] != 200:
         raise Exception("Unrecognized code from auth engine")
@@ -443,6 +438,11 @@ def resourcehandler_backend(env, start_response):
         ("Set-Cookie", m.OutputString())
         for m in authorized['cookie'].values())
     cfgmgr = authorized['cfgmgr']
+    if (env['PATH_INFO'].startswith('/xcat')):
+        global xcat_cfm
+        if xcat_cfm is None:
+            xcat_cfm = xCATConfigManager()
+        cfgmgr = xcat_cfm
     if (operation == 'create') and env['PATH_INFO'] == '/sessions/current/async':
         pagecontent = ""
         try:
@@ -452,8 +452,6 @@ def resourcehandler_backend(env, start_response):
                             httpsessions[authorized['sessionid']]['inflight'])):
                 pagecontent += rsp
             start_response("200 OK", headers)
-            if not isinstance(pagecontent, bytes):
-                pagecontent = pagecontent.encode('utf-8')
             yield pagecontent
             return
         except exc.ConfluentException as e:
@@ -477,10 +475,6 @@ def resourcehandler_backend(env, start_response):
         funport = forwarder.get_port(targip, env['HTTP_X_FORWARDED_FOR'],
                                      authorized['sessionid'])
         host = env['HTTP_X_FORWARDED_HOST']
-        if ']' in host:
-            host = host.split(']')[0] + ']'
-        elif ':' in host:
-            host = host.rsplit(':', 1)[0]
         url = 'https://{0}:{1}/'.format(host, funport)
         start_response('302', [('Location', url)])
         yield 'Our princess is in another castle!'
@@ -499,7 +493,7 @@ def resourcehandler_backend(env, start_response):
             auditmsg = {
                 'operation': 'start',
                 'target': env['PATH_INFO'],
-                'user': util.stringify(authorized['username']),
+                'user': authorized['username'],
             }
             if 'tenant' in authorized:
                 auditmsg['tenant'] = authorized['tenant']
@@ -634,7 +628,6 @@ def resourcehandler_backend(env, start_response):
             sessinfo = {'username': authorized['username']}
             if 'authtoken' in authorized:
                 sessinfo['authtoken'] = authorized['authtoken']
-            tlvdata.unicode_dictvalues(sessinfo)
             yield json.dumps(sessinfo)
             return
         resource = '.' + url[url.rindex('/'):]
@@ -656,8 +649,6 @@ def resourcehandler_backend(env, start_response):
                 for datum in _assemble_json(hdlr, resource, url, extension):
                     pagecontent += datum
             start_response('200 OK', headers)
-            if not isinstance(pagecontent, bytes):
-                pagecontent = pagecontent.encode('utf-8')
             yield pagecontent
         except exc.ConfluentException as e:
             if ((not isinstance(e, exc.LockedCredentials)) and
@@ -742,7 +733,7 @@ def _assemble_json(responses, resource=None, url=None, extension=None):
     for rsp in responses:
         if isinstance(rsp, confluent.messages.LinkRelation):
             haldata = rsp.raw()
-            for hk in haldata:
+            for hk in haldata.iterkeys():
                 if 'href' in haldata[hk]:
                     if isinstance(haldata[hk]['href'], int):
                         haldata[hk]['href'] = str(haldata[hk]['href'])
@@ -758,7 +749,7 @@ def _assemble_json(responses, resource=None, url=None, extension=None):
                     links[hk] = haldata[hk]
         else:
             rsp = rsp.raw()
-            for dk in rsp:
+            for dk in rsp.iterkeys():
                 if dk in rspdata:
                     if isinstance(rspdata[dk], list):
                         if isinstance(rsp[dk], list):
@@ -777,8 +768,8 @@ def _assemble_json(responses, resource=None, url=None, extension=None):
                         rspdata[dk] = rsp[dk]
     rspdata["_links"] = links
     tlvdata.unicode_dictvalues(rspdata)
-    yield util.stringify(json.dumps(
-        rspdata, sort_keys=True, indent=4, ensure_ascii=False).encode('utf-8'))
+    yield json.dumps(
+        rspdata, sort_keys=True, indent=4, ensure_ascii=False).encode('utf-8')
 
 
 def serve(bind_host, bind_port):
@@ -805,16 +796,9 @@ def serve(bind_host, bind_port):
                 ' a second\n')
             eventlet.sleep(1)
     # TCP_FASTOPEN
-    try:
-        sock.setsockopt(socket.SOL_TCP, 23, 5)
-    except Exception:
-        pass  # we gave it our best shot there
-    try:
-        eventlet.wsgi.server(sock, resourcehandler, log=False, log_output=False,
-                             debug=False, socket_timeout=60)
-    except TypeError:
-        # Older eventlet in place, skip arguments it does not understand
-        eventlet.wsgi.server(sock, resourcehandler, log=False, debug=False)
+    sock.setsockopt(socket.SOL_TCP, 23, 5)
+    eventlet.wsgi.server(sock, resourcehandler, log=False, log_output=False,
+                         debug=False, socket_timeout=60)
 
 
 class HttpApi(object):

confluent_server/confluent/log.py

@@ -51,15 +51,11 @@
 #    - leading bit reserved, 0 for now
 #    - length of metadata record 7 bits
 #    - type of data referenced by this entry (one byte), currently:
-#       0=text event, 1=json, 2=console data, 3=event
+#       0=text event, 1=json, 2=console data
 #    - offset into the text log to begin (4 bytes)
 #    - length of data referenced by this entry (2 bytes)
-#    - UTC timestamp of this entry in seconds since epoch (unsigned 32 bit)
-#    - Event type (per 'Events' class below)
-#    - Event data (per event, currently used by connect/disconnect to represent
-#      single or multiple connections by user and for 'appmode' and 'shiftin'
-#      status for console
-#    - 2 reserved bytes
+#    - UTC timestamp of this entry in seconds since epoch (unsigned 32 bit?)
+#    - CRC32 over the record
 #    (a future extended version might include suport for Forward Secure Sealing
 #    or other fields)
 
@@ -76,13 +72,7 @@ import stat
 import struct
 import time
 import traceback
-try:
-    unicode
-except NameError:
-    unicode = str
 
-daemonized = False
-logfull = False
 try:
     from fcntl import flock, LOCK_EX, LOCK_UN, LOCK_SH
 except ImportError:
@@ -160,36 +150,21 @@ class BaseRotatingHandler(object):
         Output the record to the file, catering for rollover as described
         in doRollover().
         """
-        global logfull
-        try:
-            rolling_type = self.shouldRollover(binrecord, textrecord)
-            if rolling_type:
-                flock(self.textfile, LOCK_UN)
-                return self.doRollover(rolling_type)
-            return None
-        except (IOError, OSError) as e:
-            if not daemonized:
-                raise
-            logfull = True
-
+        rolling_type = self.shouldRollover(binrecord, textrecord)
+        if rolling_type:
+            flock(self.textfile, LOCK_UN)
+            return self.doRollover(rolling_type)
+        return None
 
     def emit(self, binrecord, textrecord):
-        global logfull
-        try:
-            if self.textfile is None:
-                self.textfile = open(self.textpath, mode='ab')
-            if self.binfile is None:
-                self.binfile = open(self.binpath, mode='ab')
-            if not isinstance(textrecord, bytes):
-                textrecord = textrecord.encode('utf-8')
-            self.textfile.write(textrecord)
-            self.binfile.write(binrecord)
-            self.textfile.flush()
-            self.binfile.flush()
-        except (IOError, OSError) as e:
-            if not daemonized:
-                raise
-            logfull = True
+        if self.textfile is None:
+            self.textfile = open(self.textpath, mode='ab')
+        if self.binfile is None:
+            self.binfile = open(self.binpath, mode='ab')
+        self.textfile.write(textrecord)
+        self.binfile.write(binrecord)
+        self.textfile.flush()
+        self.binfile.flush()
 
     def get_textfile_offset(self, data_len):
         if self.textfile is None:
@@ -586,39 +561,28 @@ class Logger(object):
                 textdate = time.strftime(
                     '%b %d %H:%M:%S ', time.localtime(tstamp))
             flock(textfile, LOCK_EX)
-            try:
-                offset = textfile.tell() + len(textdate)
-                datalen = len(data)
-                eventaux = entry[4]
-                if eventaux is None:
-                    eventaux = 0
-                # metadata length is always 16 for this code at the moment
-                binrecord = struct.pack(
-                    ">BBIHIBBH", 16, ltype, offset, datalen, tstamp, evtdata,
-                    eventaux, 0)
-                if self.isconsole:
-                    if ltype == 2:
-                        textrecord = data
-                    else:
-                        if not isinstance(textdate, bytes):
-                            textdate = textdate.encode('utf-8')
-                        if not isinstance(data, bytes):
-                            data = data.encode('utf-8')
-                        textrecord = textdate + data + b']'
+            offset = textfile.tell() + len(textdate)
+            datalen = len(data)
+            eventaux = entry[4]
+            if eventaux is None:
+                eventaux = 0
+            # metadata length is always 16 for this code at the moment
+            binrecord = struct.pack(
+                ">BBIHIBBH", 16, ltype, offset, datalen, tstamp, evtdata,
+                eventaux, 0)
+            if self.isconsole:
+                if ltype == 2:
+                    textrecord = data
                 else:
-                    textrecord = textdate + data
-                    if not textrecord.endswith('\n'):
-                        textrecord += '\n'
-                files = self.handler.try_emit(binrecord, textrecord)
-            except struct.error:
-                files = self.handler.doRollover(RollingTypes.size_rolling)
-            finally:
-                try:
-                    flock(textfile, LOCK_UN)
-                except Exception:
-                    pass
+                    textrecord = textdate + data + ']'
+            else:
+                textrecord = textdate + data
+                if not textrecord.endswith('\n'):
+                    textrecord += '\n'
+            files = self.handler.try_emit(binrecord, textrecord)
             if not files:
                 self.handler.emit(binrecord, textrecord)
+                flock(textfile, LOCK_UN)
             else:
                 # Log the rolling event at first, then log the last data
                 # which cause the rolling event.
@@ -752,7 +716,7 @@ class Logger(object):
         pass
 
     def log(self, logdata=None, ltype=None, event=0, eventdata=None):
-        if type(logdata) not in (bytes, unicode, dict):
+        if type(logdata) not in (str, unicode, dict):
             raise Exception("Unsupported logdata")
         if ltype is None:
             if type(logdata) == dict:
@@ -789,17 +753,15 @@ globaleventlog = None
 tracelog = None
 
 
-def log(logdata=None, ltype=None, event=0, eventdata=None, flush=False):
+def log(logdata=None, ltype=None, event=0, eventdata=None):
     global globaleventlog
     if globaleventlog is None:
         globaleventlog = Logger('events')
     globaleventlog.log(logdata, ltype, event, eventdata)
-    if flush:
-        globaleventlog.writedata()
 
 def logtrace():
     global tracelog
     if tracelog is None:
         tracelog = Logger('trace', buffered=False)
     tracelog.log(traceback.format_exc(), ltype=DataTypes.event,
-                 event=Events.stacktrace)
+                 event=Events.stacktrace)

confluent_server/confluent/main.py

@@ -43,11 +43,9 @@ except ImportError:
 import confluent.discovery.core as disco
 import eventlet
 dbgif = False
-try:
+if  map(int, (eventlet.__version__.split('.'))) > [0, 18]:
     import eventlet.backdoor as backdoor
     dbgif = True
-except Exception:
-    pass
 havefcntl = True
 try:
     import fcntl
@@ -74,7 +72,7 @@ def _daemonize():
     os.setsid()
     thispid = os.fork()
     if thispid > 0:
-        print('confluent server starting as pid {0}'.format(thispid))
+        print 'confluent server starting as pid %d' % thispid
         os._exit(0)
     os.closerange(0, 2)
     os.umask(63)
@@ -83,7 +81,6 @@ def _daemonize():
     os.dup2(0, 2)
     sys.stdout = log.Logger('stdout', buffered=False)
     sys.stderr = log.Logger('stderr', buffered=False)
-    log.daemonized = True
 
 
 def _updatepidfile():
@@ -227,11 +224,6 @@ def run():
     except:
         doexit()
         raise
-    try:
-        log.log({'info': 'Confluent management service starting'}, flush=True)
-    except (OSError, IOError) as e:
-        print(repr(e))
-        sys.exit(1)
     _daemonize()
     if havefcntl:
         _updatepidfile()
@@ -239,7 +231,7 @@ def run():
     signal.signal(signal.SIGTERM, terminate)
     collective.startup()
     if dbgif:
-        oumask = os.umask(0o077)
+        oumask = os.umask(0077)
         try:
             os.remove('/var/run/confluent/dbg.sock')
         except OSError:

confluent_server/confluent/messages.py

@@ -1,7 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2014 IBM Corporation
-# 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.
@@ -20,17 +20,10 @@
 # format.  This is also how different data formats are supported
 import confluent.exceptions as exc
 import confluent.config.configmanager as cfm
-import confluent.config.conf as cfgfile
 from copy import deepcopy
 from datetime import datetime
-import confluent.util as util
 import json
 
-try:
-    unicode
-except NameError:
-    unicode = str
-
 valid_health_values = set([
     'ok',
     'warning',
@@ -39,17 +32,6 @@ valid_health_values = set([
     'unknown',
 ])
 
-passcomplexity = cfgfile.get_option('policy', 'passwordcomplexity')
-passminlength = cfgfile.get_option('policy', 'passwordminlength')
-if passminlength:
-    passminlength = int(passminlength)
-else:
-    passminlength = 0
-if passcomplexity:
-    passcomplexity = int(passcomplexity)
-else:
-    passcomplexity = 0
-
 def simplify_name(name):
     return name.lower().replace(' ', '_').replace('/', '-').replace(
         '_-_', '-')
@@ -60,9 +42,7 @@ def _htmlify_structure(indict):
     if isinstance(indict, dict):
         for key in sorted(indict):
             ret += "<li>{0}: ".format(key)
-            if type(indict[key]) in (bytes, unicode):
-                ret += util.stringify(indict[key])
-            if type(indict[key]) in (float, int):
+            if type(indict[key]) in (str, unicode, float, int):
                 ret += str(indict[key])
             elif isinstance(indict[key], datetime):
                 ret += indict[key].strftime('%Y-%m-%dT%H:%M:%S')
@@ -70,7 +50,7 @@ def _htmlify_structure(indict):
                 ret += _htmlify_structure(indict[key])
     elif isinstance(indict, list):
         if len(indict) > 0:
-            if type(indict[0]) in (bytes, unicode, None):
+            if type(indict[0]) in (str, unicode, None):
                 nd = []
                 for datum in indict:
                     if datum is None:
@@ -129,14 +109,14 @@ class ConfluentMessage(object):
             return self._generic_html_value(self.kvpairs)
         if not self.stripped:
             htmlout = ''
-            for node in self.kvpairs:
+            for node in self.kvpairs.iterkeys():
                 htmlout += '{0}:{1}\n'.format(
                     node, self._generic_html_value(self.kvpairs[node]))
             return htmlout
 
     def _generic_html_value(self, pairs):
         snippet = ""
-        for key in pairs:
+        for key in pairs.iterkeys():
             val = pairs[key]
             value = self.defaultvalue
             if isinstance(val, dict) and 'type' in val:
@@ -164,7 +144,7 @@ class ConfluentMessage(object):
                         '<input type="checkbox" name="restexplorerhonorkey" '
                         'value="{1}">\r').format(valtype, key, self.desc)
                 return snippet
-            if (isinstance(val, bool) or isinstance(val, bytes) or
+            if (isinstance(val, bool) or isinstance(val, str) or
                     isinstance(val, unicode)):
                 value = str(val)
             elif val is not None and 'value' in val:
@@ -287,24 +267,6 @@ class CreatedResource(ConfluentMessage):
         pass
 
 
-class RenamedResource(ConfluentMessage):
-    notnode = True
-    readonly = True
-
-    def __init__(self, oldname, newname):
-        self.kvpairs = {'oldname': oldname, 'newname': newname}
-
-    def strip_node(self, node):
-        pass
-
-
-class RenamedNode(ConfluentMessage):
-    def __init__(self, name, rename):
-        self.desc = 'New Name'
-        kv = {'rename': {'value': rename}}
-        self.kvpairs = {name: kv}
-
-
 class AssignedResource(ConfluentMessage):
     notnode = True
     readonly = True
@@ -329,14 +291,14 @@ class ConfluentChoiceMessage(ConfluentMessage):
             return self._create_option(self.kvpairs)
         else:
             htmlout = ''
-            for node in self.kvpairs:
+            for node in self.kvpairs.iterkeys():
                 htmlout += '{0}:{1}\n'.format(
                     node, self._create_option(self.kvpairs[node]))
             return htmlout
 
     def _create_option(self, pairdata):
         snippet = ''
-        for key in pairdata:
+        for key in pairdata.iterkeys():
             val = pairdata[key]
             snippet += key + ':<select name="%s">' % key
             valid_values = self.valid_values
@@ -419,9 +381,7 @@ def get_input_message(path, operation, inputdata, nodes=None, multinode=False,
         return InputReseatMessage(path, nodes, inputdata)
     elif path == ['attributes', 'expression']:
         return InputExpression(path, inputdata, nodes)
-    elif path == ['attributes', 'rename']:
-        return InputConfigChangeSet(path, inputdata, nodes, configmanager)
-    elif path[0] in ('attributes', 'users', 'usergroups') and operation != 'retrieve':
+    elif path[0] in ('attributes', 'users') and operation != 'retrieve':
         return InputAttributes(path, inputdata, nodes)
     elif path == ['boot', 'nextdevice'] and operation != 'retrieve':
         return InputBootDevice(path, nodes, inputdata)
@@ -458,11 +418,10 @@ def get_input_message(path, operation, inputdata, nodes=None, multinode=False,
     elif (path[:4] == ['configuration', 'management_controller', 'ntp',
             'servers'] and operation != 'retrieve' and len(path) == 5):
         return InputNTPServer(path, nodes, inputdata)
-    elif (path[:3] in (['configuration', 'system', 'all'],
-            ['configuration', 'management_controller', 'extended']) and
+    elif (path[:3] == ['configuration', 'system', 'all'] and
             operation != 'retrieve'):
         return InputConfigChangeSet(path, inputdata, nodes, configmanager)
-    elif (path[0] == 'configuration' and path[2] == 'clear'  and
+    elif (path[:3] == ['configuration', 'system', 'clear'] and
             operation != 'retrieve'):
         return InputConfigClear(path, inputdata, nodes, configmanager)
     elif (path[:3] == ['configuration', 'storage', 'disks'] and
@@ -479,8 +438,6 @@ def get_input_message(path, operation, inputdata, nodes=None, multinode=False,
         return InputMedia(path, nodes, inputdata, configmanager)
     elif '/'.join(path).startswith('support/servicedata') and inputdata:
         return InputMedia(path, nodes, inputdata, configmanager)
-    elif '/'.join(path).startswith('configuration/management_controller/save_licenses') and inputdata:
-        return InputMedia(path, nodes, inputdata, configmanager)
     elif '/'.join(path).startswith(
             'configuration/management_controller/licenses') and inputdata:
         return InputLicense(path, nodes, inputdata, configmanager)
@@ -491,7 +448,7 @@ def get_input_message(path, operation, inputdata, nodes=None, multinode=False,
 class InputFirmwareUpdate(ConfluentMessage):
 
     def __init__(self, path, nodes, inputdata, configmanager):
-        self._filename = inputdata.get('filename', inputdata.get('url', inputdata.get('dirname', None)))
+        self._filename = inputdata.get('filename', inputdata.get('url', None))
         self.bank = inputdata.get('bank', None)
         self.nodes = nodes
         self.filebynode = {}
@@ -533,10 +490,6 @@ class Media(ConfluentMessage):
     def __init__(self, node, media):
         self.kvpairs = {node: {'name': media.name, 'url': media.url}}
 
-class SavedFile(ConfluentMessage):
-    def __init__(self, node, file):
-        self.kvpairs = {node: {'filename': file}}
-
 class InputAlertData(ConfluentMessage):
 
     def __init__(self, path, inputdata, nodes=None):
@@ -586,6 +539,8 @@ class InputConfigClear(ConfluentMessage):
             raise exc.InvalidArgumentException('Input must be {"clear":true}')
 
 class InputConfigChangeSet(InputExpression):
+    # For now, this is identical to InputExpression, later it may
+    # internalize formula expansion, but not now..
     def __init__(self, path, inputdata, nodes=None, configmanager=None):
         self.cfm = configmanager
         super(InputConfigChangeSet, self).__init__(path, inputdata, nodes)
@@ -595,7 +550,7 @@ class InputConfigChangeSet(InputExpression):
         endattrs = {}
         for attr in attrs:
             origval = attrs[attr]
-            if isinstance(origval, bytes) or isinstance(origval, unicode):
+            if isinstance(origval, str) or isinstance(origval, unicode):
                 origval = {'expression': origval}
             if 'expression' not in origval:
                 endattrs[attr] = attrs[attr]
@@ -622,7 +577,7 @@ class InputAttributes(ConfluentMessage):
         if nodes is None:
             self.attribs = inputdata
             for attrib in self.attribs:
-                if type(self.attribs[attrib]) in (bytes, unicode):
+                if type(self.attribs[attrib]) in (str, unicode):
                     try:
                         # ok, try to use format against the string
                         # store back result to the attribute to
@@ -643,12 +598,12 @@ class InputAttributes(ConfluentMessage):
         for node in nodes:
             self.nodeattribs[node] = inputdata
 
-    def get_attributes(self, node, validattrs=None):
+    def get_attributes(self, node):
         if node not in self.nodeattribs:
             return {}
         nodeattr = deepcopy(self.nodeattribs[node])
         for attr in nodeattr:
-            if type(nodeattr[attr]) in (bytes, unicode):
+            if type(nodeattr[attr]) in (str, unicode):
                 try:
                     # as above, use format() to see if string follows
                     # expression, store value back in case of escapes
@@ -658,82 +613,15 @@ class InputAttributes(ConfluentMessage):
                     # an expression string will error if format() done
                     # use that as cue to put it into config as an expr
                     nodeattr[attr] = {'expression': nodeattr[attr]}
-            if validattrs and 'validvalues' in validattrs.get(attr, []):
-                if (nodeattr[attr] and
-                        nodeattr[attr] not in validattrs[attr]['validvalues']):
-                    raise exc.InvalidArgumentException(
-                        'Attribute {0} does not accept value {1} (valid values would be {2})'.format(
-                            attr, nodeattr[attr], ','.join(validattrs[attr]['validvalues'])))
-            elif validattrs and 'validlist' in validattrs.get(attr, []) and nodeattr[attr]:
-                req = nodeattr[attr].split(',')
-                for v in req:
-                    if v and v not in validattrs[attr]['validlist']:
-                        raise exc.InvalidArgumentException(
-                            'Attribute {0} does not accept list member '
-                            '{1} (valid values would be {2})'.format(
-                                attr, v, ','.join(
-                                    validattrs[attr]['validlist'])))
-            elif validattrs and 'validlistkeys' in validattrs.get(attr, []) and nodeattr[attr]:
-                req = nodeattr[attr].split(',')
-                for v in req:
-                    if '=' not in v:
-                        raise exc.InvalidArgumentException(
-                            'Passed key {0} requires a parameter'.format(v))
-                    v = v.split('=', 1)[0]
-                    if v and v not in validattrs[attr]['validlistkeys']:
-                        raise exc.InvalidArgumentException(
-                            'Attribute {0} does not accept key {1} (valid values would be {2})'.format(
-                                attr, v, ','.join(
-                                    validattrs[attr]['validlistkeys'])
-                            )
-                        )
         return nodeattr
 
-def checkPassword(password, username):
-    lowercase = set('abcdefghijklmnopqrstuvwxyz')
-    uppercase = set('abcdefghijklmnopqrstuvwxyz'.upper())
-    numbers = set('0123456789')
-    special = set('`~!@#$%^&*()-_=+[{]};:"/?.>,<' + "'")
-    if len(password) < passminlength:
-        raise exc.InvalidArgumentException('Password must be at least {0} characters long'.format(passminlength))
-    if not isinstance(passcomplexity, int) or passcomplexity < 1:
-        return
-    if not bool(set(password.lower()) & lowercase):  # rule 1
-        raise exc.InvalidArgumentException('Password must contain at least one letter')
-    if passcomplexity < 2:
-        return
-    thepass = set(password)
-    if not bool(thepass & numbers):  # rule 2
-        raise exc.InvalidArgumentException('Password must contain at least one number')
-    if passcomplexity < 3:
-        return
-    classes = 0
-    for charclass in (lowercase, uppercase, special):
-        if bool(thepass & charclass):
-            classes += 1
-    if classes < 2:
-        raise exc.InvalidArgumentException('Password must contain at least two of upper case letter, lower case letter, and/or special character')
-    if passcomplexity < 4:
-        return
-    if username and password in (username, username[::-1]): # rule 4
-        raise exc.InvalidArgumentException('Password must not be similar to username')
-    if passcomplexity < 5:
-        return
-    for char in thepass:
-        if char * 3 in password:
-            raise exc.InvalidArgumentException('Password must not contain any of the same character repeated 3 times')
-
-
 
 class InputCredential(ConfluentMessage):
     valid_privilege_levels = set([
         'callback',
         'user',
-        'ReadOnly',
         'operator',
-        'Operator',
         'administrator',
-        'Administrator',
         'proprietary',
         'no_access',
     ])
@@ -751,21 +639,33 @@ class InputCredential(ConfluentMessage):
         if len(path) == 4:
             inputdata['uid'] = path[-1]
         # if the operation is 'create' check if all fields are present
-        if (type(inputdata['uid']) in (bytes, unicode) and
+        missingattrs = []
+        for attrname in ('uid', 'privilege_level', 'username', 'password'):
+            if attrname not in inputdata:
+                missingattrs.append(attrname)
+        if missingattrs:
+            raise exc.InvalidArgumentException(
+                'Required fields missing: {0}'.format(','.join(missingattrs)))
+        if (isinstance(inputdata['uid'], str) and
                 not inputdata['uid'].isdigit()):
-            inputdata['uid'] = inputdata['uid']
+            raise exc.InvalidArgumentException('uid must be a number')
         else:
             inputdata['uid'] = int(inputdata['uid'])
         if ('privilege_level' in inputdata and
               inputdata['privilege_level'] not in self.valid_privilege_levels):
             raise exc.InvalidArgumentException('privilege_level is not one of '
                                         + ','.join(self.valid_privilege_levels))
+        if 'username' in inputdata and len(inputdata['username']) > 16:
+            raise exc.InvalidArgumentException(
+                                        'name must be less than or = 16 chars')
+        if 'password' in inputdata and len(inputdata['password']) > 20:
+            raise exc.InvalidArgumentException('password has limit of 20 chars')
+
         if ('enabled' in inputdata and
             inputdata['enabled'] not in self.valid_enabled_values):
             raise exc.InvalidArgumentException('valid values for enabled are '
                                                             + 'yes and no')
-        if 'password' in inputdata and (passcomplexity or passminlength):
-            checkPassword(inputdata['password'], inputdata.get('username', None))
+
         if nodes is None:
             raise exc.InvalidArgumentException(
                 'This only supports per-node input')
@@ -777,7 +677,7 @@ class InputCredential(ConfluentMessage):
             return {}
         credential = deepcopy(self.credentials[node])
         for attr in credential:
-            if type(credential[attr]) in (bytes, unicode):
+            if type(credential[attr]) in (str, unicode):
                 try:
                     # as above, use format() to see if string follows
                     # expression, store value back in case of escapes
@@ -831,7 +731,6 @@ class InputIdentifyMessage(ConfluentInputMessage):
     valid_values = set([
         'on',
         'off',
-        'blink',
     ])
 
     keyname = 'identify'
@@ -863,9 +762,6 @@ class InputVolumes(ConfluentInputMessage):
             sizes = inputdata.get('size', [None])
             if not isinstance(sizes, list):
                 sizes = sizes.split(',')
-            stripsizes = inputdata.get('stripsizes', [None])
-            if not isinstance(stripsizes, list):
-                stripsizes = stripsizes.split(',')
             disks = inputdata.get('disks', [])
             if not disks:
                 raise exc.InvalidArgumentException(
@@ -877,15 +773,8 @@ class InputVolumes(ConfluentInputMessage):
                     currname = volnames.pop(0)
                 else:
                     currname = None
-                if stripsizes:
-                    currstripsize = stripsizes.pop(0)
-                    if currstripsize:
-                        currstripsize = int(currstripsize)
-                else:
-                    currstripsize = None
                 inputdata.append(
                     {'name': currname, 'size': size,
-                     'stripsize': currstripsize,
                      'disks': disks,
                      'raidlevel': raidlvl})
         for node in nodes:
@@ -907,7 +796,6 @@ class InputVolumes(ConfluentInputMessage):
                 self.inputbynode[node].append({'name': volname,
                                                'size': volsize,
                                                'disks': disks,
-                                               'stripsize': input.get('stripsize', None),
                                                'raidlevel': raidlvl,
                                                })
 
@@ -1257,9 +1145,7 @@ class EventCollection(ConfluentMessage):
                 'event': event.get('event', None),
                 'severity': event['severity'],
                 'timestamp': event.get('timestamp', None),
-                'message': event.get('message', None),
                 'record_id': event.get('record_id', None),
-                'log_id': event.get('log_id', None),
             }
             if event['severity'] not in valid_health_values:
                 raise exc.NotImplementedException(
@@ -1313,15 +1199,14 @@ class AsyncSession(ConfluentMessage):
         self.kvpairs = {'asyncid': id}
 
 class User(ConfluentMessage):
-    def __init__(self, uid, username, privilege_level, name=None, expiration=None):
+    def __init__(self, uid, username, privilege_level, name=None):
         self.desc = 'foo'
         self.stripped = False
         self.notnode = name is None
         kvpairs = {'username': {'value': username},
                    'password': {'value': '', 'type': 'password'},
                    'privilege_level': {'value': privilege_level},
-                   'enabled': {'value': ''},
-                   'expiration': {'value': expiration},
+                   'enabled': {'value': ''}
                    }
         if self.notnode:
             self.kvpairs = kvpairs
@@ -1340,7 +1225,6 @@ class UserCollection(ConfluentMessage):
             entry = {
                 'uid': user['uid'],
                 'username': user['name'],
-                'expiration': user.get('expiration', None),
                 'privilege_level': user['access']['privilege_level']
             }
             userlist.append(entry)
@@ -1367,7 +1251,7 @@ class AlertDestination(ConfluentMessage):
 
 class InputAlertDestination(ConfluentMessage):
     valid_alert_params = {
-        'acknowledge': lambda x: False if type(x) in (unicode, bytes) and x.lower() == 'false' else bool(x),
+        'acknowledge': lambda x: False if type(x) in (unicode,str) and x.lower() == 'false' else bool(x),
         'acknowledge_timeout': lambda x: int(x) if x and x.isdigit() else None,
         'ip': lambda x: x,
         'retries': lambda x: int(x)
@@ -1472,13 +1356,12 @@ class Array(ConfluentMessage):
         }
 
 class Volume(ConfluentMessage):
-    def __init__(self, name, volname, size, state, array, stripsize=None):
+    def __init__(self, name, volname, size, state, array):
         self.kvpairs = {
             name: {
                 'type': 'volume',
                 'name': simplify_name(volname),
                 'label': volname,
-                'stripsize': stripsize,
                 'size': size,
                 'state': state,
                 'array': array,
@@ -1495,7 +1378,6 @@ class Disk(ConfluentMessage):
     state_aliases = {
         'unconfigured good': 'unconfigured',
         'global hot spare': 'hotspare',
-        'dedicated hot spare': 'hotspare',
     }
 
     def _normalize_state(self, instate):
@@ -1581,7 +1463,7 @@ class Attributes(ConfluentMessage):
         nkv = {}
         self.notnode = name is None
         for key in kv:
-            if type(kv[key]) in (bytes, unicode):
+            if type(kv[key]) in (str, unicode):
                 nkv[key] = {'value': kv[key]}
             else:
                 nkv[key] = kv[key]
@@ -1673,12 +1555,12 @@ class NTPServer(ConfluentMessage):
 class License(ConfluentMessage):
     readonly = True
 
-    def __init__(self, name=None, kvm=None, feature=None, state=None):
+    def __init__(self, name=None, kvm=None, feature=None):
         self.notnode = name is None
         self.desc = 'License'
 
         kv = []
-        kv.append({'kvm_availability': str(kvm), 'feature': feature, 'state': state})
+        kv.append({'kvm_availability': str(kvm), 'feature': feature})
         if self.notnode:
             self.kvpairs = {'License': kv}
         else:
@@ -1692,10 +1574,14 @@ class CryptedAttributes(Attributes):
         # for now, just keep the dictionary keys and discard crypt value
         self.desc = desc
         nkv = {}
-        for key in kv:
-            nkv[key] = {'isset': False}
+        for key in kv.iterkeys():
             try:
-                if kv[key] is not None and kv[key]['cryptvalue'] != '':
+                if kv[key] is None:
+                    continue
+                elif not isinstance(kv[key], dict):
+                    self.defaulttype = 'text'
+                    nkv[key] = kv[key]
+                elif kv[key] is not None and kv[key]['cryptvalue'] != '':
                     nkv[key] = {'isset': True}
                     nkv[key]['inheritedfrom'] = kv[key]['inheritedfrom']
             except KeyError:

confluent_server/confluent/neighutil.py

@@ -18,7 +18,6 @@
 # Ultimately, this should use AF_NETLINK, but in the interest of time,
 # use ip neigh for the moment
 
-import confluent.util as util
 import eventlet.green.subprocess as subprocess
 import os
 
@@ -40,7 +39,6 @@ def update_neigh():
                                  stdout=subprocess.PIPE,
                                  stderr=subprocess.PIPE)
     (neighdata, err) = ipn.communicate()
-    neighdata = util.stringify(neighdata)
     for entry in neighdata.split('\n'):
         entry = entry.split(' ')
         if len(entry) < 5 or not entry[4]:

confluent_server/confluent/netutil.py

@@ -24,19 +24,6 @@ import eventlet.support.greendns
 getaddrinfo = eventlet.support.greendns.getaddrinfo
 
 
-def mask_to_cidr(mask):
-    maskn = socket.inet_pton(socket.AF_INET, mask)
-    maskn = struct.unpack('!I', maskn)[0]
-    cidr = 32
-    while maskn & 0b1 == 0 and cidr > 0:
-        cidr -= 1
-        maskn >>= 1
-    return cidr
-
-def cidr_to_mask(cidr):
-    return socket.inet_ntop(
-        socket.AF_INET, struct.pack('!I', (2**32 - 1) ^ (2**(32 - cidr) - 1)))
-
 def ip_on_same_subnet(first, second, prefix):
     addrinf = socket.getaddrinfo(first, None, 0, socket.SOCK_STREAM)[0]
     fam = addrinf[0]

confluent_server/confluent/networking/lldp.py

@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2016-2019 Lenovo
+# 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.
@@ -105,11 +105,7 @@ def close_enough(fuzz, literal):
     if fuzz == literal:
         return True
     fuzz = '^' + fuzz.replace('-', '[/: -]') + '$'
-    try:
-        matcher = re.compile(fuzz)
-    except Exception:
-        raise exc.InvalidArgumentException(
-            'Invalid regular expression specified')
+    matcher = re.compile(fuzz)
     return bool(matcher.match(literal))
 
 

confluent_server/confluent/networking/macmap.py

@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2016-2019 Lenovo
+# 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.
@@ -315,12 +315,10 @@ def _full_updatemacmap(configmanager):
                 'Network topology not available to tenants')
         # here's a list of switches... need to add nodes that are switches
         nodelocations = configmanager.get_node_attributes(
-            configmanager.list_nodes(), ('type', 'net*.switch', 'net*.switchport'))
+            configmanager.list_nodes(), ('net*.switch', 'net*.switchport'))
         switches = set([])
         for node in nodelocations:
             cfg = nodelocations[node]
-            if cfg.get('type', {}).get('value', None) == 'switch':
-                switches.add(node)
             for attr in cfg:
                 if not attr.endswith('.switch') or 'value' not in cfg[attr]:
                     continue
@@ -344,7 +342,7 @@ def _full_updatemacmap(configmanager):
                         _switchportmap[curswitch][portname] = None
                     else:
                         _switchportmap[curswitch][portname] = node
-        for switch in list(_macsbyswitch):
+        for switch in _macsbyswitch:
             if switch not in switches:
                 del _macsbyswitch[switch]
         switchauth = get_switchcreds(configmanager, switches)
@@ -380,7 +378,7 @@ def handle_api_request(configmanager, inputdata, operation, pathcomponents):
     if (operation in ('update', 'create') and
             pathcomponents == ['networking', 'macs', 'rescan']):
         if inputdata != {'rescan': 'start'}:
-            raise exc.InvalidArgumentException('Input must be rescan=start')
+            raise exc.InvalidArgumentException()
         eventlet.spawn_n(rescan, configmanager)
         return [msg.KeyValueData({'rescan': 'started'})]
     raise exc.NotImplementedException(
@@ -458,21 +456,9 @@ def handle_read_api_request(pathcomponents, configmanager):
                     portname = portname.replace('-', '/')
                 maclist = _macsbyswitch[switchname][portname]
             except KeyError:
-                foundsomemacs = False
-                if switchname in _macsbyswitch:
-                    try:
-                        matcher = re.compile(portname)
-                    except Exception:
-                        raise exc.InvalidArgumentException('Invalid regular expression specified')
-                    maclist = []
-                    for actualport in _macsbyswitch[switchname]:
-                        if bool(matcher.match(actualport)):
-                            foundsomemacs = True
-                            maclist = maclist + _macsbyswitch[switchname][actualport]
-                if not foundsomemacs:
-                    raise exc.NotFoundException('No known macs for switch {0} '
-                                                'port {1}'.format(switchname,
-                                                                  portname))
+                raise exc.NotFoundException('No known macs for switch {0} '
+                                            'port {1}'.format(switchname,
+                                                              portname))
             return [msg.ChildCollection(x.replace(':', '-'))
                     for x in sorted(maclist)]
         if len(pathcomponents) == 8:

confluent_server/confluent/networking/netutil.py

@@ -42,12 +42,10 @@ def get_switchcreds(configmanager, switches):
 
 def list_switches(configmanager):
     nodelocations = configmanager.get_node_attributes(
-        configmanager.list_nodes(), ('type', 'net*.switch', 'net*.switchport'))
+        configmanager.list_nodes(), ('net*.switch', 'net*.switchport'))
     switches = set([])
     for node in nodelocations:
         cfg = nodelocations[node]
-        if cfg.get('type', {}).get('value', None) == 'switch':
-            switches.add(node)
         for attr in cfg:
             if not attr.endswith('.switch') or 'value' not in cfg[attr]:
                 continue

confluent_server/confluent/noderange.py

@@ -25,11 +25,6 @@ import itertools
 import pyparsing as pp
 import re
 
-try:
-    range = xrange
-except NameError:
-    pass
-
 # construct custom grammar with pyparsing
 _nodeword = pp.Word(pp.alphanums + '~^$/=-_:.*+!')
 _nodebracket = pp.QuotedString(quoteChar='[', endQuoteChar=']',
@@ -162,7 +157,7 @@ class NodeRange(object):
         pieces = seqrange.split(delimiter)
         if len(pieces) % 2 != 0:
             return self.failorreturn(seqrange)
-        halflen = len(pieces) // 2
+        halflen = len(pieces) / 2
         left = delimiter.join(pieces[:halflen])
         right = delimiter.join(pieces[halflen:])
         leftbits = _numextractor.parseString(left).asList()
@@ -171,7 +166,7 @@ class NodeRange(object):
             return self.failorreturn(seqrange)
         finalfmt = ''
         iterators = []
-        for idx in range(len(leftbits)):
+        for idx in xrange(len(leftbits)):
             if leftbits[idx] == rightbits[idx]:
                 finalfmt += leftbits[idx]
             elif leftbits[idx][0] in pp.alphas:
@@ -186,7 +181,7 @@ class NodeRange(object):
                 if leftnum > rightnum:
                     width = len(rightbits[idx])
                     minnum = rightnum
-                    maxnum = leftnum + 1  # range goes to n-1...
+                    maxnum = leftnum + 1  # xrange goes to n-1...
                 elif rightnum > leftnum:
                     width = len(leftbits[idx])
                     minnum = leftnum
@@ -194,7 +189,7 @@ class NodeRange(object):
                 else:  # differently padded, but same number...
                     return self.failorreturn(seqrange)
                 numformat = '{0:0%d}' % width
-                for num in range(minnum, maxnum):
+                for num in xrange(minnum, maxnum):
                     curseq.append(numformat.format(num))
         results = set([])
         for combo in itertools.product(*iterators):
@@ -227,7 +222,7 @@ class NodeRange(object):
             if self.cfm is None:
                 raise Exception('Verification configmanager required')
             return set(self.cfm.filter_node_attributes(element, filternodes))
-        for idx in range(len(element)):
+        for idx in xrange(len(element)):
             if element[idx][0] == '[':
                 nodes = set([])
                 for numeric in NodeRange(element[idx][1:-1]).nodes:

confluent_server/confluent/pam.py

@@ -1,235 +0,0 @@
-# Pulled from:
-# https://raw.githubusercontent.com/FirefighterBlu3/python-pam/fe44b334970f421635d9e373b563c9e6566613bd/pam.py
-# and https://github.com/FirefighterBlu3/python-pam/pull/16/files
-# (c) 2007 Chris AtLee <chris@atlee.ca>
-# Licensed under the MIT license:
-# http://www.opensource.org/licenses/mit-license.php
-#
-# Original author: Chris AtLee
-#
-# Modified by David Ford, 2011-12-6
-# added py3 support and encoding
-# added pam_end
-# added pam_setcred to reset credentials after seeing Leon Walker's remarks
-# added byref as well
-# use readline to prestuff the getuser input
-
-'''
-PAM module for python
-
-Provides an authenticate function that will allow the caller to authenticate
-a user against the Pluggable Authentication Modules (PAM) on the system.
-
-Implemented using ctypes, so no compilation is necessary.
-'''
-
-__all__      = ['pam']
-__version__  = '1.8.4'
-__author__   = 'David Ford <david@blue-labs.org>'
-__released__ = '2018 June 15'
-
-import sys
-
-from ctypes import CDLL, POINTER, Structure, CFUNCTYPE, cast, byref, sizeof
-from ctypes import c_void_p, c_size_t, c_char_p, c_char, c_int
-from ctypes import memmove
-from ctypes.util import find_library
-
-class PamHandle(Structure):
-    """wrapper class for pam_handle_t pointer"""
-    _fields_ = [ ("handle", c_void_p) ]
-
-    def __init__(self):
-        Structure.__init__(self)
-        self.handle = 0
-
-class PamMessage(Structure):
-    """wrapper class for pam_message structure"""
-    _fields_ = [ ("msg_style", c_int), ("msg", c_char_p) ]
-
-    def __repr__(self):
-        return "<PamMessage %i '%s'>" % (self.msg_style, self.msg)
-
-class PamResponse(Structure):
-    """wrapper class for pam_response structure"""
-    _fields_ = [ ("resp", c_char_p), ("resp_retcode", c_int) ]
-
-    def __repr__(self):
-        return "<PamResponse %i '%s'>" % (self.resp_retcode, self.resp)
-
-conv_func = CFUNCTYPE(c_int, c_int, POINTER(POINTER(PamMessage)), POINTER(POINTER(PamResponse)), c_void_p)
-
-class PamConv(Structure):
-    """wrapper class for pam_conv structure"""
-    _fields_ = [ ("conv", conv_func), ("appdata_ptr", c_void_p) ]
-
-# Various constants
-PAM_PROMPT_ECHO_OFF       = 1
-PAM_PROMPT_ECHO_ON        = 2
-PAM_ERROR_MSG             = 3
-PAM_TEXT_INFO             = 4
-PAM_REINITIALIZE_CRED     = 8
-
-libc                      = CDLL(find_library("c"))
-libpam                    = CDLL(find_library("pam"))
-
-calloc                    = libc.calloc
-calloc.restype            = c_void_p
-calloc.argtypes           = [c_size_t, c_size_t]
-
-# bug #6 (@NIPE-SYSTEMS), some libpam versions don't include this function
-if hasattr(libpam, 'pam_end'):
-    pam_end                   = libpam.pam_end
-    pam_end.restype           = c_int
-    pam_end.argtypes          = [PamHandle, c_int]
-
-pam_start                 = libpam.pam_start
-pam_start.restype         = c_int
-pam_start.argtypes        = [c_char_p, c_char_p, POINTER(PamConv), POINTER(PamHandle)]
-
-pam_acct_mgmt             = libpam.pam_acct_mgmt
-pam_acct_mgmt.restype     = c_int
-pam_acct_mgmt.argtypes    = [PamHandle, c_int]
-
-pam_setcred               = libpam.pam_setcred
-pam_setcred.restype       = c_int
-pam_setcred.argtypes      = [PamHandle, c_int]
-
-pam_strerror              = libpam.pam_strerror
-pam_strerror.restype      = c_char_p
-pam_strerror.argtypes     = [PamHandle, c_int]
-
-pam_authenticate          = libpam.pam_authenticate
-pam_authenticate.restype  = c_int
-pam_authenticate.argtypes = [PamHandle, c_int]
-
-class pam():
-    code   = 0
-    reason = None
-
-    def __init__(self):
-        pass
-
-    def authenticate(self, username, password, service='login', encoding='utf-8', resetcreds=True):
-        """username and password authentication for the given service.
-
-           Returns True for success, or False for failure.
-
-           self.code (integer) and self.reason (string) are always stored and may
-           be referenced for the reason why authentication failed. 0/'Success' will
-           be stored for success.
-
-           Python3 expects bytes() for ctypes inputs.  This function will make
-           necessary conversions using the supplied encoding.
-
-        Inputs:
-          username: username to authenticate
-          password: password in plain text
-          service:  PAM service to authenticate against, defaults to 'login'
-
-        Returns:
-          success:  True
-          failure:  False
-        """
-
-        @conv_func
-        def my_conv(n_messages, messages, p_response, app_data):
-            """Simple conversation function that responds to any
-               prompt where the echo is off with the supplied password"""
-            # Create an array of n_messages response objects
-            addr = calloc(n_messages, sizeof(PamResponse))
-            response = cast(addr, POINTER(PamResponse))
-            p_response[0] = response
-            for i in range(n_messages):
-                if messages[i].contents.msg_style == PAM_PROMPT_ECHO_OFF:
-                    dst = calloc(len(password)+1, sizeof(c_char))
-                    memmove(dst, cpassword, len(password))
-                    response[i].resp = dst
-                    response[i].resp_retcode = 0
-            return 0
-
-        # python3 ctypes prefers bytes
-        if sys.version_info >= (3,):
-            if isinstance(username, str): username = username.encode(encoding)
-            if isinstance(password, str): password = password.encode(encoding)
-            if isinstance(service, str):  service  = service.encode(encoding)
-        else:
-            if isinstance(username, unicode):
-                username = username.encode(encoding)
-            if isinstance(password, unicode):
-                password = password.encode(encoding)
-            if isinstance(service, unicode):
-                service  = service.encode(encoding)
-
-        if b'\x00' in username or b'\x00' in password or b'\x00' in service:
-            self.code = 4  # PAM_SYSTEM_ERR in Linux-PAM
-            self.reason = 'strings may not contain NUL'
-            return False
-
-        # do this up front so we can safely throw an exception if there's
-        # anything wrong with it
-        cpassword = c_char_p(password)
-
-        handle = PamHandle()
-        conv   = PamConv(my_conv, 0)
-        retval = pam_start(service, username, byref(conv), byref(handle))
-
-        if retval != 0:
-            # This is not an authentication error, something has gone wrong starting up PAM
-            self.code   = retval
-            self.reason = "pam_start() failed"
-            return False
-
-        retval = pam_authenticate(handle, 0)
-        auth_success = retval == 0
-
-        if auth_success:
-            retval = pam_acct_mgmt(handle, 0)
-            auth_success = retval == 0
-
-        if auth_success and resetcreds:
-            retval = pam_setcred(handle, PAM_REINITIALIZE_CRED)
-
-        # store information to inform the caller why we failed
-        self.code   = retval
-        self.reason = pam_strerror(handle, retval)
-        if sys.version_info >= (3,):
-            self.reason = self.reason.decode(encoding)
-
-        if hasattr(libpam, 'pam_end'):
-            pam_end(handle, retval)
-
-        return auth_success
-
-
-def authenticate(*vargs, **dargs):
-    """
-    Compatibility function for older versions of python-pam.
-    """
-    return pam().authenticate(*vargs, **dargs)
-
-
-if __name__ == "__main__":
-    import readline, getpass
-
-    def input_with_prefill(prompt, text):
-        def hook():
-            readline.insert_text(text)
-            readline.redisplay()
-        readline.set_pre_input_hook(hook)
-
-        if sys.version_info >= (3,):
-            result = input(prompt)
-        else:
-            result = raw_input(prompt)
-
-        readline.set_pre_input_hook()
-        return result
-
-    pam = pam()
-
-    username = input_with_prefill('Username: ', getpass.getuser())
-
-    # enter a valid username and an invalid/valid password, to verify both failure and success
-    pam.authenticate(username, getpass.getpass())
-    print('{} {}'.format(pam.code, pam.reason))

confluent_server/confluent/plugins/configuration/attributes.py

@@ -1,5 +1,5 @@
 # Copyright 2014 IBM Corporation
-# Copyright 2017-2019 Lenovo
+# 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.
@@ -17,7 +17,6 @@ import confluent.exceptions as exc
 import confluent.messages as msg
 import confluent.config.attributes as allattributes
 import confluent.util as util
-from fnmatch import fnmatch
 
 
 def retrieve(nodes, element, configmanager, inputdata):
@@ -40,7 +39,6 @@ def retrieve_nodegroup(nodegroup, element, configmanager, inputdata):
     if element == 'all':
         theattrs = set(allattributes.node).union(set(grpcfg))
         theattrs.add('nodes')
-        theattrs.add('noderange')
         for attribute in sorted(theattrs):
             if attribute == 'groups':
                 continue
@@ -53,10 +51,6 @@ def retrieve_nodegroup(nodegroup, element, configmanager, inputdata):
                 val = grpcfg[attribute]
             else:
                 val = {'value': None}
-            if attribute == 'noderange':
-                val['desc'] = 'The noderange this group is expanded ' \
-                    'to when used in noderange, exclusive with static ' \
-                    'nodes'
             if attribute.startswith('secret.'):
                 yield msg.CryptedAttributes(
                     kv={attribute: val},
@@ -75,8 +69,6 @@ def retrieve_nodegroup(nodegroup, element, configmanager, inputdata):
         for attribute in sorted(list(grpcfg)):
             currattr = grpcfg[attribute]
             if attribute == 'nodes':
-                if not currattr:
-                    continue
                 desc = 'The nodes belonging to this group'
             elif attribute == 'noderange':
                 desc = 'A dynamic noderange that this group refers to in noderange expansion'
@@ -100,8 +92,8 @@ def retrieve_nodegroup(nodegroup, element, configmanager, inputdata):
                     kv={attribute: currattr},
                     desc=desc)
             else:
-                print(attribute)
-                print(repr(currattr))
+                print attribute
+                print repr(currattr)
                 raise Exception("BUGGY ATTRIBUTE FOR NODEGROUP")
 
 
@@ -134,8 +126,10 @@ def retrieve_nodes(nodes, element, configmanager, inputdata):
                             attribute, {}).get('description', ''))
     elif element[-1] == 'current':
         for node in util.natural_sort(list(attributes)):
-            for attribute in sorted(attributes[node]):
+            for attribute in sorted(attributes[node].iterkeys()):
                 currattr = attributes[node][attribute]
+                if currattr is None:
+                    continue
                 try:
                     desc = allattributes.node[attribute]['description']
                 except KeyError:
@@ -148,9 +142,11 @@ def retrieve_nodes(nodes, element, configmanager, inputdata):
                 elif isinstance(currattr, list):
                     yield msg.ListAttributes(
                         node, {attribute: currattr}, desc)
+                elif isinstance(currattr, str):
+                    yield msg.Attributes(node, {attribute: currattr}, desc)
                 else:
-                    print(attribute)
-                    print(repr(currattr))
+                    print attribute
+                    print repr(currattr)
                     raise Exception("BUGGY ATTRIBUTE FOR NODE")
 
 
@@ -164,28 +160,9 @@ def update(nodes, element, configmanager, inputdata):
 
 
 def update_nodegroup(group, element, configmanager, inputdata):
-    if element == 'check':
-        check = inputdata.attribs
-        decrypt = configmanager.decrypt
-        configmanager.decrypt = True
-        currinfo = configmanager.get_nodegroup_attributes(group, list(check))
-        configmanager.decrypt = decrypt
-        for inf in check:
-            checkvalue = check[inf]
-            if isinstance(checkvalue, dict):
-                checkvalue = checkvalue.get('value', None)
-            currvalue = currinfo.get(inf, {}).get('value')
-            if checkvalue == currvalue:
-                raise exc.InvalidArgumentException('Checked value matches existing value')
-        return retrieve_nodegroup(group, element, configmanager, inputdata)
-    if 'rename' in element:
-        namemap = {}
-        namemap[group] = inputdata.attribs['rename']
-        configmanager.rename_nodegroups(namemap)
-        return yield_rename_resources(namemap, isnode=False)
     try:
         clearattribs = []
-        for attrib in inputdata.attribs:
+        for attrib in inputdata.attribs.iterkeys():
             if inputdata.attribs[attrib] is None:
                 clearattribs.append(attrib)
         for attrib in clearattribs:
@@ -222,56 +199,18 @@ def create(nodes, element, configmanager, inputdata):
     if nodes is not None and element[-1] == 'expression':
         return _expand_expression(nodes, configmanager, inputdata)
 
-def yield_rename_resources(namemap, isnode):
-    for node in namemap:
-        if isnode:
-            yield msg.RenamedNode(node, namemap[node])
-        else:
-            yield msg.RenamedResource(node, namemap[node])
-
 def update_nodes(nodes, element, configmanager, inputdata):
     updatedict = {}
-    if not nodes:
-        raise exc.InvalidArgumentException(
-            'No action to take, noderange is empty (if trying to define '
-            'group attributes, use nodegroupattrib)')
-    if element[-1] == 'check':
-        for node in nodes:
-            check = inputdata.get_attributes(node, allattributes.node)
-            currinfo = configmanager.get_node_attributes(node, list(check), decrypt=True)
-            for inf in check:
-                checkvalue = check[inf]
-                if isinstance(checkvalue, dict):
-                    checkvalue = checkvalue.get('value', None)
-                currvalue = currinfo.get(node, {}).get(inf, {}).get('value')
-                if checkvalue == currvalue:
-                    raise exc.InvalidArgumentException('Checked value matches existing value')
-        return retrieve(nodes, element, configmanager, inputdata)
-    if 'rename' in element:
-        namemap = {}
-        for node in nodes:
-            rename = inputdata.get_attributes(node)
-            namemap[node] = rename['rename']
-        configmanager.rename_nodes(namemap)
-        return yield_rename_resources(namemap, isnode=True)
     for node in nodes:
-        updatenode = inputdata.get_attributes(node, allattributes.node)
+        updatenode = inputdata.get_attributes(node)
         clearattribs = []
         if updatenode:
-            for attrib in list(updatenode):
+            for attrib in updatenode.iterkeys():
                 if updatenode[attrib] is None:
-                    del updatenode[attrib]
-                    if attrib in allattributes.node  or attrib.startswith('custom.') or attrib.startswith('net.'):
-                        clearattribs.append(attrib)
-                    else:
-                        foundattrib = False
-                        for candattrib in allattributes.node:
-                            if fnmatch(candattrib, attrib):
-                                clearattribs.append(candattrib)
-                                foundattrib = True
-                        if not foundattrib:
-                            raise exc.InvalidArgumentException("No attribute matches '" + attrib + "' (try wildcard if trying to clear a group)")
+                    clearattribs.append(attrib)
             if len(clearattribs) > 0:
+                for attrib in clearattribs:
+                    del updatenode[attrib]
                 configmanager.clear_node_attributes([node], clearattribs)
             updatedict[node] = updatenode
     try:

confluent_server/confluent/plugins/hardwaremanagement/cnos.py

@@ -1,147 +0,0 @@
-
-# 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.
-
-
-#Noncritical:
-#  - One or more temperature sensors is in the warning range;
-#  - A panic dump exists in flash.
-#Critical:
-#  - One or more temperature sensors is in the failure range;
-#  - One or more fans are running < 100 RPM;
-#  - One power supply is off.
-
-
-import eventlet
-import eventlet.queue as queue
-import confluent.exceptions as exc
-webclient = eventlet.import_patched('pyghmi.util.webclient')
-import confluent.messages as msg
-import confluent.util as util
-
-class SwitchSensor(object):
-    def __init__(self, name, states, value=None, health=None):
-        self.name = name
-        self.value = value
-        self.states = states
-        self.health = health
-
-
-def cnos_login(node, configmanager, creds):
-    wc = webclient.SecureHTTPConnection(node, port=443, verifycallback=util.TLSCertVerifier(
-        configmanager, node, 'pubkeys.tls_hardwaremanager').verify_cert)
-    wc.set_basic_credentials(creds[node]['secret.hardwaremanagementuser']['value'], creds[node]['secret.hardwaremanagementpassword']['value'])
-    wc.request('GET', '/nos/api/login/')
-    rsp = wc.getresponse()
-    body = rsp.read()
-    if rsp.status == 401:  # CNOS gives 401 on first attempt...
-        wc.request('GET', '/nos/api/login/')
-        rsp = wc.getresponse()
-        body = rsp.read()
-    if rsp.status >= 200 and rsp.status < 300:
-        return wc
-    raise exc.TargetEndpointBadCredentials('Unable to authenticate')
-
-def update(nodes, element, configmanager, inputdata):
-    for node in nodes:
-        yield msg.ConfluentNodeError(node, 'Not Implemented')
-
-def delete(nodes, element, configmanager, inputdata):
-    for node in nodes:
-        yield msg.ConfluentNodeError(node, 'Not Implemented')
-
-def create(nodes, element, configmanager, inputdata):
-    for node in nodes:
-        yield msg.ConfluentNodeError(node, 'Not Implemented')
-
-def retrieve(nodes, element, configmanager, inputdata):
-    results = queue.LightQueue()
-    workers = set([])
-    if element == ['power', 'state']:
-        for node in nodes:
-            yield msg.PowerState(node=node, state='on')
-        return
-    elif element == ['health', 'hardware']:
-        creds = configmanager.get_node_attributes(
-                nodes, ['secret.hardwaremanagementuser', 'secret.hardwaremanagementpassword'], decrypt=True)
-        for node in nodes:
-            workers.add(eventlet.spawn(retrieve_health, configmanager, creds,
-                                       node, results))
-    else:
-        for node in nodes:
-            yield msg.ConfluentNodeError(node, 'Not Implemented')
-        return
-    currtimeout = 10
-    while workers:
-        try:
-            datum = results.get(10)
-            while datum:
-                if datum:
-                    yield datum
-                datum = results.get_nowait()
-        except queue.Empty:
-            pass
-        eventlet.sleep(0.001)
-        for t in list(workers):
-            if t.dead:
-                workers.discard(t)
-    try:
-        while True:
-            datum = results.get_nowait()
-            if datum:
-                yield datum
-    except queue.Empty:
-        pass
-
-
-def retrieve_health(configmanager, creds, node, results):
-    wc = cnos_login(node, configmanager, creds)
-    hinfo = wc.grab_json_response('/nos/api/sysinfo/globalhealthstatus')
-    summary = hinfo['status'].lower()
-    if summary == 'noncritical':
-        summary = 'warning'
-    results.put(msg.HealthSummary(summary, name=node))
-    state = None
-    badreadings = []
-    if summary != 'ok':  # temperature or dump or fans or psu
-        wc.grab_json_response('/nos/api/sysinfo/panic_dump')
-        switchinfo = wc.grab_json_response('/nos/api/sysinfo/panic_dump')
-        if switchinfo:
-            badreadings.append(
-                SwitchSensor('Panicdump', ['Present'], health='warning'))
-        switchinfo = wc.grab_json_response('/nos/api/sysinfo/temperatures')
-        for temp in switchinfo:
-            if temp == 'Temperature threshold':
-                continue
-            if switchinfo[temp]['State'] != 'OK':
-                temphealth = switchinfo[temp]['State'].lower()
-                if temphealth == 'noncritical':
-                    temphealth = 'warning'
-                tempval = switchinfo[temp]['Temp']
-                badreadings.append(
-                    SwitchSensor(temp, [], value=tempval, health=temphealth))
-        switchinfo = wc.grab_json_response('/nos/api/sysinfo/fans')
-        for fan in switchinfo:
-            if switchinfo[fan]['speed-rpm'] < 100:
-                badreadings.append(
-                    SwitchSensor(fan, [], value=switchinfo[fan]['speed-rpm'],
-                                 health='critical'))
-        switchinfo = wc.grab_json_response('/nos/api/sysinfo/power')
-        for psu in switchinfo:
-            if switchinfo[psu]['State'] != 'Normal ON':
-                psuname = switchinfo[psu]['Name']
-                badreadings.append(
-                    SwitchSensor(psuname, states=[switchinfo[psu]['State']],
-                                 health='critical'))
-    results.put(msg.SensorReadings(badreadings, name=node))

confluent_server/confluent/plugins/hardwaremanagement/ipmi.py

@@ -36,11 +36,6 @@ console = eventlet.import_patched('pyghmi.ipmi.console')
 ipmicommand = eventlet.import_patched('pyghmi.ipmi.command')
 import socket
 import ssl
-import traceback
-
-
-if not hasattr(ssl, 'SSLEOFError'):
-    ssl.SSLEOFError = None
 
 pci_cache = {}
 
@@ -171,10 +166,8 @@ class IpmiCommandWrapper(ipmicommand.Command):
     def __init__(self, node, cfm, **kwargs):
         self.cfm = cfm
         self.node = node
-        self.sensormap = {}
         self._inhealth = False
         self._lasthealth = None
-        kwargs['keepalive'] = False
         self._attribwatcher = cfm.watch_attributes(
             (node,), ('secret.hardwaremanagementuser', 'collective.manager',
                       'secret.hardwaremanagementpassword', 'secret.ipmikg',
@@ -233,6 +226,7 @@ def _ipmi_evtloop():
                 waiter = _ipmiwaiters.pop()
                 waiter.send()
         except:  # TODO(jbjohnso): log the trace into the log
+            import traceback
 
             traceback.print_exc()
 
@@ -383,7 +377,7 @@ def perform_requests(operator, nodes, element, cfg, inputdata, realop):
                         raise datum
                     if (hasattr(datum, 'kvpairs') and datum.kvpairs and
                             len(datum.kvpairs) == 1):
-                        bundle.append((list(datum.kvpairs)[0], datum))
+                        bundle.append((datum.kvpairs.keys()[0], datum))
                         numnodes -= 1
                     else:
                         yield datum
@@ -434,8 +428,8 @@ def perform_request(operator, node, element,
         except pygexc.InvalidParameterValue as e:
             results.put(msg.ConfluentNodeError(node, str(e)))
         except Exception as e:
-            results.put(msg.ConfluentNodeError(node, 'Unexpected Error: {0}'.format(str(e))))
-            traceback.print_exc()
+            results.put(e)
+            raise
         finally:
             results.put('Done')
 
@@ -444,6 +438,7 @@ persistent_ipmicmds = {}
 class IpmiHandler(object):
     def __init__(self, operation, node, element, cfd, inputdata, cfg, output,
                  realop):
+        self.sensormap = {}
         self.invmap = {}
         self.output = output
         self.sensorcategory = None
@@ -462,12 +457,11 @@ class IpmiHandler(object):
         self.inputdata = inputdata
         self.tenant = cfg.tenant
         tenant = cfg.tenant
-        while ((node, tenant) not in persistent_ipmicmds or
+        if ((node, tenant) not in persistent_ipmicmds or
                 not persistent_ipmicmds[(node, tenant)].ipmi_session.logged or
                 persistent_ipmicmds[(node, tenant)].ipmi_session.broken):
             try:
                 persistent_ipmicmds[(node, tenant)].close_confluent()
-                persistent_ipmicmds[(node, tenant)].ipmi_session._mark_broken()
             except KeyError:  # was no previous session
                 pass
             try:
@@ -479,20 +473,16 @@ class IpmiHandler(object):
 
                 ipmisess = persistent_ipmicmds[(node, tenant)].ipmi_session
                 begin = util.monotonic_time()
-                while ((not (ipmisess.broken or self.loggedin)) and
+                while ((not (self.broken or self.loggedin)) and
                                (util.monotonic_time() - begin) < 30):
                     ipmisess.wait_for_rsp(31 - (util.monotonic_time() - begin))
-                if self.broken or self.loggedin:
-                    break
-                cfd = cfg.get_node_attributes(node, _configattributes, decrypt=True)
-                self.cfg = cfd[node]
-                connparams = get_conn_params(node, self.cfg)
-                ipmisess._mark_broken()
-                #    raise exc.TargetEndpointUnreachable(
-                #        "Login process to " + connparams['bmc'] + " died")
+                if not (self.broken or self.loggedin):
+                    ipmisess._mark_broken()
+                    raise exc.TargetEndpointUnreachable(
+                        "Login process to " + connparams['bmc'] + " died")
             except socket.gaierror as ge:
-                if ge.errno == -2:
-                    raise exc.TargetEndpointUnreachable(ge.strerror)
+                if ge[0] == -2:
+                    raise exc.TargetEndpointUnreachable(ge[1])
                 raise
         self.ipmicmd = persistent_ipmicmds[(node, tenant)]
 
@@ -623,22 +613,14 @@ class IpmiHandler(object):
             return self.handle_domain_name()
         elif self.element[1:3] == ['management_controller', 'ntp']:
             return self.handle_ntp()
-        elif self.element[1:4] == ['management_controller', 'extended', 'all']:
-            return self.handle_bmcconfig()
-        elif self.element[1:4] == ['management_controller', 'extended', 'all']:
-            return self.handle_bmcconfig(True)
         elif self.element[1:3] == ['system', 'all']:
             return self.handle_sysconfig()
         elif self.element[1:3] == ['system', 'advanced']:
             return self.handle_sysconfig(True)
         elif self.element[1:3] == ['system', 'clear']:
             return self.handle_sysconfigclear()
-        elif self.element[1:3] == ['management_controller', 'clear']:
-            return self.handle_bmcconfigclear()
         elif self.element[1:3] == ['management_controller', 'licenses']:
             return self.handle_licenses()
-        elif self.element[1:3] == ['management_controller', 'save_licenses']:
-            return self.save_licenses()
         raise Exception('Not implemented')
 
     def decode_alert(self):
@@ -755,7 +737,6 @@ class IpmiHandler(object):
                     uid=data['uid'],
                     username=data['name'],
                     privilege_level=data['access']['privilege_level'],
-                    expiration=data['expiration'],
                     name=self.node))
                 return
             elif self.op == 'update':
@@ -764,16 +745,14 @@ class IpmiHandler(object):
                 if 'username' in user:
                     self.ipmicmd.set_user_name(uid=user['uid'],
                                                name=user['username'])
-
+                if 'privilege_level' in user:
+                    self.ipmicmd.set_user_access(uid=user['uid'],
+                                    privilege_level=user['privilege_level'])
                 if 'password' in user:
                     self.ipmicmd.set_user_password(uid=user['uid'],
                                                    password=user['password'])
                     self.ipmicmd.set_user_password(uid=user['uid'],
                                     mode='enable', password=user['password'])
-                    if 'privilege_level' in user:
-                        self.ipmicmd.set_user_access(uid=user['uid'],
-                                                     privilege_level=user[
-                                                         'privilege_level'])
                 if 'enabled' in user:
                     if user['enabled'] == 'yes':
                         mode = 'enable'
@@ -814,7 +793,7 @@ class IpmiHandler(object):
             sensors = self.ipmicmd.get_sensor_descriptions()
         for sensor in sensors:
             resourcename = sensor['name']
-            self.ipmicmd.sensormap[simplify_name(resourcename)] = resourcename
+            self.sensormap[simplify_name(resourcename)] = resourcename
 
     def read_sensors(self, sensorname):
         if sensorname == 'all':
@@ -835,16 +814,15 @@ class IpmiHandler(object):
                 readings.append(reading)
             self.output.put(msg.SensorReadings(readings, name=self.node))
         else:
-            if sensorname not in self.ipmicmd.sensormap:
-                self.make_sensor_map()
-            if sensorname not in self.ipmicmd.sensormap:
+            self.make_sensor_map()
+            if sensorname not in self.sensormap:
                 self.output.put(
                     msg.ConfluentTargetNotFound(self.node,
                                                 'Sensor not found'))
                 return
             try:
                 reading = self.ipmicmd.get_sensor_reading(
-                    self.ipmicmd.sensormap[sensorname])
+                    self.sensormap[sensorname])
                 if hasattr(reading, 'health'):
                     reading.health = _str_health(reading.health)
                 self.output.put(
@@ -893,9 +871,6 @@ class IpmiHandler(object):
                 'Extended information unavailable, mismatch detected between '
                 'target certificate fingerprint and '
                 'pubkeys.tls_hardwaremanager attribute')
-        except pygexc.TemporaryError as e:
-                errorneeded = msg.ConfluentNodeError(
-                self.node, str(e))
         self.output.put(msg.Firmware(items, self.node))
         if errorneeded:
             self.output.put(errorneeded)
@@ -975,8 +950,8 @@ class IpmiHandler(object):
         if newinf.get('information', None) and 'name' in newinf['information']:
             newinf = copy.deepcopy(newinf)
             del newinf['information']['name']
-        if (fnmatch(newinf['name'], 'Adapter ??:??:??') or fnmatch(
-                newinf['name'], 'PCIeGen? x*') or not newinf['name']):
+        if fnmatch(newinf['name'], 'Adapter ??:??:??') or fnmatch(
+                newinf['name'], 'PCIeGen? x*'):
             myinf = newinf.get('information', {})
             sdid = myinf.get('PCI Subsystem Device ID', None)
             svid = myinf.get('PCI Subsystem Vendor ID', None)
@@ -1053,7 +1028,7 @@ class IpmiHandler(object):
             if raidlvl and vol['raidlevel'] != raidlvl:
                 raise exc.InvalidArgumentException('Cannot mix raid levels in '
                                                    'a single array')
-            vols.append(storage.Volume(name=vol['name'], size=vol['size'], stripsize=vol['stripsize']))
+            vols.append(storage.Volume(name=vol['name'], size=vol['size']))
         newcfg = storage.ConfigSpec(
             arrays=(storage.Array(raid=raidlvl, disks=disks, volumes=vols),))
         self.ipmicmd.apply_storage_configuration(newcfg)
@@ -1141,11 +1116,6 @@ class IpmiHandler(object):
                     msg.Disk(self.node, disk.name, disk.description,
                              disk.id, disk.status, disk.serial,
                              disk.fru, array='{0}-{1}'.format(*arr.id)))
-            for disk in arr.hotspares:
-                self.output.put(
-                    msg.Disk(self.node, disk.name, disk.description,
-                             disk.id, disk.status, disk.serial,
-                             disk.fru, array='{0}-{1}'.format(*arr.id)))
         for arr in scfg.arrays:
             arrname = '{0}-{1}'.format(*arr.id)
             self._detail_array(arr, arrname, True)
@@ -1167,13 +1137,6 @@ class IpmiHandler(object):
                         msg.Disk(self.node, disk.name, disk.description,
                                  disk.id, disk.status, disk.serial,
                                  disk.fru, arrname))
-            for disk in arr.hotspares:
-                if (name == 'all' or simplify_name(disk.name) == name or
-                        disk == name):
-                    self.output.put(
-                        msg.Disk(self.node, disk.name, disk.description,
-                                 disk.id, disk.status, disk.serial,
-                                 disk.fru, arrname))
 
     def list_disks(self):
         scfg = self.ipmicmd.get_storage_configuration()
@@ -1182,8 +1145,6 @@ class IpmiHandler(object):
         for arr in scfg.arrays:
             for disk in arr.disks:
                 self.output.put(msg.ChildCollection(simplify_name(disk.name)))
-            for disk in arr.hotspares:
-                self.output.put(msg.ChildCollection(simplify_name(disk.name)))
 
     def list_arrays(self):
         scfg = self.ipmicmd.get_storage_configuration()
@@ -1204,8 +1165,6 @@ class IpmiHandler(object):
         disks = []
         for disk in arr.disks:
             disks.append(simplify_name(disk.name))
-        for disk in arr.hotspares:
-            disks.append(simplify_name(disk.name))
         self.output.put(msg.Array(self.node, disks, arr.raid,
                                   vols, arrname, arr.capacity,
                                   arr.available_capacity))
@@ -1302,9 +1261,6 @@ class IpmiHandler(object):
     def identify(self):
         if 'update' == self.op:
             identifystate = self.inputdata.inputbynode[self.node] == 'on'
-            if self.inputdata.inputbynode[self.node] == 'blink':
-                raise exc.InvalidArgumentException(
-                    '"blink" is not supported with ipmi')
             self.ipmicmd.set_identify(on=identifystate)
             self.output.put(msg.IdentifyState(
                 node=self.node, state=self.inputdata.inputbynode[self.node]))
@@ -1379,40 +1335,17 @@ class IpmiHandler(object):
             self.ipmicmd.set_domain_name(dn)
             return
 
-    def handle_bmcconfigclear(self):
-        if 'read' == self.op:
-            raise exc.InvalidArgumentException(
-                'Cannot read the "clear" resource')
-        self.ipmicmd.clear_bmc_configuration()
-
     def handle_sysconfigclear(self):
         if 'read' == self.op:
             raise exc.InvalidArgumentException(
                 'Cannot read the "clear" resource')
         self.ipmicmd.clear_system_configuration()
 
-    def handle_bmcconfig(self, advanced=False):
-        if 'read' == self.op:
-            try:
-                self.output.put(msg.ConfigSet(
-                    self.node,
-                    self.ipmicmd.get_bmc_configuration()))
-            except Exception as e:
-                self.output.put(
-                    msg.ConfluentNodeError(self.node, str(e)))
-        elif 'update' == self.op:
-            self.ipmicmd.set_bmc_configuration(
-                self.inputdata.get_attributes(self.node))
-
     def handle_sysconfig(self, advanced=False):
         if 'read' == self.op:
-            try:
-                self.output.put(msg.ConfigSet(
-                    self.node, self.ipmicmd.get_system_configuration(
-                        hideadvanced=not advanced)))
-            except Exception as e:
-                self.output.put(
-                    msg.ConfluentNodeError(self.node, str(e)))
+            self.output.put(msg.ConfigSet(
+                self.node, self.ipmicmd.get_system_configuration(
+                    hideadvanced=not advanced)))
         elif 'update' == self.op:
             self.ipmicmd.set_system_configuration(
                 self.inputdata.get_attributes(self.node))
@@ -1467,11 +1400,6 @@ class IpmiHandler(object):
         self.output.put(msg.License(self.node, available))
         return
 
-    def save_licenses(self):
-        directory = self.inputdata.nodefile(self.node)
-        for saved in self.ipmicmd.save_licenses(directory):
-            self.output.put(msg.SavedFile(self.node, saved))
-
     def handle_licenses(self):
         if self.element[-1] == '':
             self.element = self.element[:-1]
@@ -1487,17 +1415,12 @@ class IpmiHandler(object):
         licname = self.element[3]
         if licname == 'all':
             for lic in self.ipmicmd.get_licenses():
-                if self.op == 'delete':
-                    self.ipmicmd.delete_license(lic['name'])
-                else:
-                    self.output.put(msg.License(self.node, feature=lic['name'], state=lic.get('state', 'Active')))
+                self.output.put(msg.License(self.node, feature=lic['name']))
         else:
             index = int(licname)
             lic = list(self.ipmicmd.get_licenses())[index - 1]
-            if self.op == 'delete':
-                self.ipmicmd.delete_license(lic['name'])
-            else:
-                self.output.put(msg.License(self.node, feature=lic['name'], state=lic.get('state', 'Active')))
+            self.output.put(msg.License(self.node, feature=lic['name']))
+
     def handle_description(self):
         dsc = self.ipmicmd.get_description()
         self.output.put(msg.KeyValueData(dsc, self.node))