From b79f6e3fa7f42a01ff1bc827d8290f1111ffa25f Mon Sep 17 00:00:00 2001 From: "Richard (Rick) Hawkins" Date: Wed, 13 Nov 2013 08:05:18 -0600 Subject: [PATCH] Removed proxy_pipeline, in favor of just having enabled features. Change-Id: I660c24e4800cb837505dd8559334ee4174ca7286 --- cloudcafe/objectstorage/objectstorage_api/config.py | 5 +---- configs/objectstorage/saio.config | 12 +++--------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/cloudcafe/objectstorage/objectstorage_api/config.py b/cloudcafe/objectstorage/objectstorage_api/config.py index ab8d95da..f926fdb2 100644 --- a/cloudcafe/objectstorage/objectstorage_api/config.py +++ b/cloudcafe/objectstorage/objectstorage_api/config.py @@ -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') diff --git a/configs/objectstorage/saio.config b/configs/objectstorage/saio.config index 798c20af..5b5a9e50 100644 --- a/configs/objectstorage/saio.config +++ b/configs/objectstorage/saio.config @@ -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