openstack/python-zaqarclient
Code Issues Proposed changes

Change resource_types action

Browse Source 
Change resource_types action for purge so that when developer use
the zaqar client lib, the parameter 'resource_types' can be passed
in an array instead of a string. It makes more sense and be
consistent with the API.

Change-Id: Idbf514d76219548c0dbfbcf96fe931c681276443
This commit is contained in:
Fei Long Wang 2017-02-23 12:13:26 +13:00
parent b3ff95eb4a
commit 0707bde005
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zaqarclient/queues/v2/cli.py
View File

@ -72,6 +72,7 @@ class PurgeQueue(command.Command):
parser.add_argument( parser.add_argument(
"--resource_types", "--resource_types",
metavar="<resource_types>", metavar="<resource_types>",
action='append',
choices=['messages', 'subscriptions'], choices=['messages', 'subscriptions'],
help="Resource types want to be purged.") help="Resource types want to be purged.")
return parser return parser

2
zaqarclient/queues/v2/core.py
View File

@ -103,7 +103,7 @@ def queue_purge(transport, request, name, resource_types=None):
request.operation = 'queue_purge' request.operation = 'queue_purge'
request.params['queue_name'] = name request.params['queue_name'] = name
if resource_types: if resource_types:
request.content = json.dumps({'resource_types': [resource_types]}) request.content = json.dumps({'resource_types': resource_types})
resp = transport.send(request) resp = transport.send(request)
return resp.deserialized_content return resp.deserialized_content

2
zaqarclient/tests/queues/queues.py
View File

@ -579,7 +579,7 @@ class QueuesV2QueueUnitTest(QueuesV1_1QueueUnitTest):
send_method.return_value = resp send_method.return_value = resp
self.queue.purge(resource_types=['messages']) self.queue.purge(resource_types=['messages'])
self.assertEqual({"resource_types": [["messages"]]}, self.assertEqual({"resource_types": ["messages"]},
json.loads(send_method.call_args[0][0].content)) json.loads(send_method.call_args[0][0].content))