From 34ea425359193c0985f99d1adac5afb5ef77ef83 Mon Sep 17 00:00:00 2001 From: miaohb Date: Tue, 20 Sep 2016 19:33:58 +0800 Subject: [PATCH] Fix error in build-info Closed-Bug: 1625586 "build-info" returns empty Change-Id: I4555dda68be7d75632b7f3ad341b4e468f4f6622 --- senlinclient/tests/unit/v1/test_shell.py | 5 +++-- senlinclient/v1/shell.py | 11 ++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/senlinclient/tests/unit/v1/test_shell.py b/senlinclient/tests/unit/v1/test_shell.py index a924828b..2874701a 100644 --- a/senlinclient/tests/unit/v1/test_shell.py +++ b/senlinclient/tests/unit/v1/test_shell.py @@ -68,8 +68,9 @@ class ShellTest(testtools.TestCase): 'api': utils.json_formatter, 'engine': utils.json_formatter, } - mock_print.assert_called_once_with(result.to_dict(), - formatters=formatters) + mock_print.assert_called_once_with( + {'api': result.api, 'engine': result.engine}, + formatters=formatters) service.get_build_info.assert_called_once_with() @mock.patch.object(utils, 'print_list') diff --git a/senlinclient/v1/shell.py b/senlinclient/v1/shell.py index ff93e254..83e84571 100644 --- a/senlinclient/v1/shell.py +++ b/senlinclient/v1/shell.py @@ -34,19 +34,16 @@ def show_deprecated(deprecated, recommended): def do_build_info(service, args=None): - """Retrieve build information. - - :param sc: Instance of senlinclient. - :param args: Additional command line arguments, if any. - """ + """Retrieve build information.""" show_deprecated('senlin build-info', 'openstack cluster build info') - result = service.get_build_info().to_dict() + result = service.get_build_info() + info = {'api': result.api, 'engine': result.engine} formatters = { 'api': utils.json_formatter, 'engine': utils.json_formatter, } - utils.print_dict(result, formatters=formatters) + utils.print_dict(info, formatters=formatters) # PROFILE TYPES