openstack/python-cinderclient
Code Issues Proposed changes

Merge "Add support to incremental backups in cinder"

Browse Source
This commit is contained in:
Jenkins
2015-04-21 22:01:32 +00:00
committed by Gerrit Code Review
parent 4994faf374 3ee941c1e6
commit 8ba6242d64
4 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cinderclient/tests/unit/v2/test_shell.py
View File

@@ -347,6 +347,10 @@ class ShellTest(utils.TestCase):
self.run_command('backup-create 1234') self.run_command('backup-create 1234')
self.assert_called('POST', '/backups') self.assert_called('POST', '/backups')
def test_backup_incremental(self):
self.run_command('backup-create 1234 --incremental')
self.assert_called('POST', '/backups')
def test_restore(self): def test_restore(self):
self.run_command('backup-restore 1234') self.run_command('backup-restore 1234')
self.assert_called('POST', '/backups/1234/restore') self.assert_called('POST', '/backups/1234/restore')

10
cinderclient/tests/unit/v2/test_volume_backups.py
View File

@@ -26,6 +26,16 @@ class VolumeBackupsTest(utils.TestCase):
cs.backups.create('2b695faf-b963-40c8-8464-274008fbcef4') cs.backups.create('2b695faf-b963-40c8-8464-274008fbcef4')
cs.assert_called('POST', '/backups') cs.assert_called('POST', '/backups')
def test_create_full(self):
cs.backups.create('2b695faf-b963-40c8-8464-274008fbcef4',
None, None, False)
cs.assert_called('POST', '/backups')
def test_create_incremental(self):
cs.backups.create('2b695faf-b963-40c8-8464-274008fbcef4',
None, None, True)
cs.assert_called('POST', '/backups')
def test_get(self): def test_get(self):
backup_id = '76a17945-3c6f-435c-975b-b5685db10b62' backup_id = '76a17945-3c6f-435c-975b-b5685db10b62'
cs.backups.get(backup_id) cs.backups.get(backup_id)

7
cinderclient/v2/shell.py
View File

@@ -1150,6 +1150,10 @@ def do_retype(cs, args):
metavar='<description>', metavar='<description>',
default=None, default=None,
help='Backup description. Default=None.') help='Backup description. Default=None.')
@utils.arg('--incremental',
action='store_true',
help='Incremental backup. Default=False.',
default=False)
@utils.service_type('volumev2') @utils.service_type('volumev2')
def do_backup_create(cs, args): def do_backup_create(cs, args):
"""Creates a volume backup.""" """Creates a volume backup."""
@@ -1163,7 +1167,8 @@ def do_backup_create(cs, args):
backup = cs.backups.create(volume.id, backup = cs.backups.create(volume.id,
args.container, args.container,
args.name, args.name,
args.description) args.description,
args.incremental)
info = {"volume_id": volume.id} info = {"volume_id": volume.id}
info.update(backup._info) info.update(backup._info)

7
cinderclient/v2/volume_backups.py
View File

@@ -35,19 +35,22 @@ class VolumeBackupManager(base.ManagerWithFind):
resource_class = VolumeBackup resource_class = VolumeBackup
def create(self, volume_id, container=None, def create(self, volume_id, container=None,
name=None, description=None): name=None, description=None,
incremental=False):
"""Creates a volume backup. """Creates a volume backup.
:param volume_id: The ID of the volume to backup. :param volume_id: The ID of the volume to backup.
:param container: The name of the backup service container. :param container: The name of the backup service container.
:param name: The name of the backup. :param name: The name of the backup.
:param description: The description of the backup. :param description: The description of the backup.
:param incremental: Incremental backup.
:rtype: :class:`VolumeBackup` :rtype: :class:`VolumeBackup`
""" """
body = {'backup': {'volume_id': volume_id, body = {'backup': {'volume_id': volume_id,
'container': container, 'container': container,
'name': name, 'name': name,
'description': description}} 'description': description,
'incremental': incremental}}
return self._create('/backups', body, 'backup') return self._create('/backups', body, 'backup')
def get(self, backup_id): def get(self, backup_id):