openstack/openstacksdk
Code Issues Proposed changes

Blackify openstack.message

Browse Source 
Black used with the '-l 79 -S' flags.

A future change will ignore this commit in git-blame history by adding a
'git-blame-ignore-revs' file.

Change-Id: Ibb7c7931cb3a7a9a3ccc577475e3e6b1355ca4c9
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2023-05-05 11:02:56 +01:00
parent 9d3d986241
commit 0e2b5d263f
11 changed files with 459 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
openstack/message/v2/_proxy.py
View File

@ -91,8 +91,9 @@ class Proxy(proxy.Proxy):
:returns: A string includes location of messages successfully posted.
"""
message = self._get_resource(_message.Message, None,
queue_name=queue_name)
message = self._get_resource(
_message.Message, None, queue_name=queue_name
)
return message.post(self, messages)
def messages(self, queue_name, **query):
@ -129,12 +130,14 @@ class Proxy(proxy.Proxy):
:raises: :class:`~openstack.exceptions.ResourceNotFound` when no
message matching the criteria could be found.
"""
message = self._get_resource(_message.Message, message,
queue_name=queue_name)
message = self._get_resource(
_message.Message, message, queue_name=queue_name
)
return self._get(_message.Message, message)
def delete_message(self, queue_name, value, claim=None,
ignore_missing=True):
def delete_message(
self, queue_name, value, claim=None, ignore_missing=True
):
"""Delete a message
:param queue_name: The name of target queue to delete message from.
@ -152,11 +155,13 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
message = self._get_resource(_message.Message, value,
queue_name=queue_name)
message = self._get_resource(
_message.Message, value, queue_name=queue_name
)
message.claim_id = resource.Resource._get_id(claim)
return self._delete(_message.Message, message,
ignore_missing=ignore_missing)
return self._delete(
_message.Message, message, ignore_missing=ignore_missing
)
def create_subscription(self, queue_name, **attrs):
"""Create a new subscription from attributes
@ -169,8 +174,9 @@ class Proxy(proxy.Proxy):
:returns: The results of subscription creation
:rtype: :class:`~openstack.message.v2.subscription.Subscription`
"""
return self._create(_subscription.Subscription, queue_name=queue_name,
**attrs)
return self._create(
_subscription.Subscription, queue_name=queue_name, **attrs
)
def subscriptions(self, queue_name, **query):
"""Retrieve a generator of subscriptions
@ -203,9 +209,9 @@ class Proxy(proxy.Proxy):
:raises: :class:`~openstack.exceptions.ResourceNotFound` when no
subscription matching the criteria could be found.
"""
subscription = self._get_resource(_subscription.Subscription,
subscription,
queue_name=queue_name)
subscription = self._get_resource(
_subscription.Subscription, subscription, queue_name=queue_name
)
return self._get(_subscription.Subscription, subscription)
def delete_subscription(self, queue_name, value, ignore_missing=True):
@ -224,10 +230,14 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
subscription = self._get_resource(_subscription.Subscription, value,
queue_name=queue_name)
return self._delete(_subscription.Subscription, subscription,
ignore_missing=ignore_missing)
subscription = self._get_resource(
_subscription.Subscription, value, queue_name=queue_name
)
return self._delete(
_subscription.Subscription,
subscription,
ignore_missing=ignore_missing,
)
def create_claim(self, queue_name, **attrs):
"""Create a new claim from attributes
@ -268,8 +278,9 @@ class Proxy(proxy.Proxy):
:returns: The results of claim update
:rtype: :class:`~openstack.message.v2.claim.Claim`
"""
return self._update(_claim.Claim, claim, queue_name=queue_name,
**attrs)
return self._update(
_claim.Claim, claim, queue_name=queue_name, **attrs
)
def delete_claim(self, queue_name, claim, ignore_missing=True):
"""Delete a claim
@ -285,5 +296,9 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
return self._delete(_claim.Claim, claim, queue_name=queue_name,
ignore_missing=ignore_missing)
return self._delete(
_claim.Claim,
claim,
queue_name=queue_name,
ignore_missing=ignore_missing,
)

53
openstack/message/v2/claim.py
View File

@ -62,16 +62,17 @@ class Claim(resource.Resource):
self.id = self.location.split("claims/")[1]
def create(self, session, prepend_key=False, base_path=None):
request = self._prepare_request(requires_id=False,
prepend_key=prepend_key,
base_path=base_path)
request = self._prepare_request(
requires_id=False, prepend_key=prepend_key, base_path=base_path
)
headers = {
"Client-ID": self.client_id or str(uuid.uuid4()),
"X-PROJECT-ID": self.project_id or session.get_project_id()
"X-PROJECT-ID": self.project_id or session.get_project_id(),
}
request.headers.update(headers)
response = session.post(request.url,
json=request.body, headers=request.headers)
response = session.post(
request.url, json=request.body, headers=request.headers
)
# For case no message was claimed successfully, 204 No Content
# message will be returned. In other cases, we translate response
@ -81,34 +82,43 @@ class Claim(resource.Resource):
return self
def fetch(self, session, requires_id=True,
base_path=None, error_message=None, skip_cache=False):
request = self._prepare_request(requires_id=requires_id,
base_path=base_path)
def fetch(
self,
session,
requires_id=True,
base_path=None,
error_message=None,
skip_cache=False,
):
request = self._prepare_request(
requires_id=requires_id, base_path=base_path
)
headers = {
"Client-ID": self.client_id or str(uuid.uuid4()),
"X-PROJECT-ID": self.project_id or session.get_project_id()
"X-PROJECT-ID": self.project_id or session.get_project_id(),
}
request.headers.update(headers)
response = session.get(
request.url, headers=request.headers, skip_cache=False)
request.url, headers=request.headers, skip_cache=False
)
self._translate_response(response)
return self
def commit(self, session, prepend_key=False, has_body=False,
base_path=None):
request = self._prepare_request(prepend_key=prepend_key,
base_path=base_path)
def commit(
self, session, prepend_key=False, has_body=False, base_path=None
):
request = self._prepare_request(
prepend_key=prepend_key, base_path=base_path
)
headers = {
"Client-ID": self.client_id or str(uuid.uuid4()),
"X-PROJECT-ID": self.project_id or session.get_project_id()
"X-PROJECT-ID": self.project_id or session.get_project_id(),
}
request.headers.update(headers)
session.patch(request.url,
json=request.body, headers=request.headers)
session.patch(request.url, json=request.body, headers=request.headers)
return self
@ -116,12 +126,11 @@ class Claim(resource.Resource):
request = self._prepare_request()
headers = {
"Client-ID": self.client_id or str(uuid.uuid4()),
"X-PROJECT-ID": self.project_id or session.get_project_id()
"X-PROJECT-ID": self.project_id or session.get_project_id(),
}
request.headers.update(headers)
response = session.delete(request.url,
headers=request.headers)
response = session.delete(request.url, headers=request.headers)
self._translate_response(response, has_body=False)
return self

