openstack
/
cinder
Code Issues Proposed changes

Merge "Add strict Boolean checking for volume manage"

This commit is contained in:
Jenkins 2016-07-12 02:59:36 +00:00 committed by Gerrit Code Review
parent 9ed570d96c 28b5c7e101
commit a76f4a1b94
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/api/contrib/volume_manage.py
View File

@ -137,7 +137,7 @@ class VolumeManageController(wsgi.Controller):
kwargs['description'] = volume.get('description', None)
kwargs['metadata'] = volume.get('metadata', None)
kwargs['availability_zone'] = volume.get('availability_zone', None)
kwargs['bootable'] = volume.get('bootable', False)
kwargs['bootable'] = utils.get_bool_param('bootable', volume)
try:
new_volume = self.volume_api.manage_existing(context,
volume['host'],

11
cinder/tests/unit/api/contrib/test_volume_manage.py
View File

@ -202,6 +202,14 @@ class VolumeManageTest(test.TestCase):
self.assertEqual(400, res.status_int)
pass
def test_manage_volume_with_invalid_bootable(self):
"""Test correct failure when invalid bool value is specified."""
body = {'volume': {'host': 'host_ok',
'ref': 'fake_ref',
'bootable': 'InvalidBool'}}
res = self._get_resp_post(body)
self.assertEqual(400, res.status_int)
@mock.patch('cinder.volume.api.API.manage_existing', api_manage)
@mock.patch(
'cinder.api.openstack.wsgi.Controller.validate_name_and_description')
@ -213,7 +221,8 @@ class VolumeManageTest(test.TestCase):
"""
body = {'volume': {'host': 'host_ok',
'ref': 'fake_ref',
'volume_type': fake.VOLUME_TYPE_ID}}
'volume_type': fake.VOLUME_TYPE_ID,
'bootable': True}}
res = self._get_resp_post(body)
self.assertEqual(202, res.status_int, res)
self.assertTrue(mock_validate.called)