Merge "Add 'encryption_id' parameter to enc type calls"
Zuul authored 1 year, 5 months ago
Gerrit Code Review committed 1 year, 5 months ago
| 81 | 81 | cls.encryption_type = \ |
| 82 | 82 | cls.admin_encryption_types_client.create_encryption_type( |
| 83 | 83 | volume_type['id'], **cls.create_kwargs)['encryption'] |
| 84 | # NOTE: strictly speaking, this is NOT a volume_type field; | |
| 85 | # we save it for convenience in these tests | |
| 86 | volume_type['encryption_id'] = cls.encryption_type['encryption_id'] | |
| 84 | 87 | |
| 85 | 88 | if cleanup: |
| 86 | 89 | cls.addClassResourceCleanup( |
| 308 | 311 | method='delete_encryption_type', |
| 309 | 312 | expected_status=expected_status, |
| 310 | 313 | client=self.encryption_types_client, |
| 311 | volume_type_id=volume_type['id'] | |
| 314 | volume_type_id=volume_type['id'], | |
| 315 | encryption_id=volume_type['encryption_id'] | |
| 312 | 316 | ) |
| 313 | 317 | |
| 314 | 318 | def _create_encryption_type(self, expected_status): |
| 332 | 336 | expected_status=expected_status, |
| 333 | 337 | client=self.encryption_types_client, |
| 334 | 338 | volume_type_id=self.volume_type['id'], |
| 339 | encryption_id=self.volume_type['encryption_id'], | |
| 335 | 340 | **update_kwargs |
| 336 | 341 | ) |
| 337 | 342 | |