From d9736d28816236c8d6cc412361f0757cc6185840 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 1 Dec 2015 14:51:17 -0500 Subject: [PATCH] Fix tools/get_action_list.py This patch does several things: -fixes an issue where trove_base now uses the Manager class instead of HookableMixin. This would actually prevent tools/get_action_list.py from running any service... not just trove. -adds 'trove' to the list of supported services by using CLIENTS.keys() instead of the inline list where 'trove' was previously missing -The trove Client class now requires to arguments. With these options I am again able to use get_action_list.py. NOTE: The critical error here was actually the HookableMixin exception in that it prevents you from using this tool with other services. Change-Id: I3207e1379101757b282260949a48d22fe193fe85 Closes-bug: #1521740 --- tools/get_action_list.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/get_action_list.py b/tools/get_action_list.py index b89168029..8c67bbe1c 100644 --- a/tools/get_action_list.py +++ b/tools/get_action_list.py @@ -61,7 +61,7 @@ BASE_HEAT_MANAGER = heat_base.HookableMixin BASE_NOVA_MANAGER = nova_base.HookableMixin BASE_KEYSTONE_MANAGER = keystone_base.Manager BASE_CINDER_MANAGER = cinder_base.HookableMixin -BASE_TROVE_MANAGER = trove_base.HookableMixin +BASE_TROVE_MANAGER = trove_base.Manager def get_parser(): parser = argparse.ArgumentParser( @@ -70,7 +70,7 @@ def get_parser(): ) parser.add_argument( 'service', - choices=['nova', 'glance', 'heat', 'cinder', 'keystone', 'ceilometer'], + choices=CLIENTS.keys(), help='Service name which methods need to be found.' ) parser.add_argument( @@ -136,7 +136,7 @@ def get_cinder_client(**kwargs): return cinderclient.Client() def get_trove_client(**kwargs): - return troveclient.Client() + return troveclient.Client('username', 'password') CLIENTS = { 'nova': get_nova_client,