trivial: Rename directory for os-keypairs samples

We have a custom of naming the directory after the API. Reinforce that
here.

Change-Id: I5bf68aacc1d987400a91467835c4b55f03c18beb
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

48 files changed, 6 insertions, 6 deletions

diff --git a/api-ref/source/os-keypairs.inc b/api-ref/source/os-keypairs.inc
index e728ef6435..e03e7d91aa 100644
--- a/api-ref/source/os-keypairs.inc
+++ b/api-ref/source/os-keypairs.inc
@@ -41,7 +41,7 @@ Response
 
 **Example List Keypairs (v2.35): JSON response**
 
-.. literalinclude:: ../../doc/api_samples/keypairs/v2.35/keypairs-list-resp.json
+.. literalinclude:: ../../doc/api_samples/os-keypairs/v2.35/keypairs-list-resp.json
    :language: javascript
 
 Create Or Import Keypair
@@ -72,7 +72,7 @@ Request
 
 **Example Create Or Import Keypair (v2.10): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/keypairs/v2.10/keypairs-import-post-req.json
+.. literalinclude:: ../../doc/api_samples/os-keypairs/v2.10/keypairs-import-post-req.json
    :language: javascript
 
 Response
@@ -90,7 +90,7 @@ Response
 
 **Example Create Or Import Keypair (v2.10): JSON response**
 
-.. literalinclude:: ../../doc/api_samples/keypairs/v2.10/keypairs-import-post-resp.json
+.. literalinclude:: ../../doc/api_samples/os-keypairs/v2.10/keypairs-import-post-resp.json
    :language: javascript
 
 Show Keypair Details
@@ -131,7 +131,7 @@ Response
 
 **Example Show Keypair Details (v2.10): JSON response**
 
-.. literalinclude:: ../../doc/api_samples/keypairs/v2.10/keypairs-get-resp.json
+.. literalinclude:: ../../doc/api_samples/os-keypairs/v2.10/keypairs-get-resp.json
    :language: javascript
 
 Delete Keypair
