x/cloudcafe
Code Issues Proposed changes

Merge "Removed proxy_pipeline, in favor of just having enabled features."

Browse Source
This commit is contained in:
Jenkins
2013-11-13 15:39:32 +00:00
committed by Gerrit Code Review
parent 97da5e3c9f b79f6e3fa7
commit c2e5c781b2
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cloudcafe/objectstorage/objectstorage_api/config.py
View File

@@ -23,15 +23,12 @@ class ObjectStorageAPIConfig(ConfigSectionInterface):
ALL_FEATURES = '__ALL__'
NO_FEATURES = '__NONE__'
ASK_SWIFT_FOR_FEATURES = '__ASK__'
@property
def enabled_features(self):
return self.get('enabled_features', self.ALL_FEATURES)
@property
def proxy_pipeline(self):
return self.get('proxy_pipeline', self.ALL_FEATURES)
@property
def default_content_length(self):
return self.get('default_content_length')

12
configs/objectstorage/saio.config
View File

@@ -25,15 +25,9 @@ password=testing
# configurable through middleware. Tests docarated with
# ObjectStorageFixture.required_features will requilred all
# features in the tag to be listed here in order to be run.
# in addition to listing the features here, '__ALL__' and '__NONE__' can be
# provided to either run all features tests, or no features tests.
# in addition to listing the features here, '__ALL__', '__NONE__' and
# '__ASK__' can be provided to run all features tests, run no features
# tests or ask swift what features are configured and run only those.
enabled_features=__NONE__
# proxy_pipeline - used to specify which middleware tests to run. Tests
# decorated with ObjectStorageFixture.required_middleware will requilred all
# middleware in the tag to be listed here in order to be run. In addition to
# listing the middleware here, '__ALL__' can be provided to cause all
# middleware tests to be run.
proxy_pipeline=swift#healthcheck swift#memcache swift#tempauth swift#proxy_logging
tempurl_key_cache_time=60