From bf1a1303632acbdecbaa32af45a1c239ade18b91 Mon Sep 17 00:00:00 2001
From: tengqm <tengqim@cn.ibm.com>
Date: Wed, 7 Jan 2015 14:43:23 +0800
Subject: [PATCH] Replace enable/disable with policy_update

There are other properties that can be changed regarding a policy that
is attached to a cluster, i.e. enforcement leve, cooldown period.  We
should combine these operations to 1) simplify the interface; 2) make
the interface complete.
---
 senlinclient/v1/shell.py | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

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='<KEY1=VALUE1;KEY2=VALUE2...>',
@@ -343,12 +344,24 @@ def do_cluster_policy_attach(sc, args):
     do_cluster_policy_list(sc, args.id)
 
 
+@utils.arg('-p', '--policy', metavar='<POLICY_ID>',
+           help=_('ID of policy to be detached.'))
+@utils.arg('id', metavar='<NAME or ID>',
+           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='<POLICY_ID>',
            help=_('ID of policy to be enabled.'))
 @utils.arg('-c', '--cooldown', metavar='<COOLDOWN>',
            help=_('Cooldown interval in seconds.'))
 @utils.arg('-l', '--level', metavar='<LEVEL>',
            help=_('Enforcement level.'))
+@utils.arg('-e', '--enabled', metavar='<BOOLEAN>',
+           help=_('Specify whether to enable policy.'))
 @utils.arg('id', metavar='<NAME or ID>',
            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='<POLICY_ID>',
-           help=_('ID of policy to be disabled.'))
-@utils.arg('id', metavar='<NAME or ID>',
-           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='<POLICY_ID>',
-           help=_('ID of policy to be detached.'))
-@utils.arg('id', metavar='<NAME or ID>',
-           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