Merge "Add missing params in NoOpEncryptor"

This commit is contained in:
Zuul 2019-02-15 18:22:51 +00:00 committed by Gerrit Code Review
commit e2cbf3f851
2 changed files with 12 additions and 4 deletions

View File

@ -36,8 +36,8 @@ class NoOpEncryptor(base.VolumeEncryptor):
execute=execute,
*args, **kwargs)
def attach_volume(self, context):
def attach_volume(self, context, **kwargs):
pass
def detach_volume(self):
def detach_volume(self, **kwargs):
pass

View File

@ -24,7 +24,15 @@ class NoOpEncryptorTestCase(test_base.VolumeEncryptorTestCase):
keymgr=self.keymgr)
def test_attach_volume(self):
self.encryptor.attach_volume(None)
test_args = {
'control_location': 'front-end',
'provider': 'NoOpEncryptor',
}
self.encryptor.attach_volume(None, **test_args)
def test_detach_volume(self):
self.encryptor.detach_volume()
test_args = {
'control_location': 'front-end',
'provider': 'NoOpEncryptor',
}
self.encryptor.detach_volume(**test_args)