From 3e615b7970bac8fc43854cb3f42ce307ef6cfc79 Mon Sep 17 00:00:00 2001 From: tengqm Date: Wed, 21 Oct 2015 05:14:54 -0400 Subject: [PATCH] Delete deprecated 'policy' option for webhook create We don't support policy actions as of now, so the '--policy' option makes no sense. Change-Id: Ie22768831d5166d570311d2d4a35e423b9d7b52e --- senlinclient/v1/shell.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/senlinclient/v1/shell.py b/senlinclient/v1/shell.py index bcf3a6f3..cee56d0a 100644 --- a/senlinclient/v1/shell.py +++ b/senlinclient/v1/shell.py @@ -324,8 +324,6 @@ def do_webhook_show(sc, args): help=_('Targeted cluster for this webhook.')) @utils.arg('-n', '--node', metavar='', help=_('Targeted node for this webhook.')) -@utils.arg('-p', '--policy', metavar='', - help=_('Targeted policy for this webhook.')) @utils.arg('-a', '--action', metavar='', required=True, help=_('Name of action to be triggered for this webhook.')) @utils.arg('-C', '--credential', metavar='', @@ -340,12 +338,8 @@ def do_webhook_show(sc, args): def do_webhook_create(sc, args): '''Create a webhook.''' - c = sum(x is not None for x in [args.cluster, args.node, args.policy]) - if c > 1: - msg = _("Only one of 'cluster', 'node' or 'policy' can be specified.") - raise exc.CommandError(msg) - elif c == 0: - msg = _("One of 'cluster', 'node' or 'policy' must be specified.") + if args.cluster and args.node: + msg = _("Only one of 'cluster' or 'node' can be specified, not both.") raise exc.CommandError(msg) if args.cluster: @@ -355,8 +349,8 @@ def do_webhook_create(sc, args): obj_type = 'node' obj_id = args.node else: - obj_type = 'policy' - obj_id = args.policy + msg = _("One of 'cluster' or 'node' must be specified.") + raise exc.CommandError(msg) params = { 'name': args.name,