f6c321dd8b
This patch refines the interface and storage implementation defined in the last patch and integrates it with the transport layer. A few updates have been made: - 'name' -> 'href' for listing shards - limiting, markers, and detailed are all used - use of common_utils.fields to clean up shards transport PATCH - add missing init for schemas - fix schema issues found: 'location' -> 'uri', __init__.py - shard resource correctly implements PUT semantics (replaces) Transport: the admin API concept has been expanded to include functionality from the public interface *in addition* to admin functionality. Part of the rationale behind this is to simplify unit testing. The other part of this is that an admin should be able to do everything a normal user can do in addition to their special functions. Storage: now divided into control and data plane. The bootstrap passes a control driver down to the transport which *can* be used for endpoints as needed. A test suite has been added that exercises the functionality from the transport side of the shard registry resource. Finally, the way the FaultyStorage driver tests were handled was changed. Something about the setattr magic in that suite's setup made it such that *all* tests would use the Faulty storage driver. This is possibly related to the use of lazy_property decorators. To address this issue, this patch promotes the faulty storage driver to setup.cfg visibility and removes the setattrs. Change-Id: I5b8cdb3a11d29422762b52f1e15e33167eecb867 Partitally-implements: blueprint storage-sharding Partially-Closes: 1241686 Closes-Bug: 1243898
61 lines
1.8 KiB
Python
61 lines
1.8 KiB
Python
# Copyright (c) 2013 Rackspace Hosting, 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.
|
|
|
|
"""shards: JSON schema for marconi-queues shards resources."""
|
|
|
|
# NOTE(cpp-cabrera): options can be anything. These will be unique to
|
|
# each storage driver, so we don't perform any further validation at
|
|
# the transport layer.
|
|
patch_options = {
|
|
'type': 'object', 'properties': {
|
|
'options': {
|
|
'type': 'object'
|
|
}
|
|
}
|
|
}
|
|
|
|
# NOTE(cpp-cabrera): a string valid for use in a URI
|
|
# TODO(cpp-cabrera): perhaps validate this further using jsonschema's
|
|
# uri validator as per rfc3987
|
|
patch_uri = {
|
|
'type': 'object', 'properties': {
|
|
'uri': {
|
|
'type': 'string'
|
|
},
|
|
'additionalProperties': False
|
|
}
|
|
}
|
|
|
|
patch_weight = {
|
|
'type': 'object', 'properties': {
|
|
'weight': {
|
|
'type': 'integer', 'minimum': 0, 'maximum': 2**32 - 1
|
|
},
|
|
'additionalProperties': False
|
|
}
|
|
}
|
|
|
|
create = {
|
|
'type': 'object', 'properties': {
|
|
'weight': patch_weight['properties']['weight'],
|
|
'uri': patch_uri['properties']['uri'],
|
|
'options': patch_options['properties']['options']
|
|
},
|
|
# NOTE(cpp-cabrera): options need not be present. Storage drivers
|
|
# must provide reasonable defaults.
|
|
'required': ['uri', 'weight'],
|
|
'additionalProperties': False
|
|
}
|