diff --git a/zaqarclient/queues/v2/cli.py b/zaqarclient/queues/v2/cli.py index aa61a35c..ec253123 100644 --- a/zaqarclient/queues/v2/cli.py +++ b/zaqarclient/queues/v2/cli.py @@ -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)) diff --git a/zaqarclient/queues/v2/subscription.py b/zaqarclient/queues/v2/subscription.py index b007c283..bc8c44cf 100644 --- a/zaqarclient/queues/v2/subscription.py +++ b/zaqarclient/queues/v2/subscription.py @@ -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) diff --git a/zaqarclient/tests/queues/queues.py b/zaqarclient/tests/queues/queues.py index 8d3a2b37..88ca1d29 100644 --- a/zaqarclient/tests/queues/queues.py +++ b/zaqarclient/tests/queues/queues.py @@ -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": {}}] } diff --git a/zaqarclient/tests/queues/subscriptions.py b/zaqarclient/tests/queues/subscriptions.py index cdfb81e9..4ddc91eb 100644 --- a/zaqarclient/tests/queues/subscriptions.py +++ b/zaqarclient/tests/queues/subscriptions.py @@ -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',