From 4e034f3d69c6aba6920dd7dd38e07aeb495b45db Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Thu, 6 Jan 2011 13:57:48 -0500 Subject: Remove module-level factory methods in favor of having a factory class-method on wsgi components themselves. Local options from config are passed to the __init__ method of the component as kwargs. --- etc/nova-api.conf | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'etc') diff --git a/etc/nova-api.conf b/etc/nova-api.conf index 59b21f387..43597b96d 100644 --- a/etc/nova-api.conf +++ b/etc/nova-api.conf @@ -26,30 +26,30 @@ pipeline = authenticate cloudrequest authorizer ec2executor pipeline = authenticate adminrequest authorizer ec2executor [filter:ec2lockout] -paste.filter_factory = nova.api.ec2:lockout_factory +paste.filter_factory = nova.api.ec2:Lockout.factory [filter:authenticate] -paste.filter_factory = nova.api.ec2:authenticate_factory +paste.filter_factory = nova.api.ec2:Authenticate.factory [filter:cloudrequest] controller = nova.api.ec2.cloud.CloudController -paste.filter_factory = nova.api.ec2:requestify_factory +paste.filter_factory = nova.api.ec2:Requestify.factory [filter:adminrequest] controller = nova.api.ec2.admin.AdminController -paste.filter_factory = nova.api.ec2:requestify_factory +paste.filter_factory = nova.api.ec2:Requestify.factory [filter:authorizer] -paste.filter_factory = nova.api.ec2:authorizer_factory +paste.filter_factory = nova.api.ec2:Authorizer.factory [app:ec2executor] -paste.app_factory = nova.api.ec2:executor_factory +paste.app_factory = nova.api.ec2:Executor.factory [app:ec2versions] -paste.app_factory = nova.api.ec2:versions_factory +paste.app_factory = nova.api.ec2:Versions.factory [app:ec2metadata] -paste.app_factory = nova.api.ec2.metadatarequesthandler:metadata_factory +paste.app_factory = nova.api.ec2.metadatarequesthandler:MetadataRequestHandler.factory ############# # Openstack # @@ -64,19 +64,19 @@ use = egg:Paste#urlmap pipeline = faultwrap auth ratelimit osapi [filter:faultwrap] -paste.filter_factory = nova.api.openstack:fault_wrapper_factory +paste.filter_factory = nova.api.openstack:FaultWrapper.factory [filter:auth] -paste.filter_factory = nova.api.openstack.auth:auth_factory +paste.filter_factory = nova.api.openstack.auth:AuthMiddleware.factory [filter:ratelimit] -paste.filter_factory = nova.api.openstack.ratelimiting:ratelimit_factory +paste.filter_factory = nova.api.openstack.ratelimiting:RateLimitingMiddleware.factory [app:osapi] -paste.app_factory = nova.api.openstack:router_factory +paste.app_factory = nova.api.openstack:APIRouter.factory [pipeline:osversions] pipeline = faultwrap osversionapp [app:osversionapp] -paste.app_factory = nova.api.openstack:versions_factory +paste.app_factory = nova.api.openstack:Versions.factory -- cgit