42
openstack/message/v2/message.py
View File

@ -57,12 +57,13 @@ class Message(resource.Resource):
request = self._prepare_request(requires_id=False, prepend_key=True)
headers = {
"Client-ID": self.client_id or str(uuid.uuid4()),
"X-PROJECT-ID": self.project_id or session.get_project_id()
"X-PROJECT-ID": self.project_id or session.get_project_id(),
}
request.headers.update(headers)
request.body = {'messages': messages}
response = session.post(request.url,
json=request.body, headers=request.headers)
response = session.post(
request.url, json=request.body, headers=request.headers
)
return response.json()['resources']
@ -82,14 +83,13 @@ class Message(resource.Resource):
uri = base_path % params
headers = {
"Client-ID": params.get('client_id', None) or str(uuid.uuid4()),
"X-PROJECT-ID": params.get('project_id', None
) or session.get_project_id()
"X-PROJECT-ID": params.get('project_id', None)
or session.get_project_id(),
}
query_params = cls._query_mapping._transpose(params, cls)
while more_data:
resp = session.get(uri,
headers=headers, params=query_params)
resp = session.get(uri, headers=headers, params=query_params)
resp = resp.json()
resp = resp[cls.resources_key]
@ -111,19 +111,26 @@ class Message(resource.Resource):
query_params["limit"] = yielded
query_params["marker"] = new_marker
def fetch(self, session, requires_id=True,
base_path=None, error_message=None, skip_cache=False):
request = self._prepare_request(requires_id=requires_id,
base_path=base_path)
def fetch(
self,
session,
requires_id=True,
base_path=None,
error_message=None,
skip_cache=False,
):
request = self._prepare_request(
requires_id=requires_id, base_path=base_path
)
headers = {
"Client-ID": self.client_id or str(uuid.uuid4()),
"X-PROJECT-ID": self.project_id or session.get_project_id()
"X-PROJECT-ID": self.project_id or session.get_project_id(),
}
request.headers.update(headers)
response = session.get(request.url,
headers=headers,
skip_cache=skip_cache)
response = session.get(
request.url, headers=headers, skip_cache=skip_cache
)
self._translate_response(response)
return self
@ -132,7 +139,7 @@ class Message(resource.Resource):
request = self._prepare_request()
headers = {
"Client-ID": self.client_id or str(uuid.uuid4()),
"X-PROJECT-ID": self.project_id or session.get_project_id()
"X-PROJECT-ID": self.project_id or session.get_project_id(),
}
request.headers.update(headers)
@ -141,8 +148,7 @@ class Message(resource.Resource):
# rebuild the request URI if claim_id is not None.
if self.claim_id:
request.url += '?claim_id=%s' % self.claim_id
response = session.delete(request.url,
headers=headers)
response = session.delete(request.url, headers=headers)
self._translate_response(response, has_body=False)
return self

45
openstack/message/v2/queue.py
View File

