From 0b7b713f3f9dafac24b663506e579e378680a6a9 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 13 Oct 2015 14:12:43 -0400 Subject: [PATCH] Add nodeconsole and nodelist commands nodeconsole provides a wrapper for confetty offering logical tab completion for console specifically as well as help text to explain critical info about using nodeconsole. nodelist provides functionality analagous to nodels in xCAT 2.x codebase --- confluent_client/bin/nodeconsole | 34 +++++++++++++ confluent_client/bin/nodelist | 82 ++++++++++++++++++++++++++++++++ confluent_client/setup.py.tmpl | 2 +- 3 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 confluent_client/bin/nodeconsole create mode 100644 confluent_client/bin/nodelist diff --git a/confluent_client/bin/nodeconsole b/confluent_client/bin/nodeconsole new file mode 100644 index 00000000..a0c48320 --- /dev/null +++ b/confluent_client/bin/nodeconsole @@ -0,0 +1,34 @@ +#!/usr/bin/env python +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# 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. +# 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 sys + +confettypath = os.path.join(os.path.dirname(sys.argv[0]), 'confetty') +argparser = optparse.OptionParser( + usage="Usage: %prog [options] node", + epilog="Command sequences are available while connected to a console, hit " + "ctrl-'e', then release ctrl, then 'c', then '?' for a full list. " + "For example, ctrl-'e', then 'c', then '.' will exit the current " + "console") +(options, args) = argparser.parse_args() +if len(args) != 1: + argparser.print_help() + sys.exit(1) +os.execl(confettypath, confettypath, 'start', + '/nodes/{0}/console/session'.format(args[0])) diff --git a/confluent_client/bin/nodelist b/confluent_client/bin/nodelist new file mode 100644 index 00000000..a14329c7 --- /dev/null +++ b/confluent_client/bin/nodelist @@ -0,0 +1,82 @@ +#!/usr/bin/env python +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# 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. +# 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' + +import optparse +import os +import sys + +path = os.path.dirname(os.path.realpath(__file__)) +path = os.path.realpath(os.path.join(path, '..', 'lib', 'python')) +if path.startswith('/opt'): + sys.path.append(path) + +import confluent.client as client +argparser = optparse.OptionParser( + usage="Usage: %prog [options] noderange [list of attributes") +argparser.add_option('-b', '--blame', action='store_true', + help='Show information about how attributes inherited') +(options, args) = argparser.parse_args() +try: + noderange = args[0] +except IndexError: + argparser.print_help() + sys.exit(1) +session = client.Command() +exitcode = 0 +if len(args) > 1: + seenattributes = set([]) + for res in session.read('/noderange/{0}/attributes/all'.format(noderange)): + for node in res['databynode']: + for attr in res['databynode'][node]: + seenattributes.add(attr) + currattr = res['databynode'][node][attr] + if attr in args[1:]: + if 'value' in currattr: + if currattr['value'] is not None: + attrout = '{0}: {1}: {2}'.format( + node, attr, currattr['value']) + else: + attrout = '{0}: {1}:'.format(node, attr) + elif 'isset' in currattr: + if currattr['isset']: + attrout = '{0}: {1}: ********'.format(node, attr) + else: + attrout = '{0}: {1}:'.format(node, attr) + if options.blame: + blamedata = [] + if 'inheritedfrom' in currattr: + blamedata.append('inherited from group {0}'.format( + currattr['inheritedfrom'] + )) + if 'expression' in currattr: + blamedata.append( + 'derived from expression "{0}"'.format( + currattr['expression'])) + if blamedata: + attrout += ' (' + ', '.join(blamedata) + ')' + print attrout + + for attr in args[1:]: + if attr not in seenattributes: + sys.stderr.write('Error: {0} not a valid attribute\n'.format(attr)) + exitcode = 1 +else: + for res in session.read('/noderange/{0}/nodes/'.format(noderange)): + print res['item']['href'].replace('/', '') +sys.exit(exitcode) \ No newline at end of file diff --git a/confluent_client/setup.py.tmpl b/confluent_client/setup.py.tmpl index 59ba6142..6b1f4e35 100644 --- a/confluent_client/setup.py.tmpl +++ b/confluent_client/setup.py.tmpl @@ -7,6 +7,6 @@ setup( author_email='jjohnson2@lenovo.com', url='http://xcat.sf.net/', packages=['confluent'], - scripts=['bin/confetty', 'bin/nodehealth', 'bin/nodeidentify', 'bin/nodepower', 'bin/nodesensors', 'bin/nodesetboot'], + scripts=['bin/confetty', 'bin/nodeconsole', 'bin/nodehealth', 'bin/nodeidentify', 'bin/nodelist', 'bin/nodepower', 'bin/nodesensors', 'bin/nodesetboot'], data_files=[('/etc/profile.d', ['confluent_env.sh'])], )