From 51ffb26437071e90a236767bc18d63bc7cabc2ce Mon Sep 17 00:00:00 2001 From: Peter Hamilton Date: Fri, 28 Feb 2014 13:09:27 -0500 Subject: [PATCH] Fix malformed encryption-type body in test cases This change addresses bug #1286261 and fixes two malformed encryption-type bodies in two test_create test cases. Change-Id: I308561c1d5a70812889a93922e13194597f670f1 Closes-Bug: #1286261 --- cinderclient/tests/v1/test_volume_encryption_types.py | 11 +++++------ cinderclient/tests/v2/test_volume_encryption_types.py | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/cinderclient/tests/v1/test_volume_encryption_types.py b/cinderclient/tests/v1/test_volume_encryption_types.py index 0d9868c0f..f8951d247 100644 --- a/cinderclient/tests/v1/test_volume_encryption_types.py +++ b/cinderclient/tests/v1/test_volume_encryption_types.py @@ -73,12 +73,11 @@ class VolumeEncryptionTypesTest(utils.TestCase): Verify that one POST request is made for the encryption type creation. Verify that encryption type creation returns a VolumeEncryptionType. """ - result = cs.volume_encryption_types.create(2, {'encryption': - {'provider': 'Test', - 'key_size': None, - 'cipher': None, - 'control_location': - None}}) + result = cs.volume_encryption_types.create(2, {'provider': 'Test', + 'key_size': None, + 'cipher': None, + 'control_location': + None}) cs.assert_called('POST', '/types/2/encryption') self.assertIsInstance(result, VolumeEncryptionType) diff --git a/cinderclient/tests/v2/test_volume_encryption_types.py b/cinderclient/tests/v2/test_volume_encryption_types.py index 0d609ea3f..bba650319 100644 --- a/cinderclient/tests/v2/test_volume_encryption_types.py +++ b/cinderclient/tests/v2/test_volume_encryption_types.py @@ -73,12 +73,11 @@ class VolumeEncryptionTypesTest(utils.TestCase): Verify that one POST request is made for the encryption type creation. Verify that encryption type creation returns a VolumeEncryptionType. """ - result = cs.volume_encryption_types.create(2, {'encryption': - {'provider': 'Test', - 'key_size': None, - 'cipher': None, - 'control_location': - None}}) + result = cs.volume_encryption_types.create(2, {'provider': 'Test', + 'key_size': None, + 'cipher': None, + 'control_location': + None}) cs.assert_called('POST', '/types/2/encryption') self.assertIsInstance(result, VolumeEncryptionType)