@ -51,16 +51,17 @@ class Queue(resource.Resource):
project_id = resource.Header("X-PROJECT-ID")
def create(self, session, prepend_key=True, base_path=None):
request = self._prepare_request(requires_id=True,
prepend_key=prepend_key,
base_path=None)
request = self._prepare_request(
requires_id=True, prepend_key=prepend_key, base_path=None
)
headers = {
"Client-ID": self.client_id or str(uuid.uuid4()),
"X-PROJECT-ID": self.project_id or session.get_project_id()
"X-PROJECT-ID": self.project_id or session.get_project_id(),
}
request.headers.update(headers)
response = session.put(request.url,
json=request.body, headers=request.headers)
response = session.put(
request.url, json=request.body, headers=request.headers
)
self._translate_response(response, has_body=False)
return self
@ -82,13 +83,12 @@ class Queue(resource.Resource):
uri = base_path % params
headers = {
"Client-ID": params.get('client_id', None) or str(uuid.uuid4()),
"X-PROJECT-ID": params.get('project_id', None
) or session.get_project_id()
"X-PROJECT-ID": params.get('project_id', None)
or session.get_project_id(),
}
while more_data:
resp = session.get(uri,
headers=headers, params=query_params)
resp = session.get(uri, headers=headers, params=query_params)
resp = resp.json()
resp = resp[cls.resources_key]
@ -110,17 +110,25 @@ class Queue(resource.Resource):
query_params["limit"] = yielded
query_params["marker"] = new_marker
def fetch(self, session, requires_id=True,
base_path=None, error_message=None, skip_cache=False):
request = self._prepare_request(requires_id=requires_id,
base_path=base_path)
def fetch(
self,
session,
requires_id=True,
base_path=None,
error_message=None,
skip_cache=False,
):
request = self._prepare_request(
requires_id=requires_id, base_path=base_path
)
headers = {
"Client-ID": self.client_id or str(uuid.uuid4()),
"X-PROJECT-ID": self.project_id or session.get_project_id()
"X-PROJECT-ID": self.project_id or session.get_project_id(),
}
request.headers.update(headers)
response = session.get(
request.url, headers=headers, skip_cache=skip_cache)
request.url, headers=headers, skip_cache=skip_cache
)
self._translate_response(response)
return self
@ -129,11 +137,10 @@ class Queue(resource.Resource):
request = self._prepare_request()
headers = {
"Client-ID": self.client_id or str(uuid.uuid4()),
"X-PROJECT-ID": self.project_id or session.get_project_id()
"X-PROJECT-ID": self.project_id or session.get_project_id(),
}
request.headers.update(headers)
response = session.delete(request.url,
headers=headers)
response = session.delete(request.url, headers=headers)
self._translate_response(response, has_body=False)
return self

45
openstack/message/v2/subscription.py
View File

@ -59,16 +59,17 @@ class Subscription(resource.Resource):
project_id = resource.Header("X-PROJECT-ID")
def create(self, session, prepend_key=True, base_path=None):
request = self._prepare_request(requires_id=False,
prepend_key=prepend_key,
base_path=base_path)
request = self._prepare_request(
requires_id=False, prepend_key=prepend_key, base_path=base_path
)
headers = {
"Client-ID": self.client_id or str(uuid.uuid4()),
"X-PROJECT-ID": self.project_id or session.get_project_id()
"X-PROJECT-ID": self.project_id or session.get_project_id(),
}
request.headers.update(headers)
response = session.post(request.url,
json=request.body, headers=request.headers)
response = session.post(
request.url, json=request.body, headers=request.headers
)
self._translate_response(response)
return self
@ -89,14 +90,13 @@ class Subscription(resource.Resource):
uri = base_path % params
headers = {
"Client-ID": params.get('client_id', None) or str(uuid.uuid4()),
"X-PROJECT-ID": params.get('project_id', None
) or session.get_project_id()
"X-PROJECT-ID": params.get('project_id', None)
or session.get_project_id(),
}
query_params = cls._query_mapping._transpose(params, cls)
while more_data:
resp = session.get(uri,
headers=headers, params=query_params)
resp = session.get(uri, headers=headers, params=query_params)
resp = resp.json()
resp = resp[cls.resources_key]
@ -118,18 +118,26 @@ class Subscription(resource.Resource):
query_params["limit"] = yielded
query_params["marker"] = new_marker
def fetch(self, session, requires_id=True,
base_path=None, error_message=None, skip_cache=False):
request = self._prepare_request(requires_id=requires_id,
base_path=base_path)
def fetch(
self,
session,
requires_id=True,
base_path=None,
error_message=None,
skip_cache=False,
):
request = self._prepare_request(
requires_id=requires_id, base_path=base_path
)
headers = {
"Client-ID": self.client_id or str(uuid.uuid4()),
"X-PROJECT-ID": self.project_id or session.get_project_id()
"X-PROJECT-ID": self.project_id or session.get_project_id(),
}
request.headers.update(headers)
response = session.get(
request.url, headers=request.headers, skip_cache=skip_cache)
request.url, headers=request.headers, skip_cache=skip_cache
)
self._translate_response(response)
return self
@ -138,12 +146,11 @@ class Subscription(resource.Resource):
request = self._prepare_request()
headers = {
"Client-ID": self.client_id or str(uuid.uuid4()),
"X-PROJECT-ID": self.project_id or session.get_project_id()
"X-PROJECT-ID": self.project_id or session.get_project_id(),
}
request.headers.update(headers)
response = session.delete(request.url,
headers=request.headers)
response = session.delete(request.url, headers=request.headers)
self._translate_response(response, has_body=False)
return self

1
openstack/tests/unit/message/test_version.py
View File

