d1a0c1f405
Client libraries shouldn't depend on specific configuration libraries, since that will make it difficult for other applications to adopt the library. This patch replaces all oslo.config usages with dictionaries. The client will use those as options holders and all parameters are considered optional. Notice that `options` was preferred instead of `**options` since this dictionary is considered a 'config object' and not a set of optional parameters. This will make it easier for applications using marconiclient to hold a single, mutable instance of options to pass around. Partially-Implements blueprint python-marconiclient-v1 Change-Id: Ib41f2957689545f05dab19338842fd9a953f2f76
97 lines
3.3 KiB
Python
97 lines
3.3 KiB
Python
# Copyright (c) 2013 Red Hat, 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 json
|
|
|
|
from marconiclient.common import http
|
|
from marconiclient.transport import base
|
|
# NOTE(flaper87): Something is completely borked
|
|
# with some imports. Using `from ... import errors`
|
|
# will end up importing `marconiclient.errors` instead
|
|
# of transports
|
|
import marconiclient.transport.errors as errors
|
|
from marconiclient.transport import response
|
|
|
|
|
|
class HttpTransport(base.Transport):
|
|
|
|
http_to_marconi = {
|
|
400: errors.MalformedRequest,
|
|
404: errors.ResourceNotFound,
|
|
}
|
|
|
|
def __init__(self, options):
|
|
super(HttpTransport, self).__init__(options)
|
|
self.client = http.Client()
|
|
|
|
def _prepare(self, request):
|
|
if not request.api:
|
|
return request.endpoint, 'GET', request
|
|
|
|
# TODO(flaper87): Validate if the user
|
|
# explicitly wants so. Validation must
|
|
# happen before any other operation here.
|
|
# request.validate()
|
|
|
|
schema = request.api.get_schema(request.operation)
|
|
ref = schema.get('ref', '')
|
|
ref_params = {}
|
|
|
|
for param in list(request.params.keys()):
|
|
if '{{{0}}}'.format(param) in ref:
|
|
value = request.params.pop(param)
|
|
|
|
# NOTE(flaper87): Marconi API parses
|
|
# sequences encoded as '1,2,3,4'. Let's
|
|
# encode lists, tuples and sets before
|
|
# sending them to the server.
|
|
if isinstance(value, (list, tuple, set)):
|
|
value = ','.join(value)
|
|
|
|
ref_params[param] = value
|
|
|
|
url = '{0}/{1}'.format(request.endpoint.rstrip('/'),
|
|
ref.format(**ref_params))
|
|
return url, schema.get('method', 'GET'), request
|
|
|
|
def send(self, request):
|
|
url, method, request = self._prepare(request)
|
|
|
|
# NOTE(flape87): Do not modify
|
|
# request's headers directly.
|
|
headers = request.headers.copy()
|
|
headers['content-type'] = 'application/json'
|
|
|
|
resp = self.client.request(method,
|
|
url=url,
|
|
params=request.params,
|
|
headers=headers,
|
|
data=request.content)
|
|
|
|
if resp.status_code in self.http_to_marconi:
|
|
try:
|
|
msg = json.loads(resp.text)['description']
|
|
except Exception:
|
|
# TODO(flaper87): Log this exception
|
|
# but don't stop raising the corresponding
|
|
# exception
|
|
msg = ''
|
|
raise self.http_to_marconi[resp.status_code](msg)
|
|
|
|
# NOTE(flaper87): This reads the whole content
|
|
# and will consume any attempt of streaming.
|
|
return response.Response(request, resp.text,
|
|
headers=resp.headers)
|