summaryrefslogtreecommitdiff
path: root/troveclient/osc
diff options
context:
space:
mode:
authorcaishan <caishan1993@foxmail.com>2018-01-22 02:21:08 -0800
committercaishan <caishan1993@foxmail.com>2018-01-22 05:38:27 -0800
commite30e8db7e7e79e6409c22d4ea8c80e0ff5cc4672 (patch)
treeebc046a12a483fa582395f034bfafbd315e9aa24 /troveclient/osc
parentb7ebc503f489d319f96d51ee305aafa114e00dad (diff)
downloadpython-troveclient-queens-em.tar.gz
Fix log-enable high priority errorqueens-em2.14.0
1. Modify setup.cfg to make command openstack database log enable run correctlly. class EnableDatabaseInstanceLog should be in database_instances, not in database_limits. This is a HIGH priority error. 2. Originally, trove log-enable will return a log info when execute successfully. This change makes OSC log_enable acts like the origin troveclient enable_log. Change-Id: I68c5ef451c8e6c7fb189d6270bad002da7ffc9a6
Diffstat (limited to 'troveclient/osc')
-rw-r--r--troveclient/osc/v1/database_instances.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/troveclient/osc/v1/database_instances.py b/troveclient/osc/v1/database_instances.py
index 76fcb3e..e06904d 100644
--- a/troveclient/osc/v1/database_instances.py
+++ b/troveclient/osc/v1/database_instances.py
@@ -447,7 +447,7 @@ class UpgradeDatabaseInstance(command.Command):
db_instances.upgrade(instance, parsed_args.datastore_version)
-class EnableDatabaseInstanceLog(command.Command):
+class EnableDatabaseInstanceLog(command.ShowOne):
_description = _("Instructs Trove guest to start collecting log details.")
@@ -471,7 +471,9 @@ class EnableDatabaseInstanceLog(command.Command):
db_instances = self.app.client_manager.database.instances
instance = osc_utils.find_resource(db_instances,
parsed_args.instance)
- db_instances.log_enable(instance, parsed_args.log_name)
+ log_info = db_instances.log_enable(instance, parsed_args.log_name)
+ result = log_info._info
+ return zip(*sorted(six.iteritems(result)))
class ResizeDatabaseInstanceVolume(command.Command):