summaryrefslogtreecommitdiff
path: root/openstackclient/compute
diff options
context:
space:
mode:
authorArtem Goncharov <Artem.goncharov@gmail.com>2020-09-09 19:01:27 +0200
committerArtem Goncharov <Artem.goncharov@gmail.com>2020-10-06 15:04:02 +0200
commit74db8dd65d35b326d3fa1c680b04a668a3f66bdc (patch)
tree64538cb5b433856a00bd015e87195af75fd8360b /openstackclient/compute
parent99b5adf9c65d3cd2e2aa8c40c08a478fae0a49f3 (diff)
downloadpython-openstackclient-74db8dd65d35b326d3fa1c680b04a668a3f66bdc.tar.gz
Switch openstack console log show operation to use OpenStackSDK
A short switch onto SDK for fetching console logs of the server Change-Id: I3f750ea4f13a4e72272aa67ea4506bd7182b13f9
Diffstat (limited to 'openstackclient/compute')
-rw-r--r--openstackclient/compute/v2/console.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/openstackclient/compute/v2/console.py b/openstackclient/compute/v2/console.py
index 110b21b8..f0abaf4c 100644
--- a/openstackclient/compute/v2/console.py
+++ b/openstackclient/compute/v2/console.py
@@ -44,19 +44,18 @@ class ShowConsoleLog(command.Command):
return parser
def take_action(self, parsed_args):
- compute_client = self.app.client_manager.compute
+ compute_client = self.app.client_manager.sdk_connection.compute
- server = utils.find_resource(
- compute_client.servers,
- parsed_args.server,
+ server = compute_client.find_server(
+ name_or_id=parsed_args.server,
+ ignore_missing=False
)
- length = parsed_args.lines
- if length:
- # NOTE(dtroyer): get_console_output() appears to shortchange the
- # output by one line
- length += 1
- data = server.get_console_output(length=length)
+ output = compute_client.get_server_console_output(
+ server.id, length=parsed_args.lines)
+ data = None
+ if output:
+ data = output.get('output', None)
if data and data[-1] != '\n':
data += '\n'