From 6612e928f1ccffe8ea588281771ef4b5b383d5ed Mon Sep 17 00:00:00 2001 From: miaohb Date: Fri, 23 Sep 2016 13:40:35 +0800 Subject: [PATCH] revise the "cluster-policy-attach" The parameter "--enabled" in "cluster policy attach" is useless, which can not be set to False. Here we try to fix it so that the parameter can be assigned to False when doing attach. Change-Id: I0b5de3c6f61c38c62ac8c7e1b95d523175bbc11c Closed-Bug: 1626833 --- senlinclient/tests/unit/v1/test_cluster.py | 4 ++-- senlinclient/v1/cluster.py | 2 +- senlinclient/v1/shell.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/senlinclient/tests/unit/v1/test_cluster.py b/senlinclient/tests/unit/v1/test_cluster.py index b3ff6c63..4240d965 100644 --- a/senlinclient/tests/unit/v1/test_cluster.py +++ b/senlinclient/tests/unit/v1/test_cluster.py @@ -593,13 +593,13 @@ class TestClusterPolicyAttach(TestCluster): return_value=self.response) def test_cluster_policy_attach(self): - arglist = ['--policy', 'my_policy', '--enabled', 'my_cluster'] + arglist = ['--policy', 'my_policy', '--enabled', 'True', 'my_cluster'] parsed_args = self.check_parser(self.cmd, arglist, []) self.cmd.take_action(parsed_args) self.mock_client.cluster_attach_policy.assert_called_with( 'my_cluster', 'my_policy', - enabled=True) + enabled='True') class TestClusterPolicyDetach(TestCluster): diff --git a/senlinclient/v1/cluster.py b/senlinclient/v1/cluster.py index 7724588a..1b424e4e 100644 --- a/senlinclient/v1/cluster.py +++ b/senlinclient/v1/cluster.py @@ -522,8 +522,8 @@ class ClusterPolicyAttach(command.Command): parser = super(ClusterPolicyAttach, self).get_parser(prog_name) parser.add_argument( '--enabled', + metavar='', default=True, - action="store_true", help=_('Whether the policy should be enabled once attached. ' 'Default to True') ) diff --git a/senlinclient/v1/shell.py b/senlinclient/v1/shell.py index d7311183..1c4e56e0 100644 --- a/senlinclient/v1/shell.py +++ b/senlinclient/v1/shell.py @@ -1012,7 +1012,7 @@ def do_cluster_policy_show(service, args): @utils.arg('-p', '--policy', metavar='', required=True, help=_('ID or name of policy to be attached.')) -@utils.arg('-e', '--enabled', default=True, action="store_true", +@utils.arg('-e', '--enabled', metavar='', default=True, help=_('Whether the policy should be enabled once attached. ' 'Default to enabled.')) @utils.arg('id', metavar='',