@ -23,7 +23,6 @@ EXAMPLE = {
class TestVersion(base.TestCase):
def test_basic(self):
sot = version.Version()
self.assertEqual('version', sot.resource_key)

109
openstack/tests/unit/message/v2/test_claim.py
View File

@ -24,7 +24,7 @@ FAKE1 = {
"limit": 10,
"messages": [{"id": "1"}, {"id": "2"}],
"ttl": 3600,
"queue_name": "queue1"
"queue_name": "queue1",
}
@ -37,7 +37,7 @@ FAKE2 = {
"ttl": 3600,
"queue_name": "queue1",
"client_id": "OLD_CLIENT_ID",
"project_id": "OLD_PROJECT_ID"
"project_id": "OLD_PROJECT_ID",
}
@ -77,10 +77,11 @@ class TestClaim(base.TestCase):
res = sot.create(sess)
url = "/queues/%(queue)s/claims" % {"queue": FAKE.pop("queue_name")}
headers = {"Client-ID": "NEW_CLIENT_ID",
"X-PROJECT-ID": "NEW_PROJECT_ID"}
sess.post.assert_called_once_with(url,
headers=headers, json=FAKE)
headers = {
"Client-ID": "NEW_CLIENT_ID",
"X-PROJECT-ID": "NEW_PROJECT_ID",
}
sess.post.assert_called_once_with(url, headers=headers, json=FAKE)
sess.get_project_id.assert_called_once_with()
self.assertEqual(sot, res)
@ -99,10 +100,11 @@ class TestClaim(base.TestCase):
res = sot.create(sess)
url = "/queues/%(queue)s/claims" % {"queue": FAKE.pop("queue_name")}
headers = {"Client-ID": "NEW_CLIENT_ID",
"X-PROJECT-ID": "NEW_PROJECT_ID"}
sess.post.assert_called_once_with(url,
headers=headers, json=FAKE)
headers = {
"Client-ID": "NEW_CLIENT_ID",
"X-PROJECT-ID": "NEW_PROJECT_ID",
}
sess.post.assert_called_once_with(url, headers=headers, json=FAKE)
sess.get_project_id.assert_called_once_with()
self.assertEqual(sot, res)
sot._translate_response.assert_called_once_with(resp)
@ -119,10 +121,11 @@ class TestClaim(base.TestCase):
res = sot.create(sess)
url = "/queues/%(queue)s/claims" % {"queue": FAKE.pop("queue_name")}
headers = {"Client-ID": FAKE.pop("client_id"),
"X-PROJECT-ID": FAKE.pop("project_id")}
sess.post.assert_called_once_with(url,
headers=headers, json=FAKE)
headers = {
"Client-ID": FAKE.pop("client_id"),
"X-PROJECT-ID": FAKE.pop("project_id"),
}
sess.post.assert_called_once_with(url, headers=headers, json=FAKE)
self.assertEqual(sot, res)
@mock.patch.object(uuid, "uuid4")
@ -138,11 +141,14 @@ class TestClaim(base.TestCase):
res = sot.fetch(sess)
url = "queues/%(queue)s/claims/%(claim)s" % {
"queue": FAKE1["queue_name"], "claim": FAKE1["id"]}
headers = {"Client-ID": "NEW_CLIENT_ID",
"X-PROJECT-ID": "NEW_PROJECT_ID"}
sess.get.assert_called_with(
url, headers=headers, skip_cache=False)
"queue": FAKE1["queue_name"],
"claim": FAKE1["id"],
}
headers = {
"Client-ID": "NEW_CLIENT_ID",
"X-PROJECT-ID": "NEW_PROJECT_ID",
}
sess.get.assert_called_with(url, headers=headers, skip_cache=False)
sess.get_project_id.assert_called_once_with()
sot._translate_response.assert_called_once_with(resp)
self.assertEqual(sot, res)
@ -157,11 +163,14 @@ class TestClaim(base.TestCase):
res = sot.fetch(sess)
url = "queues/%(queue)s/claims/%(claim)s" % {
"queue": FAKE2["queue_name"], "claim": FAKE2["id"]}
headers = {"Client-ID": "OLD_CLIENT_ID",
"X-PROJECT-ID": "OLD_PROJECT_ID"}
sess.get.assert_called_with(
url, headers=headers, skip_cache=False)
"queue": FAKE2["queue_name"],
"claim": FAKE2["id"],
}
headers = {
"Client-ID": "OLD_CLIENT_ID",
"X-PROJECT-ID": "OLD_PROJECT_ID",
}
sess.get.assert_called_with(url, headers=headers, skip_cache=False)
sot._translate_response.assert_called_once_with(resp)
self.assertEqual(sot, res)
@ -178,11 +187,14 @@ class TestClaim(base.TestCase):
res = sot.commit(sess)
url = "queues/%(queue)s/claims/%(claim)s" % {
"queue": FAKE.pop("queue_name"), "claim": FAKE["id"]}
headers = {"Client-ID": "NEW_CLIENT_ID",
"X-PROJECT-ID": "NEW_PROJECT_ID"}
sess.patch.assert_called_with(url,
headers=headers, json=FAKE)
"queue": FAKE.pop("queue_name"),
"claim": FAKE["id"],
}
headers = {
"Client-ID": "NEW_CLIENT_ID",
"X-PROJECT-ID": "NEW_PROJECT_ID",
}
sess.patch.assert_called_with(url, headers=headers, json=FAKE)
sess.get_project_id.assert_called_once_with()
self.assertEqual(sot, res)
@ -196,11 +208,14 @@ class TestClaim(base.TestCase):
res = sot.commit(sess)
url = "queues/%(queue)s/claims/%(claim)s" % {
"queue": FAKE.pop("queue_name"), "claim": FAKE["id"]}
headers = {"Client-ID": FAKE.pop("client_id"),
"X-PROJECT-ID": FAKE.pop("project_id")}
sess.patch.assert_called_with(url,
headers=headers, json=FAKE)
"queue": FAKE.pop("queue_name"),
"claim": FAKE["id"],
}
headers = {
"Client-ID": FAKE.pop("client_id"),
"X-PROJECT-ID": FAKE.pop("project_id"),
}
sess.patch.assert_called_with(url, headers=headers, json=FAKE)
self.assertEqual(sot, res)
@mock.patch.object(uuid, "uuid4")
@ -216,11 +231,14 @@ class TestClaim(base.TestCase):
sot.delete(sess)
url = "queues/%(queue)s/claims/%(claim)s" % {
"queue": FAKE1["queue_name"], "claim": FAKE1["id"]}
headers = {"Client-ID": "NEW_CLIENT_ID",
"X-PROJECT-ID": "NEW_PROJECT_ID"}
sess.delete.assert_called_with(url,
headers=headers)
"queue": FAKE1["queue_name"],
"claim": FAKE1["id"],
}
headers = {
"Client-ID": "NEW_CLIENT_ID",
"X-PROJECT-ID": "NEW_PROJECT_ID",
}
sess.delete.assert_called_with(url, headers=headers)
sess.get_project_id.assert_called_once_with()
sot._translate_response.assert_called_once_with(resp, has_body=False)
@ -234,9 +252,12 @@ class TestClaim(base.TestCase):
sot.delete(sess)
url = "queues/%(queue)s/claims/%(claim)s" % {
"queue": FAKE2["queue_name"], "claim": FAKE2["id"]}
headers = {"Client-ID": "OLD_CLIENT_ID",
"X-PROJECT-ID": "OLD_PROJECT_ID"}
sess.delete.assert_called_with(url,
headers=headers)
"queue": FAKE2["queue_name"],
"claim": FAKE2["id"],
}
headers = {
"Client-ID": "OLD_CLIENT_ID",
"X-PROJECT-ID": "OLD_PROJECT_ID",
}
sess.delete.assert_called_with(url, headers=headers)
sot._translate_response.assert_called_once_with(resp, has_body=False)

