diff --git a/senlinclient/v1/shell.py b/senlinclient/v1/shell.py index dbc9a35..a5877be 100644 --- a/senlinclient/v1/shell.py +++ b/senlinclient/v1/shell.py @@ -250,6 +250,7 @@ def do_cluster_show(sc, args): } utils.print_dict(cluster.to_dict(), formatters=formatters) + @utils.arg('-s', '--show-deleted', default=False, action="store_true", help=_('Include soft-deleted nodes if any.')) @utils.arg('-f', '--filters', metavar='', @@ -343,12 +344,24 @@ def do_cluster_policy_attach(sc, args): do_cluster_policy_list(sc, args.id) +@utils.arg('-p', '--policy', metavar='', + help=_('ID of policy to be detached.')) +@utils.arg('id', metavar='', + help=_('Name or ID of cluster to operate on.')) +def do_cluster_policy_detach(sc, args): + '''Detach policy from cluster.''' + sc.clusters.detach_policy(args.id, args.policy) + do_cluster_policy_list(sc, args.id) + + @utils.arg('-p', '--policy', metavar='', help=_('ID of policy to be enabled.')) @utils.arg('-c', '--cooldown', metavar='', help=_('Cooldown interval in seconds.')) @utils.arg('-l', '--level', metavar='', help=_('Enforcement level.')) +@utils.arg('-e', '--enabled', metavar='', + help=_('Specify whether to enable policy.')) @utils.arg('id', metavar='', help=_('Name or ID of cluster to operate on.')) def do_cluster_policy_update(sc, args): @@ -356,32 +369,13 @@ def do_cluster_policy_update(sc, args): kwargs = { 'policy_id': args.policy, 'cooldown': args.cooldown, + 'enabled': args.enabled, 'level': args.level, } sc.clusters.update_policy(args.id, **kwargs) do_cluster_policy_list(sc, args.id) -@utils.arg('-p', '--policy', metavar='', - help=_('ID of policy to be disabled.')) -@utils.arg('id', metavar='', - help=_('Name or ID of cluster to operate on.')) -def do_cluster_policy_disable(sc, args): - '''Disable policy on cluster.''' - sc.clusters.disable_policy(args.id, args.policy) - do_cluster_policy_list(sc, args.id) - - -@utils.arg('-p', '--policy', metavar='', - help=_('ID of policy to be detached.')) -@utils.arg('id', metavar='', - help=_('Name or ID of cluster to operate on.')) -def do_cluster_policy_detach(sc, args): - '''Detach policy from cluster.''' - sc.clusters.detach_policy(args.id, args.policy) - do_cluster_policy_list(sc, args.id) - - #### NODES