openstack/python-zaqarclient
Code Issues Proposed changes

Merge "Support age and confirmed for subscription"

Browse Source
This commit is contained in:
Jenkins 2017-03-06 09:31:17 +00:00 committed by Gerrit Code Review
commit f2011c19a0
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,7 @@ class ListSubscriptions(command.Lister):
kwargs["limit"] = parsed_args.limit
data = client.subscriptions(**kwargs)
columns = ('ID', 'Subscriber', 'TTL', 'Options')
columns = ('ID', 'Subscriber', 'TTL', 'Age', 'Confirmed', 'Options')
return (columns,
(utils.get_item_properties(s, columns) for s in data))

6
zaqarclient/queues/v2/subscription.py
View File

@ -27,6 +27,8 @@ class Subscription(object):
self.subscriber = subscriber
self.ttl = ttl
self.options = kwargs.get('options', {})
self.age = kwargs.get('age')
self.confirmed = kwargs.get('confirmed')
if auto_create:
self.ensure_exists()
@ -56,6 +58,8 @@ class Subscription(object):
self.subscriber = sub.get('subscriber')
self.ttl = sub.get('ttl')
self.options = sub.get('options')
self.age = sub.get('age')
self.confirmed = sub.get('confirmed')
def update(self, subscription_data):
req, trans = self.client._request_and_transport()
@ -75,5 +79,7 @@ def create_object(parent):
subscriber=kwargs.pop('subscriber'),
ttl=kwargs.pop('ttl'),
id=kwargs.pop('id'),
age=kwargs.pop('age'),
confirmed=kwargs.pop('confirmed'),
auto_create=False,
**kwargs)

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

@ -499,12 +499,16 @@ class QueuesV2QueueUnitTest(QueuesV1_1QueueUnitTest):
"id": "1",
"subscriber": 'http://trigger.me',
"ttl": 3600,
"age": 1800,
"confirmed": False,
"options": {}},
{
"source": 'test',
"id": "2",
"subscriber": 'http://trigger.you',
"ttl": 7200,
"age": 1800,
"confirmed": False,
"options": {}}]
}

4
zaqarclient/tests/queues/subscriptions.py
View File

@ -142,11 +142,15 @@ class QueuesV2SubscriptionUnitTest(base.QueuesTestBase):
'id': '568afabb508f153573f6a56f',
'subscriber': 'http://trigger.me',
'ttl': 3600,
'age': 1800,
'confirmed': False,
'options': {}},
{'source': 'beijing',
'id': '568afabb508f153573f6a56x',
'subscriber': 'http://trigger.you',
'ttl': 7200,
'age': 2309,
'confirmed': True,
'options': {'oh stop': 'triggering'}}]}
with mock.patch.object(self.transport, 'send',