From 0fb164a2b6bb504cc9fd56933815902de8709a39 Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 21 Jul 2017 11:08:17 +0800 Subject: [PATCH] Fix receiver-update mistake 1. help info is incorrect. 2. params can not be parsed correctly. Change-Id: Icf52980429288a716aa1b5b9d8780eb3f89512bf --- senlinclient/tests/unit/v1/test_shell.py | 10 +++++----- senlinclient/v1/receiver.py | 2 +- senlinclient/v1/shell.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/senlinclient/tests/unit/v1/test_shell.py b/senlinclient/tests/unit/v1/test_shell.py index 8cd23e54..31c4374c 100644 --- a/senlinclient/tests/unit/v1/test_shell.py +++ b/senlinclient/tests/unit/v1/test_shell.py @@ -511,7 +511,7 @@ class ShellTest(testtools.TestCase): 'type': 'webhook', 'cluster': 'cluster1', 'action': 'CLUSTER_SCALE_IN', - 'params': {} + 'params': [] } args = self._make_args(args) params = { @@ -535,7 +535,7 @@ class ShellTest(testtools.TestCase): 'type': 'webhook', 'cluster': None, 'action': None, - 'params': {} + 'params': [] } args = self._make_args(args) ex = self.assertRaises(exc.CommandError, @@ -552,7 +552,7 @@ class ShellTest(testtools.TestCase): 'type': 'foo', 'cluster': None, 'action': None, - 'params': {} + 'params': [] } args = self._make_args(args) params = { @@ -576,13 +576,13 @@ class ShellTest(testtools.TestCase): 'name': 'receiver2', 'id': 'receiver_id', 'action': 'CLUSTER_SCALE_OUT', - 'params': {'count': '2'} + 'params': ['key1=value1;key2=value2'] } args = self._make_args(args) params = { 'name': 'receiver2', 'action': 'CLUSTER_SCALE_OUT', - 'params': {'count': '2'} + 'params': {'key1': 'value1', 'key2': 'value2'} } receiver = mock.Mock() receiver.id = 'receiver_id' diff --git a/senlinclient/v1/receiver.py b/senlinclient/v1/receiver.py index dbc43f56..67ad8a95 100644 --- a/senlinclient/v1/receiver.py +++ b/senlinclient/v1/receiver.py @@ -214,7 +214,7 @@ class CreateReceiver(command.ShowOne): class UpdateReceiver(command.ShowOne): - """Create a receiver.""" + """Update a receiver.""" log = logging.getLogger(__name__ + ".UpdateReceiver") diff --git a/senlinclient/v1/shell.py b/senlinclient/v1/shell.py index ac5380a3..51f4172e 100644 --- a/senlinclient/v1/shell.py +++ b/senlinclient/v1/shell.py @@ -1584,7 +1584,7 @@ def do_receiver_update(service, args): params = { 'name': args.name, 'action': args.action, - 'params': args.params + 'params': utils.format_parameters(args.params) } # Find the receiver first, we need its id