diff --git a/doc/api_samples/keypairs/keypairs-get-resp.json b/doc/api_samples/os-keypairs/keypairs-get-resp.json
index 59c2044676..59c2044676 100644
--- a/doc/api_samples/keypairs/keypairs-get-resp.json
+++ b/doc/api_samples/os-keypairs/keypairs-get-resp.json
diff --git a/doc/api_samples/keypairs/keypairs-import-post-req.json b/doc/api_samples/os-keypairs/keypairs-import-post-req.json
index 154afe669f..154afe669f 100644
--- a/doc/api_samples/keypairs/keypairs-import-post-req.json
+++ b/doc/api_samples/os-keypairs/keypairs-import-post-req.json
diff --git a/doc/api_samples/keypairs/keypairs-import-post-resp.json b/doc/api_samples/os-keypairs/keypairs-import-post-resp.json
index 569d7f5783..569d7f5783 100644
--- a/doc/api_samples/keypairs/keypairs-import-post-resp.json
+++ b/doc/api_samples/os-keypairs/keypairs-import-post-resp.json
diff --git a/doc/api_samples/keypairs/keypairs-list-resp.json b/doc/api_samples/os-keypairs/keypairs-list-resp.json
index d657cff78d..d657cff78d 100644
--- a/doc/api_samples/keypairs/keypairs-list-resp.json
+++ b/doc/api_samples/os-keypairs/keypairs-list-resp.json
diff --git a/doc/api_samples/keypairs/keypairs-post-req.json b/doc/api_samples/os-keypairs/keypairs-post-req.json
index e4e9f4a8ac..e4e9f4a8ac 100644
--- a/doc/api_samples/keypairs/keypairs-post-req.json
+++ b/doc/api_samples/os-keypairs/keypairs-post-req.json
diff --git a/doc/api_samples/keypairs/keypairs-post-resp.json b/doc/api_samples/os-keypairs/keypairs-post-resp.json
index 5a928f9a9c..5a928f9a9c 100644
--- a/doc/api_samples/keypairs/keypairs-post-resp.json
+++ b/doc/api_samples/os-keypairs/keypairs-post-resp.json
diff --git a/doc/api_samples/keypairs/v2.10/keypairs-get-resp.json b/doc/api_samples/os-keypairs/v2.10/keypairs-get-resp.json
index 2970994fad..2970994fad 100644
--- a/doc/api_samples/keypairs/v2.10/keypairs-get-resp.json
+++ b/doc/api_samples/os-keypairs/v2.10/keypairs-get-resp.json
diff --git a/doc/api_samples/keypairs/v2.10/keypairs-import-post-req.json b/doc/api_samples/os-keypairs/v2.10/keypairs-import-post-req.json
index fb18f269c9..fb18f269c9 100644
--- a/doc/api_samples/keypairs/v2.10/keypairs-import-post-req.json
+++ b/doc/api_samples/os-keypairs/v2.10/keypairs-import-post-req.json
diff --git a/doc/api_samples/keypairs/v2.10/keypairs-import-post-resp.json b/doc/api_samples/os-keypairs/v2.10/keypairs-import-post-resp.json
index ca1a70b334..ca1a70b334 100644
--- a/doc/api_samples/keypairs/v2.10/keypairs-import-post-resp.json
+++ b/doc/api_samples/os-keypairs/v2.10/keypairs-import-post-resp.json
diff --git a/doc/api_samples/keypairs/v2.10/keypairs-list-resp.json b/doc/api_samples/os-keypairs/v2.10/keypairs-list-resp.json
index 3d5fe045a0..3d5fe045a0 100644
--- a/doc/api_samples/keypairs/v2.10/keypairs-list-resp.json
+++ b/doc/api_samples/os-keypairs/v2.10/keypairs-list-resp.json
diff --git a/doc/api_samples/keypairs/v2.10/keypairs-post-req.json b/doc/api_samples/os-keypairs/v2.10/keypairs-post-req.json
index 005a3f5045..005a3f5045 100644
--- a/doc/api_samples/keypairs/v2.10/keypairs-post-req.json
+++ b/doc/api_samples/os-keypairs/v2.10/keypairs-post-req.json
diff --git a/doc/api_samples/keypairs/v2.10/keypairs-post-resp.json b/doc/api_samples/os-keypairs/v2.10/keypairs-post-resp.json
index 394960868b..394960868b 100644
--- a/doc/api_samples/keypairs/v2.10/keypairs-post-resp.json
+++ b/doc/api_samples/os-keypairs/v2.10/keypairs-post-resp.json
diff --git a/doc/api_samples/keypairs/v2.2/keypairs-get-resp.json b/doc/api_samples/os-keypairs/v2.2/keypairs-get-resp.json
index 2970994fad..2970994fad 100644
--- a/doc/api_samples/keypairs/v2.2/keypairs-get-resp.json
+++ b/doc/api_samples/os-keypairs/v2.2/keypairs-get-resp.json
diff --git a/doc/api_samples/keypairs/v2.2/keypairs-import-post-req.json b/doc/api_samples/os-keypairs/v2.2/keypairs-import-post-req.json
index c511353376..c511353376 100644
--- a/doc/api_samples/keypairs/v2.2/keypairs-import-post-req.json
+++ b/doc/api_samples/os-keypairs/v2.2/keypairs-import-post-req.json
diff --git a/doc/api_samples/keypairs/v2.2/keypairs-import-post-resp.json b/doc/api_samples/os-keypairs/v2.2/keypairs-import-post-resp.json
index ca1a70b334..ca1a70b334 100644
--- a/doc/api_samples/keypairs/v2.2/keypairs-import-post-resp.json
+++ b/doc/api_samples/os-keypairs/v2.2/keypairs-import-post-resp.json
diff --git a/doc/api_samples/keypairs/v2.2/keypairs-list-resp.json b/doc/api_samples/os-keypairs/v2.2/keypairs-list-resp.json
index 3d5fe045a0..3d5fe045a0 100644
--- a/doc/api_samples/keypairs/v2.2/keypairs-list-resp.json
+++ b/doc/api_samples/os-keypairs/v2.2/keypairs-list-resp.json
diff --git a/doc/api_samples/keypairs/v2.2/keypairs-post-req.json b/doc/api_samples/os-keypairs/v2.2/keypairs-post-req.json
index ebd4ae54c1..ebd4ae54c1 100644
--- a/doc/api_samples/keypairs/v2.2/keypairs-post-req.json
+++ b/doc/api_samples/os-keypairs/v2.2/keypairs-post-req.json
diff --git a/doc/api_samples/keypairs/v2.2/keypairs-post-resp.json b/doc/api_samples/os-keypairs/v2.2/keypairs-post-resp.json
index a1634bd123..a1634bd123 100644
--- a/doc/api_samples/keypairs/v2.2/keypairs-post-resp.json
+++ b/doc/api_samples/os-keypairs/v2.2/keypairs-post-resp.json
diff --git a/doc/api_samples/keypairs/v2.35/keypairs-list-resp.json b/doc/api_samples/os-keypairs/v2.35/keypairs-list-resp.json
index 786a0b6ce2..786a0b6ce2 100644
--- a/doc/api_samples/keypairs/v2.35/keypairs-list-resp.json
+++ b/doc/api_samples/os-keypairs/v2.35/keypairs-list-resp.json
diff --git a/doc/api_samples/keypairs/v2.35/keypairs-list-user1-resp.json b/doc/api_samples/os-keypairs/v2.35/keypairs-list-user1-resp.json
index 547cb000c9..547cb000c9 100644
--- a/doc/api_samples/keypairs/v2.35/keypairs-list-user1-resp.json
+++ b/doc/api_samples/os-keypairs/v2.35/keypairs-list-user1-resp.json
diff --git a/doc/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json b/doc/api_samples/os-keypairs/v2.35/keypairs-list-user2-resp.json
index e9a5e9318b..e9a5e9318b 100644
--- a/doc/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json
+++ b/doc/api_samples/os-keypairs/v2.35/keypairs-list-user2-resp.json
diff --git a/doc/api_samples/keypairs/v2.35/keypairs-post-req.json b/doc/api_samples/os-keypairs/v2.35/keypairs-post-req.json
index 005a3f5045..005a3f5045 100644
--- a/doc/api_samples/keypairs/v2.35/keypairs-post-req.json
+++ b/doc/api_samples/os-keypairs/v2.35/keypairs-post-req.json
diff --git a/doc/api_samples/keypairs/v2.35/keypairs-post-resp.json b/doc/api_samples/os-keypairs/v2.35/keypairs-post-resp.json
index 394960868b..394960868b 100644
--- a/doc/api_samples/keypairs/v2.35/keypairs-post-resp.json
+++ b/doc/api_samples/os-keypairs/v2.35/keypairs-post-resp.json
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-get-resp.json.tpl
index 4fde60f14b..4fde60f14b 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-get-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-get-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-import-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-import-post-req.json.tpl
index 2301fa05b2..2301fa05b2 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-import-post-req.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-import-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-import-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-import-post-resp.json.tpl
index ca7192d5dc..ca7192d5dc 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-import-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-import-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-list-resp.json.tpl
index 29ba63c00b..29ba63c00b 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-list-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-list-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-post-req.json.tpl
index 68e2f03487..68e2f03487 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-post-req.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-post-resp.json.tpl
index aace6f5ccc..aace6f5ccc 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-get-resp.json.tpl
index d18ae16351..d18ae16351 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-get-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-get-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-import-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-import-post-req.json.tpl
index 03e60c0133..03e60c0133 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-import-post-req.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-import-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-import-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-import-post-resp.json.tpl
index 30d3fa969d..30d3fa969d 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-import-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-import-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-list-resp.json.tpl
index 8e0963bc7a..8e0963bc7a 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-list-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-list-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-post-req.json.tpl
index f6a6d47b56..f6a6d47b56 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-post-req.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-post-resp.json.tpl
index ee5eb23f77..ee5eb23f77 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-get-resp.json.tpl
index e2e8dee070..e2e8dee070 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-get-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-get-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-import-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-import-post-req.json.tpl
index fc93c93603..fc93c93603 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-import-post-req.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-import-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-import-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-import-post-resp.json.tpl
index 01b22b0e40..01b22b0e40 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-import-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-import-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-list-resp.json.tpl
index 8e0963bc7a..8e0963bc7a 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-list-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-list-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-post-req.json.tpl
index 03ac7dcd7e..03ac7dcd7e 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-post-req.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-post-resp.json.tpl
index 2645fa9aa0..2645fa9aa0 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-list-resp.json.tpl
index 2fb1ba2423..2fb1ba2423 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-list-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-user1-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-list-user1-resp.json.tpl
index 8e0963bc7a..8e0963bc7a 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-user1-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-list-user1-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-list-user2-resp.json.tpl
index 8a00094c3f..8a00094c3f 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-list-user2-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-post-req.json.tpl
index f6a6d47b56..f6a6d47b56 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-post-req.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-post-resp.json.tpl
index ee5eb23f77..ee5eb23f77 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-post-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/test_keypairs.py b/nova/tests/functional/api_sample_tests/test_keypairs.py
index 8c30730ebc..c67384cd0c 100644
--- a/nova/tests/functional/api_sample_tests/test_keypairs.py
+++ b/nova/tests/functional/api_sample_tests/test_keypairs.py
@@ -23,7 +23,7 @@ from nova.tests.unit import fake_crypto
 
 class KeyPairsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
     microversion = None
-    sample_dir = "keypairs"
+    sample_dir = 'os-keypairs'
     expected_delete_status_code = 202
     expected_post_status_code = 200
 
@@ -246,7 +246,7 @@ class KeyPairsV210SampleJsonTestNotAdmin(KeyPairsV210SampleJsonTest):
 
 class KeyPairsV235SampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
     ADMIN_API = True
-    sample_dir = "keypairs"
+    sample_dir = 'os-keypairs'
     microversion = '2.35'
     expected_post_status_code = 201
     scenarios = [('v2_35', {'api_major_version': 'v2.1'})]