From 2e35a7e46f0929438c1c206e3116caa829f07dc6 Mon Sep 17 00:00:00 2001 From: Thomas Duval Date: Fri, 5 Oct 2018 16:54:37 +0200 Subject: Update code to 4.6 official version Change-Id: Ibd0da0e476e24b2685f54693efc11f7a58d40a62 --- python_moonclient/python_moonclient/cli/slaves.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'python_moonclient/python_moonclient/cli/slaves.py') diff --git a/python_moonclient/python_moonclient/cli/slaves.py b/python_moonclient/python_moonclient/cli/slaves.py index 1880f4c2..587e9033 100644 --- a/python_moonclient/python_moonclient/cli/slaves.py +++ b/python_moonclient/python_moonclient/cli/slaves.py @@ -5,7 +5,7 @@ from cliff.command import Command from python_moonclient.core import models, policies, pdp, slaves from python_moonclient.cli.parser import Parser -logger = logging.getLogger("moonclient.cli.slaves") +LOGGER = logging.getLogger("moonclient.cli.slaves") class SlavesUtils: @@ -17,13 +17,14 @@ class SlavesUtils: _slaves = slaves.get_slaves() for _slave_value in _slaves['slaves']: if _slave_value['name'] == parsed_name: - logger.info("Found {}".format(_slave_value['name'])) + LOGGER.info("Found {}".format(_slave_value['name'])) return _slave_value['name'] return None class Slaves(Lister): """show the list of slaves""" + def get_parser(self, prog_name): parser = super().get_parser(prog_name) Parser.add_common_options(parser) @@ -43,12 +44,14 @@ class Slaves(Lister): slaves.init(consul_host, consul_port) return (('Name', 'Configured'), - ((value['name'], value['configured']) for value in slaves.get_slaves().get('slaves', dict())) + ((value['name'], value['configured']) for value in + slaves.get_slaves().get('slaves', dict())) ) class SetSlave(Command): """update an existing slave to a configured state""" + def get_parser(self, prog_name): parser = super().get_parser(prog_name) Parser.add_common_options(parser) @@ -73,14 +76,14 @@ class SetSlave(Command): slave_input_name = "kubernetes-admin@kubernetes" slaves.set_slave(slave_input_name) - #if slave_name is None: + # if slave_name is None: # slave_name = "kubernetes-admin@kubernetes" - #if parsed_args.name: + # if parsed_args.name: # slave_name = parsed_args.name print(" {} (configured=True)".format(slave_input_name)) - #for value in slaves.set_slave(slave_name).get('slaves', dict()): + # for value in slaves.set_slave(slave_name).get('slaves', dict()): # if value['configured']: # print(" {} (configured)".format(value['name'])) # else: @@ -89,6 +92,7 @@ class SetSlave(Command): class DeleteSlave(Command): """update an existing slave to a unconfigured state""" + def get_parser(self, prog_name): parser = super().get_parser(prog_name) Parser.add_common_options(parser) @@ -114,7 +118,3 @@ class DeleteSlave(Command): slaves.delete_slave(slave_input_name) print(" {} (configured=False)".format(slave_input_name)) - - - - -- cgit 1.2.3-korg