openstack/python-cinderclient
Code Issues Proposed changes

Merge "Add set-bootable command"

Browse Source
This commit is contained in:
Jenkins
2014-07-16 22:30:28 +00:00
committed by Gerrit Code Review
parent da4117f71c c364372477
commit 0c4010e7fb
8 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cinderclient/tests/v1/fakes.py
View File

@@ -357,6 +357,8 @@ class FakeHTTPClient(base_client.HTTPClient):
assert 'force_host_copy' in body[action]
elif action == 'os-update_readonly_flag':
assert list(body[action]) == ['readonly']
elif action == 'os-set_bootable':
assert list(body[action]) == ['bootable']
else:
raise AssertionError("Unexpected action: %s" % action)
return (resp, {}, _body)

5
cinderclient/tests/v1/test_volumes.py
View File

@@ -106,3 +106,8 @@ class VolumesTest(utils.TestCase):
v = cs.volumes.get('1234')
cs.volumes.update_readonly_flag(v, True)
cs.assert_called('POST', '/volumes/1234/action')
def test_set_bootable(self):
v = cs.volumes.get('1234')
cs.volumes.set_bootable(v, True)
cs.assert_called('POST', '/volumes/1234/action')

2
cinderclient/tests/v2/fakes.py
View File

@@ -368,6 +368,8 @@ class FakeHTTPClient(base_client.HTTPClient):
assert list(body[action]) == ['readonly']
elif action == 'os-retype':
assert 'new_type' in body[action]
elif action == 'os-set_bootable':
assert list(body[action]) == ['bootable']
else:
raise AssertionError("Unexpected action: %s" % action)
return (resp, {}, _body)

5
cinderclient/tests/v2/test_volumes.py
View File

@@ -134,3 +134,8 @@ class VolumesTest(utils.TestCase):
cs.assert_called('POST', '/volumes/1234/action',
{'os-retype': {'new_type': 'foo',
'migration_policy': 'on-demand'}})
def test_set_bootable(self):
v = cs.volumes.get('1234')
cs.volumes.set_bootable(v, True)
cs.assert_called('POST', '/volumes/1234/action')

13
cinderclient/v1/shell.py
View File

@@ -1443,3 +1443,16 @@ def do_readonly_mode_update(cs, args):
volume = utils.find_volume(cs, args.volume)
cs.volumes.update_readonly_flag(volume,
strutils.bool_from_string(args.read_only))
@utils.arg('volume', metavar='<volume>', help='ID of the volume to update.')
@utils.arg('bootable',
metavar='<True|true|False|false>',
choices=['True', 'true', 'False', 'false'],
help='Flag to indicate whether volume is bootable.')
@utils.service_type('volume')
def do_set_bootable(cs, args):
"""Update bootable status of a volume."""
volume = utils.find_volume(cs, args.volume)
cs.volumes.set_bootable(volume,
strutils.bool_from_string(args.bootable))

5
cinderclient/v1/volumes.py
View File

@@ -425,3 +425,8 @@ class VolumeManager(base.ManagerWithFind):
return self._action('os-update_readonly_flag',
base.getid(volume),
{'readonly': flag})
def set_bootable(self, volume, flag):
return self._action('os-set_bootable',
base.getid(volume),
{'bootable': flag})

13
cinderclient/v2/shell.py
View File

@@ -1547,3 +1547,16 @@ def do_readonly_mode_update(cs, args):
volume = utils.find_volume(cs, args.volume)
cs.volumes.update_readonly_flag(volume,
strutils.bool_from_string(args.read_only))
@utils.arg('volume', metavar='<volume>', help='ID of the volume to update.')
@utils.arg('bootable',
metavar='<True|true|False|false>',
choices=['True', 'true', 'False', 'false'],
help='Flag to indicate whether volume is bootable.')
@utils.service_type('volumev2')
def do_set_bootable(cs, args):
"""Update bootable status of a volume."""
volume = utils.find_volume(cs, args.volume)
cs.volumes.set_bootable(volume,
strutils.bool_from_string(args.bootable))

5
cinderclient/v2/volumes.py
View File

@@ -422,3 +422,8 @@ class VolumeManager(base.ManagerWithFind):
volume,
{'new_type': volume_type,
'migration_policy': policy})
def set_bootable(self, volume, flag):
return self._action('os-set_bootable',
base.getid(volume),
{'bootable': flag})