diff --git a/cinder/api/contrib/hosts.py b/cinder/api/contrib/hosts.py index cf11395330e..69e8070e79c 100644 --- a/cinder/api/contrib/hosts.py +++ b/cinder/api/contrib/hosts.py @@ -138,7 +138,7 @@ def wrapped(self, req, id, service=None, *args, **kwargs): return wrapped -class HostController(object): +class HostController(wsgi.Controller): """The Hosts API controller for the OpenStack API.""" def __init__(self): self.api = volume_api.HostAPI() diff --git a/cinder/api/contrib/services.py b/cinder/api/contrib/services.py index a72ae30475e..d242e520998 100644 --- a/cinder/api/contrib/services.py +++ b/cinder/api/contrib/services.py @@ -65,7 +65,7 @@ def construct(self): return xmlutil.MasterTemplate(root, 1) -class ServiceController(object): +class ServiceController(wsgi.Controller): @wsgi.serializers(xml=ServicesIndexTemplate) def index(self, req): """Return a list of all running services. diff --git a/cinder/api/v1/limits.py b/cinder/api/v1/limits.py index aeac101ed13..de70243f985 100644 --- a/cinder/api/v1/limits.py +++ b/cinder/api/v1/limits.py @@ -75,7 +75,7 @@ def construct(self): return xmlutil.MasterTemplate(root, 1, nsmap=limits_nsmap) -class LimitsController(object): +class LimitsController(wsgi.Controller): """Controller for accessing limits in the OpenStack API.""" @wsgi.serializers(xml=LimitsTemplate) diff --git a/cinder/api/v1/snapshot_metadata.py b/cinder/api/v1/snapshot_metadata.py index c009fbba14c..87997aec413 100644 --- a/cinder/api/v1/snapshot_metadata.py +++ b/cinder/api/v1/snapshot_metadata.py @@ -24,7 +24,7 @@ from webob import exc -class Controller(object): +class Controller(wsgi.Controller): """The volume metadata API controller for the OpenStack API.""" def __init__(self): diff --git a/cinder/api/v1/volume_metadata.py b/cinder/api/v1/volume_metadata.py index 3e196d1147b..141bbba731f 100644 --- a/cinder/api/v1/volume_metadata.py +++ b/cinder/api/v1/volume_metadata.py @@ -24,7 +24,7 @@ from webob import exc -class Controller(object): +class Controller(wsgi.Controller): """The volume metadata API controller for the OpenStack API.""" def __init__(self): diff --git a/cinder/api/v2/limits.py b/cinder/api/v2/limits.py index face1038dbc..d8f17d424ac 100644 --- a/cinder/api/v2/limits.py +++ b/cinder/api/v2/limits.py @@ -74,7 +74,7 @@ def construct(self): return xmlutil.MasterTemplate(root, 1, nsmap=limits_nsmap) -class LimitsController(object): +class LimitsController(wsgi.Controller): """Controller for accessing limits in the OpenStack API.""" @wsgi.serializers(xml=LimitsTemplate) diff --git a/cinder/api/v2/snapshot_metadata.py b/cinder/api/v2/snapshot_metadata.py index c009fbba14c..87997aec413 100644 --- a/cinder/api/v2/snapshot_metadata.py +++ b/cinder/api/v2/snapshot_metadata.py @@ -24,7 +24,7 @@ from webob import exc -class Controller(object): +class Controller(wsgi.Controller): """The volume metadata API controller for the OpenStack API.""" def __init__(self): diff --git a/cinder/api/v2/volume_metadata.py b/cinder/api/v2/volume_metadata.py index b9449da0c81..cf8ef548b7f 100644 --- a/cinder/api/v2/volume_metadata.py +++ b/cinder/api/v2/volume_metadata.py @@ -23,7 +23,7 @@ from cinder import volume -class Controller(object): +class Controller(wsgi.Controller): """The volume metadata API controller for the OpenStack API.""" def __init__(self):