From ddeb1d14c43b4fc0a88fcc937c112d5015ee941b Mon Sep 17 00:00:00 2001 From: Kaitlin Farr Date: Wed, 27 Sep 2017 13:42:17 -0400 Subject: [PATCH] Update provider parameter in sample json files In the sample json files, some examples of the provider value were wrong and showed a key manager class instead of an encryptor name. Other samples showed the legacy encryptor classes where the newer os-brick encryptor shorthand names should be used instead. I3eec91e221692177833909e0378116cea4966807 removes support for the legacy provider class names, so it is important that the samples reflect the updated shorthand names. Change-Id: I1c3879a5d12a8c9802deeac1c6e24b57310588d5 --- api-ref/source/v2/samples/encryption-type-create-request.json | 2 +- .../source/v2/samples/encryption-type-create-response.json | 2 +- api-ref/source/v2/samples/encryption-type-show-response.json | 4 ++-- api-ref/source/v2/samples/encryption-type-update-request.json | 4 ++-- .../source/v2/samples/encryption-type-update-response.json | 4 ++-- api-ref/source/v3/samples/encryption-type-create-request.json | 2 +- .../source/v3/samples/encryption-type-create-response.json | 2 +- api-ref/source/v3/samples/encryption-type-show-response.json | 4 ++-- api-ref/source/v3/samples/encryption-type-update-request.json | 4 ++-- .../source/v3/samples/encryption-type-update-response.json | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/api-ref/source/v2/samples/encryption-type-create-request.json b/api-ref/source/v2/samples/encryption-type-create-request.json index f93c1426144..6b9f97ec6b3 100644 --- a/api-ref/source/v2/samples/encryption-type-create-request.json +++ b/api-ref/source/v2/samples/encryption-type-create-request.json @@ -1,7 +1,7 @@ { "encryption":{ "key_size": 128, - "provider": "nova.volume.encryptors.luks.LuksEncryptor", + "provider": "luks", "control_location":"front-end", "cipher": "aes-xts-plain64" } diff --git a/api-ref/source/v2/samples/encryption-type-create-response.json b/api-ref/source/v2/samples/encryption-type-create-response.json index 3e2a2aeec58..ad7f5c87cb5 100644 --- a/api-ref/source/v2/samples/encryption-type-create-response.json +++ b/api-ref/source/v2/samples/encryption-type-create-response.json @@ -4,7 +4,7 @@ "control_location": "front-end", "encryption_id": "81e069c6-7394-4856-8df7-3b237ca61f74", "key_size": 128, - "provider": "nova.volume.encryptors.luks.LuksEncryptor", + "provider": "luks", "cipher": "aes-xts-plain64" } } diff --git a/api-ref/source/v2/samples/encryption-type-show-response.json b/api-ref/source/v2/samples/encryption-type-show-response.json index 83ecab88bba..9a168bf5fa6 100644 --- a/api-ref/source/v2/samples/encryption-type-show-response.json +++ b/api-ref/source/v2/samples/encryption-type-show-response.json @@ -6,7 +6,7 @@ "updated_at": null, "encryption_id": "81e069c6-7394-4856-8df7-3b237ca61f74", "key_size": 128, - "provider": "nova.volume.encryptors.luks.LuksEncryptor", + "provider": "luks", "deleted_at": null, "cipher": "aes-xts-plain64" -} \ No newline at end of file +} diff --git a/api-ref/source/v2/samples/encryption-type-update-request.json b/api-ref/source/v2/samples/encryption-type-update-request.json index 7a587b77146..c035785ec77 100644 --- a/api-ref/source/v2/samples/encryption-type-update-request.json +++ b/api-ref/source/v2/samples/encryption-type-update-request.json @@ -1,7 +1,7 @@ { "encryption":{ "key_size": 64, - "provider": "cinder.keymgr.conf_key_mgr.ConfKeyManager", + "provider": "luks", "control_location":"back-end" } -} \ No newline at end of file +} diff --git a/api-ref/source/v2/samples/encryption-type-update-response.json b/api-ref/source/v2/samples/encryption-type-update-response.json index 7a587b77146..c035785ec77 100644 --- a/api-ref/source/v2/samples/encryption-type-update-response.json +++ b/api-ref/source/v2/samples/encryption-type-update-response.json @@ -1,7 +1,7 @@ { "encryption":{ "key_size": 64, - "provider": "cinder.keymgr.conf_key_mgr.ConfKeyManager", + "provider": "luks", "control_location":"back-end" } -} \ No newline at end of file +} diff --git a/api-ref/source/v3/samples/encryption-type-create-request.json b/api-ref/source/v3/samples/encryption-type-create-request.json index f93c1426144..6b9f97ec6b3 100644 --- a/api-ref/source/v3/samples/encryption-type-create-request.json +++ b/api-ref/source/v3/samples/encryption-type-create-request.json @@ -1,7 +1,7 @@ { "encryption":{ "key_size": 128, - "provider": "nova.volume.encryptors.luks.LuksEncryptor", + "provider": "luks", "control_location":"front-end", "cipher": "aes-xts-plain64" } diff --git a/api-ref/source/v3/samples/encryption-type-create-response.json b/api-ref/source/v3/samples/encryption-type-create-response.json index 3e2a2aeec58..ad7f5c87cb5 100644 --- a/api-ref/source/v3/samples/encryption-type-create-response.json +++ b/api-ref/source/v3/samples/encryption-type-create-response.json @@ -4,7 +4,7 @@ "control_location": "front-end", "encryption_id": "81e069c6-7394-4856-8df7-3b237ca61f74", "key_size": 128, - "provider": "nova.volume.encryptors.luks.LuksEncryptor", + "provider": "luks", "cipher": "aes-xts-plain64" } } diff --git a/api-ref/source/v3/samples/encryption-type-show-response.json b/api-ref/source/v3/samples/encryption-type-show-response.json index 83ecab88bba..9a168bf5fa6 100644 --- a/api-ref/source/v3/samples/encryption-type-show-response.json +++ b/api-ref/source/v3/samples/encryption-type-show-response.json @@ -6,7 +6,7 @@ "updated_at": null, "encryption_id": "81e069c6-7394-4856-8df7-3b237ca61f74", "key_size": 128, - "provider": "nova.volume.encryptors.luks.LuksEncryptor", + "provider": "luks", "deleted_at": null, "cipher": "aes-xts-plain64" -} \ No newline at end of file +} diff --git a/api-ref/source/v3/samples/encryption-type-update-request.json b/api-ref/source/v3/samples/encryption-type-update-request.json index 7a587b77146..c035785ec77 100644 --- a/api-ref/source/v3/samples/encryption-type-update-request.json +++ b/api-ref/source/v3/samples/encryption-type-update-request.json @@ -1,7 +1,7 @@ { "encryption":{ "key_size": 64, - "provider": "cinder.keymgr.conf_key_mgr.ConfKeyManager", + "provider": "luks", "control_location":"back-end" } -} \ No newline at end of file +} diff --git a/api-ref/source/v3/samples/encryption-type-update-response.json b/api-ref/source/v3/samples/encryption-type-update-response.json index 7a587b77146..c035785ec77 100644 --- a/api-ref/source/v3/samples/encryption-type-update-response.json +++ b/api-ref/source/v3/samples/encryption-type-update-response.json @@ -1,7 +1,7 @@ { "encryption":{ "key_size": 64, - "provider": "cinder.keymgr.conf_key_mgr.ConfKeyManager", + "provider": "luks", "control_location":"back-end" } -} \ No newline at end of file +}