x/swift3
Code Issues Proposed changes

Register swift3 version in /info

Browse Source 
Change-Id: Id7d7704a25d920ee8f15c56aa0cc43142dcb5a9c
This commit is contained in:
Tim Burke 2016-03-31 12:49:06 -07:00
parent 3acb6eee11
commit e0ecc08d7c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift3/middleware.py
View File

@ -56,6 +56,7 @@ from paste.deploy import loadwsgi
from swift.common.wsgi import PipelineWrapper, loadcontext from swift.common.wsgi import PipelineWrapper, loadcontext
from swift3 import __version__ as swift3_version
from swift3.exception import NotS3Request from swift3.exception import NotS3Request
from swift3.request import Request, S3AclRequest from swift3.request import Request, S3AclRequest
from swift3.response import ErrorResponse, InternalError, MethodNotAllowed, \ from swift3.response import ErrorResponse, InternalError, MethodNotAllowed, \
@ -188,6 +189,7 @@ def filter_factory(global_conf, **local_conf):
max_upload_part_num=CONF['max_upload_part_num'], max_upload_part_num=CONF['max_upload_part_num'],
max_multi_delete_objects=CONF['max_multi_delete_objects'], max_multi_delete_objects=CONF['max_multi_delete_objects'],
allow_multipart_uploads=CONF['allow_multipart_uploads'], allow_multipart_uploads=CONF['allow_multipart_uploads'],
version=swift3_version,
) )
def swift3_filter(app): def swift3_filter(app):

3
swift3/test/unit/test_middleware.py
View File

@ -25,6 +25,7 @@ from md5 import md5
from swift.common import swob, utils from swift.common import swob, utils
from swift.common.swob import Request from swift.common.swob import Request
import swift3
from swift3.test.unit import Swift3TestCase from swift3.test.unit import Swift3TestCase
from swift3.request import Request as S3Request from swift3.request import Request as S3Request
from swift3.etree import fromstring from swift3.etree import fromstring
@ -368,6 +369,8 @@ class TestSwift3Middleware(Swift3TestCase):
filter_factory(CONF) filter_factory(CONF)
swift_info = utils.get_swift_info() swift_info = utils.get_swift_info()
self.assertTrue('swift3' in swift_info) self.assertTrue('swift3' in swift_info)
self.assertEqual(swift_info['swift3'].get('version'),
swift3.__version__)
self.assertEqual(swift_info['swift3'].get('max_bucket_listing'), self.assertEqual(swift_info['swift3'].get('max_bucket_listing'),
CONF.max_bucket_listing) CONF.max_bucket_listing)
self.assertEqual(swift_info['swift3'].get('max_parts_listing'), self.assertEqual(swift_info['swift3'].get('max_parts_listing'),