bf76eb2522
There is no strict boolean checking for the parameter "detail" of API /scheduler-states/get_pools, so that any invalid boolean value can be specified. This patch adds a strict checking for it to prevent invalid value, and adds a test for this change as well. Change-Id: Ic24850e5a0e206548de81529179cd182d9eabb7f Partial-Bug: #1594261
124 lines
4.4 KiB
Python
124 lines
4.4 KiB
Python
# Copyright 2013 eBay Inc.
|
|
# Copyright 2013 OpenStack Foundation
|
|
# 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.
|
|
|
|
import mock
|
|
|
|
from cinder.api.contrib import scheduler_stats
|
|
from cinder import context
|
|
from cinder import exception
|
|
from cinder import test
|
|
from cinder.tests.unit.api import fakes
|
|
from cinder.tests.unit import fake_constants as fake
|
|
|
|
|
|
def schedule_rpcapi_get_pools(self, context, filters=None):
|
|
all_pools = []
|
|
pool1 = dict(name='pool1',
|
|
capabilities=dict(
|
|
total_capacity=1024, free_capacity=100,
|
|
volume_backend_name='pool1', reserved_percentage=0,
|
|
driver_version='1.0.0', storage_protocol='iSCSI',
|
|
QoS_support='False', updated=None))
|
|
all_pools.append(pool1)
|
|
pool2 = dict(name='pool2',
|
|
capabilities=dict(
|
|
total_capacity=512, free_capacity=200,
|
|
volume_backend_name='pool2', reserved_percentage=0,
|
|
driver_version='1.0.1', storage_protocol='iSER',
|
|
QoS_support='True', updated=None))
|
|
all_pools.append(pool2)
|
|
|
|
return all_pools
|
|
|
|
|
|
@mock.patch('cinder.scheduler.rpcapi.SchedulerAPI.get_pools',
|
|
schedule_rpcapi_get_pools)
|
|
class SchedulerStatsAPITest(test.TestCase):
|
|
def setUp(self):
|
|
super(SchedulerStatsAPITest, self).setUp()
|
|
self.flags(host='fake')
|
|
self.controller = scheduler_stats.SchedulerStatsController()
|
|
self.ctxt = context.RequestContext(fake.USER_ID, fake.PROJECT_ID, True)
|
|
|
|
def test_get_pools_summery(self):
|
|
req = fakes.HTTPRequest.blank('/v2/%s/scheduler_stats' %
|
|
fake.PROJECT_ID)
|
|
req.environ['cinder.context'] = self.ctxt
|
|
res = self.controller.get_pools(req)
|
|
|
|
self.assertEqual(2, len(res['pools']))
|
|
|
|
expected = {
|
|
'pools': [
|
|
{
|
|
'name': 'pool1',
|
|
},
|
|
{
|
|
'name': 'pool2',
|
|
}
|
|
]
|
|
}
|
|
|
|
self.assertDictMatch(expected, res)
|
|
|
|
def test_get_pools_detail(self):
|
|
req = fakes.HTTPRequest.blank('/v2/%s/scheduler_stats?detail=True' %
|
|
fake.PROJECT_ID)
|
|
req.environ['cinder.context'] = self.ctxt
|
|
res = self.controller.get_pools(req)
|
|
|
|
self.assertEqual(2, len(res['pools']))
|
|
|
|
expected = {
|
|
'pools': [
|
|
{
|
|
'name': 'pool1',
|
|
'capabilities': {
|
|
'updated': None,
|
|
'total_capacity': 1024,
|
|
'free_capacity': 100,
|
|
'volume_backend_name': 'pool1',
|
|
'reserved_percentage': 0,
|
|
'driver_version': '1.0.0',
|
|
'storage_protocol': 'iSCSI',
|
|
'QoS_support': 'False', }
|
|
},
|
|
{
|
|
'name': 'pool2',
|
|
'capabilities': {
|
|
'updated': None,
|
|
'total_capacity': 512,
|
|
'free_capacity': 200,
|
|
'volume_backend_name': 'pool2',
|
|
'reserved_percentage': 0,
|
|
'driver_version': '1.0.1',
|
|
'storage_protocol': 'iSER',
|
|
'QoS_support': 'True', }
|
|
}
|
|
]
|
|
}
|
|
|
|
self.assertDictMatch(expected, res)
|
|
|
|
def test_get_pools_detail_invalid_bool(self):
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/scheduler_stats?detail=InvalidBool' %
|
|
fake.PROJECT_ID)
|
|
req.environ['cinder.context'] = self.ctxt
|
|
self.assertRaises(exception.InvalidParameterValue,
|
|
self.controller.get_pools,
|
|
req)
|