72f5f0485a
The scheduler API 'get_pools' was copied from Cinder and has several problems. The REST endpoint, /scheduler-stats/get_pools, is not a REST-appropriate name. The API allows filtering but filters are not currently supported by the Manila scheduler. The API was added as an extension, not part of the v1 API as it should be. After restarting the scheduler service, the API doesn't return any data until a share has been created (Cinder was used as a model for fixing this one). This patch fixes all of these issues. Closes-Bug: #1422042 Change-Id: I7e32efb5390fd4b0a62f644ca5a12dcad14d8a9b
124 lines
5.1 KiB
Python
124 lines
5.1 KiB
Python
# Copyright 2011 OpenStack LLC.
|
|
# Copyright 2011 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""
|
|
WSGI middleware for OpenStack Share API.
|
|
"""
|
|
|
|
from oslo_log import log
|
|
|
|
from manila.api import extensions
|
|
import manila.api.openstack
|
|
from manila.api.v1 import limits
|
|
from manila.api.v1 import scheduler_stats
|
|
from manila.api.v1 import security_service
|
|
from manila.api.v1 import share_metadata
|
|
from manila.api.v1 import share_networks
|
|
from manila.api.v1 import share_servers
|
|
from manila.api.v1 import share_snapshots
|
|
from manila.api.v1 import share_types
|
|
from manila.api.v1 import shares
|
|
from manila.api import versions
|
|
|
|
LOG = log.getLogger(__name__)
|
|
|
|
|
|
class APIRouter(manila.api.openstack.APIRouter):
|
|
"""Route API requests.
|
|
|
|
Routes requests on the OpenStack API to the appropriate controller
|
|
and method.
|
|
"""
|
|
ExtensionManager = extensions.ExtensionManager
|
|
|
|
def _setup_routes(self, mapper, ext_mgr):
|
|
self.resources['versions'] = versions.create_resource()
|
|
mapper.connect("versions", "/",
|
|
controller=self.resources['versions'],
|
|
action='show')
|
|
|
|
mapper.redirect("", "/")
|
|
|
|
self.resources['shares'] = shares.create_resource()
|
|
mapper.resource("share", "shares",
|
|
controller=self.resources['shares'],
|
|
collection={'detail': 'GET'},
|
|
member={'action': 'POST'})
|
|
|
|
self.resources['snapshots'] = share_snapshots.create_resource()
|
|
mapper.resource("snapshot", "snapshots",
|
|
controller=self.resources['snapshots'],
|
|
collection={'detail': 'GET'},
|
|
member={'action': 'POST'})
|
|
|
|
self.resources['share_metadata'] = share_metadata.create_resource()
|
|
share_metadata_controller = self.resources['share_metadata']
|
|
|
|
mapper.resource("share_metadata", "metadata",
|
|
controller=share_metadata_controller,
|
|
parent_resource=dict(member_name='share',
|
|
collection_name='shares'))
|
|
|
|
mapper.connect("metadata",
|
|
"/{project_id}/shares/{share_id}/metadata",
|
|
controller=share_metadata_controller,
|
|
action='update_all',
|
|
conditions={"method": ['PUT']})
|
|
|
|
self.resources['limits'] = limits.create_resource()
|
|
mapper.resource("limit", "limits",
|
|
controller=self.resources['limits'])
|
|
|
|
self.resources["security_services"] = \
|
|
security_service.create_resource()
|
|
mapper.resource("security-service", "security-services",
|
|
controller=self.resources['security_services'],
|
|
collection={'detail': 'GET'})
|
|
|
|
self.resources['share_networks'] = share_networks.create_resource()
|
|
mapper.resource(share_networks.RESOURCE_NAME,
|
|
'share-networks',
|
|
controller=self.resources['share_networks'],
|
|
collection={'detail': 'GET'},
|
|
member={'action': 'POST'})
|
|
|
|
self.resources['share_servers'] = share_servers.create_resource()
|
|
mapper.resource(share_servers.RESOURCE_NAME,
|
|
'share-servers',
|
|
controller=self.resources['share_servers'])
|
|
mapper.connect('details',
|
|
'/{project_id}/share-servers/{id}/details',
|
|
controller=self.resources['share_servers'],
|
|
action='details',
|
|
conditions={"method": ['GET']})
|
|
|
|
self.resources['types'] = share_types.create_resource()
|
|
mapper.resource("type", "types",
|
|
controller=self.resources['types'],
|
|
collection={'detail': 'GET', 'default': 'GET'},
|
|
member={'action': 'POST'})
|
|
|
|
self.resources['scheduler_stats'] = scheduler_stats.create_resource()
|
|
mapper.connect('pools', '/{project_id}/scheduler-stats/pools',
|
|
controller=self.resources['scheduler_stats'],
|
|
action='pools_index',
|
|
conditions={'method': ['GET']})
|
|
mapper.connect('pools', '/{project_id}/scheduler-stats/pools/detail',
|
|
controller=self.resources['scheduler_stats'],
|
|
action='pools_detail',
|
|
conditions={'method': ['GET']})
|