Merge "revise the "cluster-policy-attach""

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):

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='<enabled>',
             default=True,
-            action="store_true",
             help=_('Whether the policy should be enabled once attached. '
                    'Default to True')
         )

senlinclient/v1/shell.py

@@ -1012,7 +1012,7 @@ def do_cluster_policy_show(service, args):
 
 @utils.arg('-p', '--policy', metavar='<POLICY>', 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='<enabled>', default=True,
            help=_('Whether the policy should be enabled once attached. '
                   'Default to enabled.'))
 @utils.arg('id', metavar='<NAME or ID>',