Merge "[Trivialfix] Remove the useless parameter 'ext_mgr'"
This commit is contained in:
commit
8161931e6e
|
@ -70,7 +70,7 @@ class APIRouter(base_wsgi.Router):
|
|||
|
||||
mapper = ProjectMapper()
|
||||
self.resources = {}
|
||||
self._setup_routes(mapper, ext_mgr)
|
||||
self._setup_routes(mapper)
|
||||
self._setup_ext_routes(mapper, ext_mgr)
|
||||
self._setup_extensions(ext_mgr)
|
||||
super(APIRouter, self).__init__(mapper)
|
||||
|
@ -115,5 +115,5 @@ class APIRouter(base_wsgi.Router):
|
|||
resource.register_actions(controller)
|
||||
resource.register_extensions(controller)
|
||||
|
||||
def _setup_routes(self, mapper, ext_mgr):
|
||||
def _setup_routes(self, mapper):
|
||||
raise NotImplementedError
|
||||
|
|
|
@ -48,7 +48,7 @@ class APIRouter(manila.api.openstack.APIRouter):
|
|||
"""
|
||||
ExtensionManager = extensions.ExtensionManager
|
||||
|
||||
def _setup_routes(self, mapper, ext_mgr):
|
||||
def _setup_routes(self, mapper):
|
||||
self.resources['versions'] = versions.create_resource()
|
||||
mapper.connect("versions", "/",
|
||||
controller=self.resources['versions'],
|
||||
|
|
|
@ -61,7 +61,7 @@ class APIRouter(manila.api.openstack.APIRouter):
|
|||
"""
|
||||
ExtensionManager = extensions.ExtensionManager
|
||||
|
||||
def _setup_routes(self, mapper, ext_mgr):
|
||||
def _setup_routes(self, mapper):
|
||||
self.resources["versions"] = versions.create_resource()
|
||||
mapper.connect("versions", "/",
|
||||
controller=self.resources["versions"],
|
||||
|
|
|
@ -64,7 +64,7 @@ class VersionsRouter(openstack.APIRouter):
|
|||
|
||||
ExtensionManager = extensions.ExtensionManager
|
||||
|
||||
def _setup_routes(self, mapper, ext_mgr):
|
||||
def _setup_routes(self, mapper):
|
||||
self.resources['versions'] = create_resource()
|
||||
mapper.connect('versions', '/',
|
||||
controller=self.resources['versions'],
|
||||
|
|
Loading…
Reference in New Issue