This adds a transport layer request spec class

The idea here is to be declarative i.e. specify *what* is desired.
It's up to the respective transport (e.g. http, zmq etc.) to turn a
request spec into an appropriate request.

The request spec class also performs some basic validation.  The
assumption is that the Marconi API is stable and known for a given
version. The API info for version 1 is thus captured in the code and
not read from the home document.

Nevertheless I have introduced a separate api_info() function that
allows us to source the API info from the home document at a later point.

Please note also that the `request.Spec` has a `headers` dict property
that can be used by the auth layer to inject auth tokens etc.

Change-Id: Ia72bfadcc84e7aba69aa5f32d76dfa0dc1083e0d
This commit is contained in:
Muharem Hrnjadovic
2013-09-20 11:09:22 +02:00
committed by Flavio Percoco
parent 00f6967899
commit 38e2dd0cf3
5 changed files with 170 additions and 0 deletions

View File

View File

@@ -0,0 +1,67 @@
# Copyright (c) 2013 Rackspace, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import collections
ApiInfo = collections.namedtuple('ApiInfo', 'mandatory optional')
_API_DATA = dict(
create_queue=ApiInfo(
mandatory=set(['queue_name']), optional=set()),
list_queues=ApiInfo(
mandatory=set(), optional=set(['marker', 'limit', 'detailed'])),
queue_exists=ApiInfo(mandatory=set(['queue_name']), optional=set()),
delete_queue=ApiInfo(mandatory=set(['queue_name']), optional=set()),
set_queue_metadata=ApiInfo(
mandatory=set(['queue_name', 'metadata']), optional=set()),
get_queue_metadata=ApiInfo(
mandatory=set(['queue_name']), optional=set()),
get_queue_stats=ApiInfo(mandatory=set(['queue_name']), optional=set()),
list_messages=ApiInfo(
mandatory=set(['queue_name']),
optional=set(['marker', 'limit', 'echo', 'include_claimed'])),
get_message=ApiInfo(
mandatory=set(['queue_name', 'message_id']),
optional=set(['claim_id'])),
get_messages_by_id=ApiInfo(
mandatory=set(['queue_name', 'message_ids']),
optional=set()),
post_messages=ApiInfo(
mandatory=set(['queue_name', 'messagedata']), optional=set()),
delete_message=ApiInfo(
mandatory=set(['queue_name', 'message_id']),
optional=set(['claim_id'])),
delete_messages_by_id=ApiInfo(
mandatory=set(['queue_name', 'message_ids']), optional=set()),
claim_messages=ApiInfo(
mandatory=set(['queue_name', 'ttl', 'grace_period']),
optional=set(['limit'])),
query_claim=ApiInfo(
mandatory=set(['queue_name', 'claim_id']), optional=set()),
update_claim=ApiInfo(
mandatory=set(['queue_name', 'claim_id', 'ttl']), optional=set()),
release_claim=ApiInfo(
mandatory=set(['queue_name', 'claim_id']), optional=set()),
)
def info():
"""A dict where the keys and values are valid operations and `ApiInfo`
named tuples respectively.
The `ApiInfo` named tuples have a `mandatory` and an `optional` property
that list the params for the respective operation.
"""
return _API_DATA.copy()

View File

View File

@@ -0,0 +1,55 @@
# Copyright (c) 2013 Rackspace, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from marconiclient.common import api
class Request(object):
"""General data for a Marconi request, passed to the transport layer.
The idea is to be declarative i.e. specify *what* is desired. It's up to
the respective transport to turn this into a layer-specific request.
"""
def __init__(self, endpoint='', operation='', params=None, headers=None):
self.endpoint = endpoint
self.operation = operation
self.params = params or {}
self.headers = headers or {}
def validate(self):
"""`None` if the request data is valid, an error message otherwise.
Checks the `operation` and the presence of the `params`.
"""
api_info_data = api.info()
if self.operation not in api_info_data:
return "Invalid operation '%s'" % self.operation
api_info = api_info_data[self.operation]
param_names = set() if not self.params else set(self.params.keys())
# NOTE(al-maisan) Do we have all the mandatory params?
if not api_info.mandatory.issubset(param_names):
missing = sorted(api_info.mandatory - param_names)
return "Missing mandatory params: '%s'" % ', '.join(missing)
# NOTE(al-maisan) Our params must be either in the mandatory or the
# optional subset.
all_permissible_params = api_info.mandatory.union(api_info.optional)
if not param_names.issubset(all_permissible_params):
invalid = sorted(param_names - all_permissible_params)
return "Invalid params: '%s'" % ', '.join(invalid)
return None

View File

@@ -0,0 +1,48 @@
# Copyright (c) 2013 Rackspace, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from marconiclient.tests import base
from marconiclient.transport import request
HREF = '/v1/queue/'
class TestRequest(base.TestBase):
def test_valid_operation(self):
req = request.Request(endpoint=HREF, operation='create_queue',
params=dict(queue_name='high_load'))
self.assertIs(None, req.validate())
def test_invalid_operation(self):
req = request.Request(endpoint=HREF, operation='jump_queue',
params=dict(name='high_load'))
self.assertEqual("Invalid operation 'jump_queue'", req.validate())
def test_missing_mandatory_param(self):
req = request.Request(endpoint=HREF, operation='get_message',
params=dict())
self.assertEqual("Missing mandatory params: 'message_id, queue_name'",
req.validate())
def test_missing_optional_param(self):
req = request.Request(endpoint=HREF, operation='delete_message',
params=dict(queue_name='abc', message_id='1'))
self.assertIs(None, req.validate())
def test_invalid__param(self):
req = request.Request(endpoint=HREF, operation='delete_queue',
params=dict(queue_name='xy', WAT='!?'))
self.assertEqual("Invalid params: 'WAT'", req.validate())