Add 'encryption_id' parameter to enc type calls
Change Ieca29000b575 in tempest revised the update and delete
encryption type methods for the encryption_type_client to include
the encryption_id, as is specified in the Block Storage API ref.
Thus we need to update our usage of the encryption_type_client to
pass the encryption_id parameter.
Partial-bug: #1835186
Change-Id: I14d2eb8ec8f4343464710124df0c108464bece1b
diff --git a/cinder_tempest_plugin/rbac/v3/test_volume_types.py b/cinder_tempest_plugin/rbac/v3/test_volume_types.py
index cdbc341..27159f3 100644
--- a/cinder_tempest_plugin/rbac/v3/test_volume_types.py
+++ b/cinder_tempest_plugin/rbac/v3/test_volume_types.py
@@ -66,6 +66,9 @@
cls.encryption_type = \
cls.admin_encryption_types_client.create_encryption_type(
volume_type['id'], **cls.create_kwargs)['encryption']
+ # NOTE: strictly speaking, this is NOT a volume_type field;
+ # we save it for convenience in these tests
+ volume_type['encryption_id'] = cls.encryption_type['encryption_id']
if cleanup:
cls.addClassResourceCleanup(
@@ -226,7 +229,8 @@
method='delete_encryption_type',
expected_status=expected_status,
client=self.encryption_types_client,
- volume_type_id=volume_type['id']
+ volume_type_id=volume_type['id'],
+ encryption_id=volume_type['encryption_id']
)
def _create_encryption_type(self, expected_status):
@@ -250,6 +254,7 @@
expected_status=expected_status,
client=self.encryption_types_client,
volume_type_id=self.volume_type['id'],
+ encryption_id=self.volume_type['encryption_id'],
**update_kwargs
)