openstack/cinder
Code Issues Proposed changes

Merge "Make backup_compression_algorithm case insensitive"

Browse Source
This commit is contained in:
Zuul 2019-09-03 23:54:16 +00:00 committed by Gerrit Code Review
commit 1eeff8ad8a
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/backup/chunkeddriver.py
View File

@ -50,6 +50,7 @@ LOG = logging.getLogger(__name__)
backup_opts = [ backup_opts = [
cfg.StrOpt('backup_compression_algorithm', cfg.StrOpt('backup_compression_algorithm',
default='zlib', default='zlib',
ignore_case=True,
choices=['none', 'off', 'no', choices=['none', 'off', 'no',
'zlib', 'gzip', 'zlib', 'gzip',
'bz2', 'bzip2'], 'bz2', 'bzip2'],

9
cinder/tests/unit/backup/drivers/test_backup_swift.py
View File

@ -309,6 +309,15 @@ class BackupSwiftTestCase(test.TestCase):
backup = objects.Backup.get_by_id(self.ctxt, fake.BACKUP_ID) backup = objects.Backup.get_by_id(self.ctxt, fake.BACKUP_ID)
service.backup(backup, self.volume_file) service.backup(backup, self.volume_file)
def test_backup_uncompressed_casing(self):
volume_id = '2b9f10a3-42b4-dead-b316-000000ceb039'
self._create_backup_db_entry(volume_id=volume_id)
self.flags(backup_compression_algorithm='None')
service = swift_dr.SwiftBackupDriver(self.ctxt)
self.volume_file.seek(0)
backup = objects.Backup.get_by_id(self.ctxt, fake.BACKUP_ID)
service.backup(backup, self.volume_file)
def test_backup_bz2(self): def test_backup_bz2(self):
volume_id = 'dc0fee35-b44e-4f13-80d6-000000e1b50c' volume_id = 'dc0fee35-b44e-4f13-80d6-000000e1b50c'
self._create_backup_db_entry(volume_id=volume_id) self._create_backup_db_entry(volume_id=volume_id)