openstack/python-aodhclient
Code Issues Proposed changes

refactor code of adding alarm id and name arguments

Browse Source 
There are three places: alarm show, alarm update and alarm delete
need these two arguments, and they appear for three times, which
is not so good, let's fix it.

Change-Id: Iff9e768684069946f705ecd14be08ef45167e694
This commit is contained in:
ZhiQiang Fan
2016-04-26 07:38:37 +08:00
parent 9036e3ada9
commit e719965c0c
1 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
aodhclient/v2/alarm_cli.py
View File

@@ -117,18 +117,22 @@ def _check_name_and_id(parsed_args, action):
raise exceptions.CommandError(msg)
def _add_name_and_id(parser):
parser.add_argument("id", nargs='?',
metavar='<ALARM ID>',
help="ID of an alarm.")
parser.add_argument("--alarm-name", dest='alarm_name',
metavar='<ALARM NAME>',
help="Name of an alarm.")
return parser
class CliAlarmShow(show.ShowOne):
"""Show an alarm"""
def get_parser(self, prog_name):
parser = super(CliAlarmShow, self).get_parser(prog_name)
parser.add_argument("id", nargs='?',
metavar='<ALARM ID>',
help="ID of an alarm")
parser.add_argument("--alarm-name", dest='alarm_name',
metavar='<ALARM NAME>',
help="name of an alarm")
return parser
return _add_name_and_id(parser)
def take_action(self, parsed_args):
_check_name_and_id(parsed_args, 'query')
@@ -385,13 +389,7 @@ class CliAlarmUpdate(CliAlarmCreate):
def get_parser(self, prog_name):
parser = super(CliAlarmUpdate, self).get_parser(prog_name)
parser.add_argument("id", nargs='?',
metavar='<ALARM ID>',
help="ID of an alarm")
parser.add_argument("--alarm-name", dest='alarm_name',
metavar='<ALARM NAME>',
help="name of an alarm")
return parser
return _add_name_and_id(parser)
def take_action(self, parsed_args):
_check_name_and_id(parsed_args, 'update')
@@ -413,13 +411,7 @@ class CliAlarmDelete(command.Command):
def get_parser(self, prog_name):
parser = super(CliAlarmDelete, self).get_parser(prog_name)
parser.add_argument("id", nargs='?',
metavar='<ALARM ID>',
help="ID of an alarm")
parser.add_argument("--alarm-name", dest='alarm_name',
metavar='<ALARM NAME>',
help="name of an alarm")
return parser
return _add_name_and_id(parser)
def take_action(self, parsed_args):
_check_name_and_id(parsed_args, 'delete')