119
openstack/tests/unit/message/v2/test_message.py
View File

@ -21,12 +21,12 @@ FAKE1 = {
'body': {
'current_bytes': '0',
'event': 'BackupProgress',
'total_bytes': '99614720'
'total_bytes': '99614720',
},
'id': '578ee000508f153f256f717d',
'href': '/v2/queues/queue1/messages/578ee000508f153f256f717d',
'ttl': 3600,
'queue_name': 'queue1'
'queue_name': 'queue1',
}
@ -35,14 +35,14 @@ FAKE2 = {
'body': {
'current_bytes': '0',
'event': 'BackupProgress',
'total_bytes': '99614720'
'total_bytes': '99614720',
},
'id': '578ee000508f153f256f717d',
'href': '/v2/queues/queue1/messages/578ee000508f153f256f717d',
'ttl': 3600,
'queue_name': 'queue1',
'client_id': 'OLD_CLIENT_ID',
'project_id': 'OLD_PROJECT_ID'
'project_id': 'OLD_PROJECT_ID',
}
@ -80,25 +80,21 @@ class TestMessage(base.TestCase):
sess.get_project_id.return_value = 'NEW_PROJECT_ID'
mock_uuid.return_value = 'NEW_CLIENT_ID'
messages = [
{
'body': {'key': 'value1'},
'ttl': 3600
},
{
'body': {'key': 'value2'},
'ttl': 1800
}
{'body': {'key': 'value1'}, 'ttl': 3600},
{'body': {'key': 'value2'}, 'ttl': 1800},
]
sot = message.Message(**FAKE1)
res = sot.post(sess, messages)
url = '/queues/%(queue)s/messages' % {'queue': FAKE1['queue_name']}
headers = {'Client-ID': 'NEW_CLIENT_ID',
'X-PROJECT-ID': 'NEW_PROJECT_ID'}
sess.post.assert_called_once_with(url,
headers=headers,
json={'messages': messages})
headers = {
'Client-ID': 'NEW_CLIENT_ID',
'X-PROJECT-ID': 'NEW_PROJECT_ID',
}
sess.post.assert_called_once_with(
url, headers=headers, json={'messages': messages}
)
sess.get_project_id.assert_called_once_with()
resp.json.assert_called_once_with()
self.assertEqual(resources, res)
@ -113,25 +109,21 @@ class TestMessage(base.TestCase):
]
resp.json.return_value = {'resources': resources}
messages = [
{
'body': {'key': 'value1'},
'ttl': 3600
},
{
'body': {'key': 'value2'},
'ttl': 1800
}
{'body': {'key': 'value1'}, 'ttl': 3600},
{'body': {'key': 'value2'}, 'ttl': 1800},
]
sot = message.Message(**FAKE2)
res = sot.post(sess, messages)
url = '/queues/%(queue)s/messages' % {'queue': FAKE2['queue_name']}
headers = {'Client-ID': 'OLD_CLIENT_ID',
'X-PROJECT-ID': 'OLD_PROJECT_ID'}
sess.post.assert_called_once_with(url,
headers=headers,
json={'messages': messages})
headers = {
'Client-ID': 'OLD_CLIENT_ID',
'X-PROJECT-ID': 'OLD_PROJECT_ID',
}
sess.post.assert_called_once_with(
url, headers=headers, json={'messages': messages}
)
resp.json.assert_called_once_with()
self.assertEqual(resources, res)
@ -148,11 +140,14 @@ class TestMessage(base.TestCase):
res = sot.fetch(sess)
url = 'queues/%(queue)s/messages/%(message)s' % {
'queue': FAKE1['queue_name'], 'message': FAKE1['id']}
headers = {'Client-ID': 'NEW_CLIENT_ID',
'X-PROJECT-ID': 'NEW_PROJECT_ID'}
sess.get.assert_called_with(
url, headers=headers, skip_cache=False)
'queue': FAKE1['queue_name'],
'message': FAKE1['id'],
}
headers = {
'Client-ID': 'NEW_CLIENT_ID',
'X-PROJECT-ID': 'NEW_PROJECT_ID',
}
sess.get.assert_called_with(url, headers=headers, skip_cache=False)
sess.get_project_id.assert_called_once_with()
sot._translate_response.assert_called_once_with(resp)
self.assertEqual(sot, res)
@ -167,14 +162,17 @@ class TestMessage(base.TestCase):
res = sot.fetch(sess)
url = 'queues/%(queue)s/messages/%(message)s' % {
'queue': FAKE2['queue_name'], 'message': FAKE2['id']}
'queue': FAKE2['queue_name'],
'message': FAKE2['id'],
}
sot = message.Message(**FAKE2)
sot._translate_response = mock.Mock()
res = sot.fetch(sess)
headers = {'Client-ID': 'OLD_CLIENT_ID',
'X-PROJECT-ID': 'OLD_PROJECT_ID'}
sess.get.assert_called_with(
url, headers=headers, skip_cache=False)
headers = {
'Client-ID': 'OLD_CLIENT_ID',
'X-PROJECT-ID': 'OLD_PROJECT_ID',
}
sess.get.assert_called_with(url, headers=headers, skip_cache=False)
sot._translate_response.assert_called_once_with(resp)
self.assertEqual(sot, res)
@ -192,11 +190,14 @@ class TestMessage(base.TestCase):
sot.delete(sess)
url = 'queues/%(queue)s/messages/%(message)s' % {
'queue': FAKE1['queue_name'], 'message': FAKE1['id']}
headers = {'Client-ID': 'NEW_CLIENT_ID',
'X-PROJECT-ID': 'NEW_PROJECT_ID'}
sess.delete.assert_called_with(url,
headers=headers)
'queue': FAKE1['queue_name'],
'message': FAKE1['id'],
}
headers = {
'Client-ID': 'NEW_CLIENT_ID',
'X-PROJECT-ID': 'NEW_PROJECT_ID',
}
sess.delete.assert_called_with(url, headers=headers)
sess.get_project_id.assert_called_once_with()
sot._translate_response.assert_called_once_with(resp, has_body=False)
@ -214,12 +215,15 @@ class TestMessage(base.TestCase):
sot.delete(sess)
url = 'queues/%(queue)s/messages/%(message)s?claim_id=%(cid)s' % {
'queue': FAKE1['queue_name'], 'message': FAKE1['id'],
'cid': 'CLAIM_ID'}
headers = {'Client-ID': 'NEW_CLIENT_ID',
'X-PROJECT-ID': 'NEW_PROJECT_ID'}
sess.delete.assert_called_with(url,
headers=headers)
'queue': FAKE1['queue_name'],
'message': FAKE1['id'],
'cid': 'CLAIM_ID',
}
headers = {
'Client-ID': 'NEW_CLIENT_ID',
'X-PROJECT-ID': 'NEW_PROJECT_ID',
}
sess.delete.assert_called_with(url, headers=headers)
sess.get_project_id.assert_called_once_with()
sot._translate_response.assert_called_once_with(resp, has_body=False)
@ -234,9 +238,12 @@ class TestMessage(base.TestCase):
sot.delete(sess)
url = 'queues/%(queue)s/messages/%(message)s' % {
'queue': FAKE2['queue_name'], 'message': FAKE2['id']}
headers = {'Client-ID': 'OLD_CLIENT_ID',
'X-PROJECT-ID': 'OLD_PROJECT_ID'}
sess.delete.assert_called_with(url,
headers=headers)
'queue': FAKE2['queue_name'],
'message': FAKE2['id'],
}
headers = {
'Client-ID': 'OLD_CLIENT_ID',
'X-PROJECT-ID': 'OLD_PROJECT_ID',
}
sess.delete.assert_called_with(url, headers=headers)
sot._translate_response.assert_called_once_with(resp, has_body=False)

