openstack/python-senlinclient
Code Issues Proposed changes

Change osprofiler option "--profile" to "--os-profile"

Browse Source 
Osprofiler option "--profile" is conficting with the one in
cluster-create and node-create, this patch changes the former
to "--os-profile".

Change-Id: Ida340a6e503c735d45d8bc27c59e45dcb5d0e018
This commit is contained in:
lvdongbing 2016-10-14 02:07:42 -04:00
parent 25de942b65
commit e648fb44db
1 changed files with 5 additions and 5 deletions

10
senlinclient/shell.py

@ -101,7 +101,7 @@ class SenlinShell(object):
def add_profiler_args(self, parser): def add_profiler_args(self, parser):
if osprofiler_profiler: if osprofiler_profiler:
parser.add_argument( parser.add_argument(
'--profile', metavar='HMAC_KEY', '--os-profile', metavar='HMAC_KEY',
help=_('HMAC key to use for encrypting context data for ' help=_('HMAC key to use for encrypting context data for '
'performance profiling of operation. This key should ' 'performance profiling of operation. This key should '
'be the value of HMAC key configured in osprofiler ' 'be the value of HMAC key configured in osprofiler '
@ -287,13 +287,13 @@ class SenlinShell(object):
# Setup Senlin client connection # Setup Senlin client connection
sc = self._setup_senlin_client(api_ver, args) sc = self._setup_senlin_client(api_ver, args)
profile = osprofiler_profiler and options.profile os_profile = osprofiler_profiler and options.os_profile
if profile: if os_profile:
osprofiler_profiler.init(options.profile) osprofiler_profiler.init(options.os_profile)
args.func(sc.service, args) args.func(sc.service, args)
if profile: if os_profile:
trace_id = osprofiler_profiler.get().get_base_id() trace_id = osprofiler_profiler.get().get_base_id()
print(_("Trace ID: %s") % trace_id) print(_("Trace ID: %s") % trace_id)
print(_("To display trace use next command:\n" print(_("To display trace use next command:\n"