From 82c740be9c8fb3e078f85e70daf42ee37e430de7 Mon Sep 17 00:00:00 2001 From: Waldemar Znoinski Date: Mon, 18 Nov 2019 18:30:28 +0000 Subject: [PATCH] add support for 'disconnect' from Jenkins master cli command - lint fix RHOSINFRA-2560 --- .gitignore | 2 ++ AUTHORS | 1 + ChangeLog | 6 ++++++ devnest/lib/cli.py | 8 ++++---- devnest/lib/node.py | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7212b0a..06b7bb4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /dist /ChangeLog /.eggs +/.idea/ +.idea/ diff --git a/AUTHORS b/AUTHORS index a4ccba1..107f135 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,3 +2,4 @@ Michal Michal Pryc Sorin Sbarnea Tristan Cacqueray +Waldemar Znoinski diff --git a/ChangeLog b/ChangeLog index 4877fad..e6f45a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ CHANGES ======= +* add support for 'disconnect' from Jenkins master cli command + +0.0.1.dev49 +----------- + +* Add IP address to the list column * Add dump config options * Add directory options to update multiply slaves at once * Ensure force reservation is only for not reserved nodes diff --git a/devnest/lib/cli.py b/devnest/lib/cli.py index 4bc2b76..139cf61 100755 --- a/devnest/lib/cli.py +++ b/devnest/lib/cli.py @@ -176,9 +176,9 @@ def get_base_parser(self): help=argparse.SUPPRESS) disconnect_parser = subparsers.add_parser('disconnect', - parents=[node_parser, nest_parser], - formatter_class=formatter, - help='disconnect node(s) from Jenkins master') + parents=[node_parser, nest_parser], + formatter_class=formatter, + help='disconnect node(s) from Jenkins master') disconnect_parser.set_defaults(action=Action.DISCONNECT) list_parser = subparsers.add_parser('list', @@ -468,7 +468,7 @@ def main(self, argv): if reserve_node.get_node_status() == NodeStatus.JOB_RUNNING and \ not parser_args.force: err_msg = "A CI job is is currently running on %s node. Use --force flag " \ - "to reserve the node.\n\tIt will be reserved and available once the currently \ " \ + "to reserve the node.\n\tIt will be reserved and available once the currently " \ "running CI job finishes\n\tUse:\n\t" \ " $ devnest list -g %s %s\n\tto check if " \ "CI job has finished and you can use it, if so the node "\ diff --git a/devnest/lib/node.py b/devnest/lib/node.py index d5f075c..33a8d60 100755 --- a/devnest/lib/node.py +++ b/devnest/lib/node.py @@ -777,7 +777,7 @@ def disconnect(self, msg='disconnected_by_devnest'): LOG.info('Disconnecting %s from Jenkins master' % self.node_name) - self.jenkins.requester.post_and_confirm_status("%s/doDisconnect?offlineMessage=%s" % (node_url, msg), data={} ) + self.jenkins.requester.post_and_confirm_status("%s/doDisconnect?offlineMessage=%s" % (node_url, msg), data={}) def _update_node_with_node_details(self, node_details): """Update node with NodeDetails data.