162
openstack/tests/unit/message/v2/test_proxy.py
View File

@ -36,8 +36,8 @@ class TestMessageQueue(TestMessageProxy):
def test_queue_get(self):
self.verify_get(self.proxy.get_queue, queue.Queue)
self.verify_get_overrided(
self.proxy, queue.Queue,
'openstack.message.v2.queue.Queue')
self.proxy, queue.Queue, 'openstack.message.v2.queue.Queue'
)
def test_queues(self):
self.verify_list(self.proxy.queues, queue.Queue)
@ -58,9 +58,11 @@ class TestMessageMessage(TestMessageProxy):
"openstack.message.v2.message.Message.post",
self.proxy.post_message,
method_args=["test_queue", ["msg1", "msg2"]],
expected_args=[self.proxy, ["msg1", "msg2"]])
mock_get_resource.assert_called_once_with(message.Message, None,
queue_name="test_queue")
expected_args=[self.proxy, ["msg1", "msg2"]],
)
mock_get_resource.assert_called_once_with(
message.Message, None, queue_name="test_queue"
)
@mock.patch.object(proxy_base.Proxy, '_get_resource')
def test_message_get(self, mock_get_resource):
@ -69,18 +71,22 @@ class TestMessageMessage(TestMessageProxy):
"openstack.proxy.Proxy._get",
self.proxy.get_message,
method_args=["test_queue", "resource_or_id"],
expected_args=[message.Message, "resource_or_id"])
mock_get_resource.assert_called_once_with(message.Message,
"resource_or_id",
queue_name="test_queue")
expected_args=[message.Message, "resource_or_id"],
)
mock_get_resource.assert_called_once_with(
message.Message, "resource_or_id", queue_name="test_queue"
)
self.verify_get_overrided(
self.proxy, message.Message,
'openstack.message.v2.message.Message')
self.proxy, message.Message, 'openstack.message.v2.message.Message'
)
def test_messages(self):
self.verify_list(self.proxy.messages, message.Message,
method_kwargs={"queue_name": "test_queue"},
expected_kwargs={"queue_name": "test_queue"})
self.verify_list(
self.proxy.messages,
message.Message,
method_kwargs={"queue_name": "test_queue"},
expected_kwargs={"queue_name": "test_queue"},
)
@mock.patch.object(proxy_base.Proxy, '_get_resource')
def test_message_delete(self, mock_get_resource):
@ -92,11 +98,12 @@ class TestMessageMessage(TestMessageProxy):
self.proxy.delete_message,
method_args=["test_queue", "resource_or_id", None, False],
expected_args=[message.Message, fake_message],
expected_kwargs={"ignore_missing": False})
expected_kwargs={"ignore_missing": False},
)
self.assertIsNone(fake_message.claim_id)
mock_get_resource.assert_called_once_with(message.Message,
"resource_or_id",
queue_name="test_queue")
mock_get_resource.assert_called_once_with(
message.Message, "resource_or_id", queue_name="test_queue"
)
@mock.patch.object(proxy_base.Proxy, '_get_resource')
def test_message_delete_claimed(self, mock_get_resource):
@ -108,11 +115,12 @@ class TestMessageMessage(TestMessageProxy):
self.proxy.delete_message,
method_args=["test_queue", "resource_or_id", "claim_id", False],
expected_args=[message.Message, fake_message],
expected_kwargs={"ignore_missing": False})
expected_kwargs={"ignore_missing": False},
)
self.assertEqual("claim_id", fake_message.claim_id)
mock_get_resource.assert_called_once_with(message.Message,
"resource_or_id",
queue_name="test_queue")
mock_get_resource.assert_called_once_with(
message.Message, "resource_or_id", queue_name="test_queue"
)
@mock.patch.object(proxy_base.Proxy, '_get_resource')
def test_message_delete_ignore(self, mock_get_resource):
@ -124,11 +132,12 @@ class TestMessageMessage(TestMessageProxy):
self.proxy.delete_message,
method_args=["test_queue", "resource_or_id", None, True],
expected_args=[message.Message, fake_message],
expected_kwargs={"ignore_missing": True})
expected_kwargs={"ignore_missing": True},
)
self.assertIsNone(fake_message.claim_id)
mock_get_resource.assert_called_once_with(message.Message,
"resource_or_id",
queue_name="test_queue")
mock_get_resource.assert_called_once_with(
message.Message, "resource_or_id", queue_name="test_queue"
)
class TestMessageSubscription(TestMessageProxy):
@ -138,7 +147,8 @@ class TestMessageSubscription(TestMessageProxy):
self.proxy.create_subscription,
method_args=["test_queue"],
expected_args=[self.proxy],
expected_kwargs={"base_path": None})
expected_kwargs={"base_path": None},
)
@mock.patch.object(proxy_base.Proxy, '_get_resource')
def test_subscription_get(self, mock_get_resource):
@ -147,42 +157,58 @@ class TestMessageSubscription(TestMessageProxy):
"openstack.proxy.Proxy._get",
self.proxy.get_subscription,
method_args=["test_queue", "resource_or_id"],
expected_args=[subscription.Subscription, "resource_or_id"])
expected_args=[subscription.Subscription, "resource_or_id"],
)
mock_get_resource.assert_called_once_with(
subscription.Subscription, "resource_or_id",
queue_name="test_queue")
subscription.Subscription,
"resource_or_id",
queue_name="test_queue",
)
self.verify_get_overrided(
self.proxy, subscription.Subscription,
'openstack.message.v2.subscription.Subscription')
self.proxy,
subscription.Subscription,
'openstack.message.v2.subscription.Subscription',
)
def test_subscriptions(self):
self.verify_list(self.proxy.subscriptions, subscription.Subscription,
method_kwargs={"queue_name": "test_queue"},
expected_kwargs={"queue_name": "test_queue"})
self.verify_list(
self.proxy.subscriptions,
subscription.Subscription,
method_kwargs={"queue_name": "test_queue"},
expected_kwargs={"queue_name": "test_queue"},
)
@mock.patch.object(proxy_base.Proxy, '_get_resource')
def test_subscription_delete(self, mock_get_resource):
mock_get_resource.return_value = "test_subscription"
self.verify_delete(self.proxy.delete_subscription,
subscription.Subscription,
ignore_missing=False,
method_args=["test_queue", "resource_or_id"],
expected_args=["test_subscription"])
self.verify_delete(
self.proxy.delete_subscription,
subscription.Subscription,
ignore_missing=False,
method_args=["test_queue", "resource_or_id"],
expected_args=["test_subscription"],
)
mock_get_resource.assert_called_once_with(
subscription.Subscription, "resource_or_id",
queue_name="test_queue")
subscription.Subscription,
"resource_or_id",
queue_name="test_queue",
)
@mock.patch.object(proxy_base.Proxy, '_get_resource')
def test_subscription_delete_ignore(self, mock_get_resource):
mock_get_resource.return_value = "test_subscription"
self.verify_delete(self.proxy.delete_subscription,
subscription.Subscription,
ignore_missing=True,
method_args=["test_queue", "resource_or_id"],
expected_args=["test_subscription"])
self.verify_delete(
self.proxy.delete_subscription,
subscription.Subscription,
ignore_missing=True,
method_args=["test_queue", "resource_or_id"],
expected_args=["test_subscription"],
)
mock_get_resource.assert_called_once_with(
subscription.Subscription, "resource_or_id",
queue_name="test_queue")
subscription.Subscription,
"resource_or_id",
queue_name="test_queue",
)
class TestMessageClaim(TestMessageProxy):
@ -192,7 +218,8 @@ class TestMessageClaim(TestMessageProxy):
self.proxy.create_claim,
method_args=["test_queue"],
expected_args=[self.proxy],
expected_kwargs={"base_path": None})
expected_kwargs={"base_path": None},
)
def test_claim_get(self):
self._verify(
@ -200,10 +227,11 @@ class TestMessageClaim(TestMessageProxy):
self.proxy.get_claim,
method_args=["test_queue", "resource_or_id"],
expected_args=[claim.Claim, "resource_or_id"],
expected_kwargs={"queue_name": "test_queue"})
expected_kwargs={"queue_name": "test_queue"},
)
self.verify_get_overrided(
self.proxy, claim.Claim,
'openstack.message.v2.claim.Claim')
self.proxy, claim.Claim, 'openstack.message.v2.claim.Claim'
)
def test_claim_update(self):
self._verify(
@ -212,17 +240,21 @@ class TestMessageClaim(TestMessageProxy):
method_args=["test_queue", "resource_or_id"],
method_kwargs={"k1": "v1"},
expected_args=[claim.Claim, "resource_or_id"],
expected_kwargs={"queue_name": "test_queue", "k1": "v1"})
expected_kwargs={"queue_name": "test_queue", "k1": "v1"},
)
def test_claim_delete(self):
self.verify_delete(self.proxy.delete_claim,
claim.Claim,
ignore_missing=False,
method_args=["test_queue", "test_claim"],
expected_args=["test_claim"],
expected_kwargs={
"queue_name": "test_queue",
"ignore_missing": False})
self.verify_delete(
self.proxy.delete_claim,
claim.Claim,
ignore_missing=False,
method_args=["test_queue", "test_claim"],
expected_args=["test_claim"],
expected_kwargs={
"queue_name": "test_queue",
"ignore_missing": False,
},
)
def test_claim_delete_ignore(self):
self.verify_delete(
@ -232,5 +264,7 @@ class TestMessageClaim(TestMessageProxy):
method_args=["test_queue", "test_claim"],
expected_args=["test_claim"],
expected_kwargs={
"queue_name": "test_queue", "ignore_missing": True,
})
"queue_name": "test_queue",
"ignore_missing": True,
},
)

