
This is a large and invasive change to the underlying guts. Most casual use should not notice a difference, but advanced users, especially those using the Profile or Authenticator interfaces or making use of pluggable providers will be broken. The overall intent is to align directly on top of the mechanisms that came from os-client-config for config and to use keystoneauth1's Adapter interface to make use of the canonical implementations of such things as service and version discovery. The end goal is that openstacksdk provides the REST interaction layer for python-openstackclient, shade, Ansible and nodepool. Replace profile with openstack.config os-client-config is used by shade and python-openstackclient to read and process configuration. openstacksdk also can use the os-client-config interface, but translates it internally into the Profile object. As os-client-config has been injested into openstack.config, remove Profile and just use the config classes. Make proxy subclass of adapter This gives every service a generic passthrough for REST calls, which means we can map unknown service-type values to a generic proxy. Strip endpoint_filter We're passing Adapters around, not sessions. Doing so means that self.service and endpoint_filter have become unnecessary. Rename _Request.uri to _Request.url This is a stepping-stone to replacing _Request with requests.Request and using requests.Session.prepare_request inside of _prepare_request. Rename service proxy instances to match their official service-type. Aliases are kept for the old versions, but make the canonical versions match the official name. Rename bare_metal to baremetal Rename cluster to clustering Rename block_store to block_storage Rename telemetry to meter Create generic proxies for all services in STA Every service listed in service types authority is an OpenStack service. Even if we don't know about it in SDK, we should at the very least have a low-level Adapter for it so that people can use REST calls while waiting on the SDK to add higher-level constructs. The pypy jobs are happily green. Run them as voting rather than non-voting. Add syntatic sugar alias for making connections Typing: import openstack.connection conn = openstack.connection.Connection(cloud='example') is annoying. This allows: import openstack conn = openstack.connect(cloud='example') Use task_manager and Adapter from shade As a stepping-stone towards shade and sdk codepaths being rationalized, we need to get SDK using the Adapter from shade that submits requests into the TaskManager. For normal operation this is a passthrough/no-op sort of thing, but it's essential for high-volume consumers such as nodepool. This exposes a bunch of places in tests where we're mocking a bit too deeply. We should go back through and fix all of those via requests_mock, but that's WAY too much for today. This was a 'for later' task, but it turns out that the move to Adapter was causing exceptions to be thrown that were not the exceptions that were intended to be caught in the SDK layer, which was causing functional tests of things like GET operations to fail. So it became a today task. Change-Id: I7b46e263a76d84573bdfbbece57b1048764ed939
108 lines
3.6 KiB
Python
108 lines
3.6 KiB
Python
# 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 six.moves.urllib import parse
|
|
|
|
from openstack.message import message_service
|
|
from openstack import resource
|
|
|
|
|
|
class Message(resource.Resource):
|
|
resources_key = 'messages'
|
|
base_path = "/queues/%(queue_name)s/messages"
|
|
service = message_service.MessageService()
|
|
|
|
# capabilities
|
|
allow_create = True
|
|
allow_list = False
|
|
allow_retrieve = False
|
|
allow_delete = False
|
|
|
|
#: A ID for each client instance. The ID must be submitted in its
|
|
#: canonical form (for example, 3381af92-2b9e-11e3-b191-71861300734c).
|
|
#: The client generates this ID once. The client ID persists between
|
|
#: restarts of the client so the client should reuse that same ID.
|
|
#: All message-related operations require the use of the client ID in
|
|
#: the headers to ensure that messages are not echoed back to the client
|
|
#: that posted them, unless the client explicitly requests this.
|
|
client_id = None
|
|
|
|
#: The name of the queue this Message belongs to.
|
|
queue_name = None
|
|
|
|
#: A relative href that references this Message.
|
|
href = resource.prop("href")
|
|
|
|
#: An arbitrary JSON document that constitutes the body of the message
|
|
#: being sent.
|
|
body = resource.prop("body")
|
|
|
|
#: Specifies how long the server waits, in seconds, before marking the
|
|
#: message as expired and removing it from the queue.
|
|
ttl = resource.prop("ttl")
|
|
|
|
#: Specifies how long the message has been in the queue, in seconds.
|
|
age = resource.prop("age")
|
|
|
|
@classmethod
|
|
def create_messages(cls, session, messages):
|
|
if len(messages) == 0:
|
|
raise ValueError('messages cannot be empty')
|
|
|
|
for i, message in enumerate(messages, -1):
|
|
if message.queue_name != messages[i].queue_name:
|
|
raise ValueError('All queues in messages must be equal')
|
|
if message.client_id != messages[i].client_id:
|
|
raise ValueError('All clients in messages must be equal')
|
|
|
|
url = cls._get_url({'queue_name': messages[0].queue_name})
|
|
headers = {'Client-ID': messages[0].client_id}
|
|
|
|
resp = session.post(url, headers=headers,
|
|
data=json.dumps(messages, cls=MessageEncoder))
|
|
resp = resp.json()
|
|
|
|
messages_created = []
|
|
hrefs = resp['resources']
|
|
|
|
for i, href in enumerate(hrefs):
|
|
message = Message.existing(**messages[i])
|
|
message.href = href
|
|
messages_created.append(message)
|
|
|
|
return messages_created
|
|
|
|
@classmethod
|
|
def _strip_version(cls, href):
|
|
path = parse.urlparse(href).path
|
|
|
|
if path.startswith('/v'):
|
|
return href[href.find('/', 1):]
|
|
else:
|
|
return href
|
|
|
|
@classmethod
|
|
def delete_by_id(cls, session, message, path_args=None):
|
|
url = cls._strip_version(message.href)
|
|
headers = {
|
|
'Client-ID': message.client_id,
|
|
'Accept': '',
|
|
}
|
|
session.delete(url, headers=headers)
|
|
|
|
|
|
class MessageEncoder(json.JSONEncoder):
|
|
def default(self, message):
|
|
return {'body': message.body, 'ttl': message.ttl}
|