b291641985
The new DiskDir unit test skeleton is quite incomplete, but gets the DiskDir module on the board for modules covered, explicitly exposing the fact that we need to get test coverage. This is a first step. At the same time, we also update all the modules we have applying the fix for pep8 errors now run under tox. We can then add a Jenkins pre-commit job to fail on pep8 errors. This brings our code to parity with what they are doing in OpenStack Swift. Change-Id: Ia0565606512efda6e73f67bd00269177b89db858 Signed-off-by: Peter Portante <peter.portante@redhat.com> Reviewed-on: http://review.gluster.org/5080 Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com>
99 lines
3.4 KiB
Python
99 lines
3.4 KiB
Python
# Copyright (c) 2012 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.
|
|
|
|
try:
|
|
from webob.exc import HTTPBadRequest
|
|
except ImportError:
|
|
from swift.common.swob import HTTPBadRequest
|
|
import swift.common.constraints
|
|
import swift.common.ring as _ring
|
|
from gluster.swift.common import Glusterfs, ring
|
|
|
|
if hasattr(swift.common.constraints, 'constraints_conf_int'):
|
|
MAX_OBJECT_NAME_COMPONENT_LENGTH = \
|
|
swift.common.constraints.constraints_conf_int(
|
|
'max_object_name_component_length', 255)
|
|
else:
|
|
MAX_OBJECT_NAME_COMPONENT_LENGTH = 255
|
|
|
|
|
|
def validate_obj_name_component(obj):
|
|
if len(obj) > MAX_OBJECT_NAME_COMPONENT_LENGTH:
|
|
return 'too long (%d)' % len(obj)
|
|
if obj == '.' or obj == '..':
|
|
return 'cannot be . or ..'
|
|
return ''
|
|
|
|
# Save the original check object creation
|
|
__check_object_creation = swift.common.constraints.check_object_creation
|
|
|
|
|
|
# Define our new one which invokes the original
|
|
def gluster_check_object_creation(req, object_name):
|
|
"""
|
|
Check to ensure that everything is alright about an object to be created.
|
|
Monkey patches swift.common.constraints.check_object_creation, invoking
|
|
the original, and then adding an additional check for individual object
|
|
name components.
|
|
|
|
:param req: HTTP request object
|
|
:param object_name: name of object to be created
|
|
:raises HTTPRequestEntityTooLarge: the object is too large
|
|
:raises HTTPLengthRequered: missing content-length header and not
|
|
a chunked request
|
|
:raises HTTPBadRequest: missing or bad content-type header, or
|
|
bad metadata
|
|
"""
|
|
ret = __check_object_creation(req, object_name)
|
|
|
|
if ret is None:
|
|
for obj in object_name.split('/'):
|
|
reason = validate_obj_name_component(obj)
|
|
if reason:
|
|
bdy = 'Invalid object name "%s", component "%s" %s' \
|
|
% (object_name, obj, reason)
|
|
ret = HTTPBadRequest(body=bdy,
|
|
request=req,
|
|
content_type='text/plain')
|
|
|
|
return ret
|
|
|
|
# Replace the original check object creation with ours
|
|
swift.common.constraints.check_object_creation = gluster_check_object_creation
|
|
|
|
# Save the original check mount
|
|
__check_mount = swift.common.constraints.check_mount
|
|
|
|
|
|
# Define our new one which invokes the original
|
|
def gluster_check_mount(root, drive):
|
|
# FIXME: Potential performance optimization here to not call the original
|
|
# check mount which makes two stat calls. We could do what they do with
|
|
# just one.
|
|
if __check_mount(root, drive):
|
|
return True
|
|
|
|
return Glusterfs.mount(root, drive)
|
|
|
|
|
|
# Replace the original check mount with ours
|
|
swift.common.constraints.check_mount = gluster_check_mount
|
|
|
|
# Save the original Ring class
|
|
__Ring = _ring.Ring
|
|
|
|
# Replace the original Ring class
|
|
_ring.Ring = ring.Ring
|