68
openstack/tests/unit/message/v2/test_queue.py
View File

@ -20,7 +20,7 @@ FAKE1 = {
'name': 'test_queue',
'description': 'Queue used for test.',
'_default_message_ttl': 3600,
'_max_messages_post_size': 262144
'_max_messages_post_size': 262144,
}
@ -30,7 +30,7 @@ FAKE2 = {
'_default_message_ttl': 3600,
'_max_messages_post_size': 262144,
'client_id': 'OLD_CLIENT_ID',
'project_id': 'OLD_PROJECT_ID'
'project_id': 'OLD_PROJECT_ID',
}
@ -49,10 +49,12 @@ class TestQueue(base.TestCase):
self.assertEqual(FAKE1['description'], sot.description)
self.assertEqual(FAKE1['name'], sot.name)
self.assertEqual(FAKE1['name'], sot.id)
self.assertEqual(FAKE1['_default_message_ttl'],
sot.default_message_ttl)
self.assertEqual(FAKE1['_max_messages_post_size'],
sot.max_messages_post_size)
self.assertEqual(
FAKE1['_default_message_ttl'], sot.default_message_ttl
)
self.assertEqual(
FAKE1['_max_messages_post_size'], sot.max_messages_post_size
)
self.assertEqual(FAKE2['client_id'], sot.client_id)
self.assertEqual(FAKE2['project_id'], sot.project_id)
@ -69,10 +71,11 @@ class TestQueue(base.TestCase):
res = sot.create(sess)
url = 'queues/%s' % FAKE1['name']
headers = {'Client-ID': 'NEW_CLIENT_ID',
'X-PROJECT-ID': 'NEW_PROJECT_ID'}
sess.put.assert_called_with(url,
headers=headers, json=FAKE1)
headers = {
'Client-ID': 'NEW_CLIENT_ID',
'X-PROJECT-ID': 'NEW_PROJECT_ID',
}
sess.put.assert_called_with(url, headers=headers, json=FAKE1)
sess.get_project_id.assert_called_once_with()
sot._translate_response.assert_called_once_with(resp, has_body=False)
self.assertEqual(sot, res)
@ -87,10 +90,11 @@ class TestQueue(base.TestCase):
res = sot.create(sess)
url = 'queues/%s' % FAKE2['name']
headers = {'Client-ID': 'OLD_CLIENT_ID',
'X-PROJECT-ID': 'OLD_PROJECT_ID'}
sess.put.assert_called_with(url,
headers=headers, json=FAKE1)
headers = {
'Client-ID': 'OLD_CLIENT_ID',
'X-PROJECT-ID': 'OLD_PROJECT_ID',
}
sess.put.assert_called_with(url, headers=headers, json=FAKE1)
sot._translate_response.assert_called_once_with(resp, has_body=False)
self.assertEqual(sot, res)
@ -107,10 +111,11 @@ class TestQueue(base.TestCase):
res = sot.fetch(sess)
url = 'queues/%s' % FAKE1['name']
headers = {'Client-ID': 'NEW_CLIENT_ID',
'X-PROJECT-ID': 'NEW_PROJECT_ID'}
sess.get.assert_called_with(
url, headers=headers, skip_cache=False)
headers = {
'Client-ID': 'NEW_CLIENT_ID',
'X-PROJECT-ID': 'NEW_PROJECT_ID',
}
sess.get.assert_called_with(url, headers=headers, skip_cache=False)
sess.get_project_id.assert_called_once_with()
sot._translate_response.assert_called_once_with(resp)
self.assertEqual(sot, res)
@ -125,10 +130,11 @@ class TestQueue(base.TestCase):
res = sot.fetch(sess)
url = 'queues/%s' % FAKE2['name']
headers = {'Client-ID': 'OLD_CLIENT_ID',
'X-PROJECT-ID': 'OLD_PROJECT_ID'}