From f2cc1bd7bc9d4d53a0f94e5308f3d582aa945bbb Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Tue, 3 Mar 2015 17:25:31 +0900 Subject: [PATCH] Move V2 sample files to respective directory Some sample files like server, images etc are kept under api_samples/ directory. As plan is to create clean directory structure for sample files for V2, V2.1 and microversion, moving these sample files to respective directory will help to achieve that. Change-Id: I284d035f6fadb26a94bcb3586f4a8c72942ee423 --- .../{ => flavors}/flavor-get-resp.json | 0 .../{ => flavors}/flavors-list-resp.json | 0 .../{ => images}/image-get-resp.json | 0 .../{ => images}/image-meta-key-get.json | 0 .../{ => images}/image-meta-key-put-req.json | 0 .../{ => images}/image-meta-key-put-resp.json | 0 .../{ => images}/image-metadata-get-resp.json | 0 .../{ => images}/image-metadata-post-req.json | 0 .../{ => images}/image-metadata-post-resp.json | 0 .../{ => images}/image-metadata-put-req.json | 0 .../{ => images}/image-metadata-put-resp.json | 0 .../{ => images}/image-metadata-resp.json | 0 .../{ => images}/images-details-get-resp.json | 0 .../{ => images}/images-details-resp.json | 0 .../{ => images}/images-list-get-resp.json | 0 .../{ => images}/images-list-resp.json | 0 .../{ => limits}/limit-get-resp.json | 0 .../server-action-changepassword.json | 0 .../server-action-confirmresize.json | 0 .../server-action-createimage.json | 0 .../{ => servers}/server-action-reboot.json | 0 .../server-action-rebuild-resp.json | 0 .../{ => servers}/server-action-rebuild.json | 0 .../{ => servers}/server-action-resize.json | 0 .../server-action-revertresize.json | 0 .../{ => servers}/server-get-resp.json | 0 .../{ => servers}/server-ips-network-resp.json | 0 .../{ => servers}/server-ips-resp.json | 0 .../{ => servers}/server-metadata-all-req.json | 0 .../{ => servers}/server-metadata-all-resp.json | 0 .../{ => servers}/server-metadata-req.json | 0 .../{ => servers}/server-metadata-resp.json | 0 .../{ => servers}/server-post-req.json | 0 .../{ => servers}/server-post-resp.json | 0 .../{ => servers}/servers-details-resp.json | 0 .../{ => servers}/servers-list-resp.json | 0 .../{ => versions}/versions-get-resp.json | 0 .../{ => flavors}/flavor-get-resp.json.tpl | 0 .../{ => flavors}/flavors-list-resp.json.tpl | 0 .../{ => images}/image-get-resp.json.tpl | 0 .../{ => images}/image-meta-key-get.json.tpl | 0 .../image-meta-key-put-req.json.tpl | 0 .../image-meta-key-put-resp.json.tpl | 0 .../image-metadata-get-resp.json.tpl | 0 .../image-metadata-post-req.json.tpl | 0 .../image-metadata-post-resp.json.tpl | 0 .../image-metadata-put-req.json.tpl | 0 .../image-metadata-put-resp.json.tpl | 0 .../{ => images}/image-metadata-resp.json.tpl | 0 .../images-details-get-resp.json.tpl | 0 .../{ => images}/images-details-resp.json.tpl | 0 .../{ => images}/images-list-get-resp.json.tpl | 0 .../{ => images}/images-list-resp.json.tpl | 0 .../{ => limits}/limit-get-resp.json.tpl | 0 .../server-action-changepassword.json.tpl | 0 .../server-action-confirmresize.json.tpl | 0 .../server-action-createimage.json.tpl | 0 .../{ => servers}/server-action-reboot.json.tpl | 0 .../server-action-rebuild-resp.json.tpl | 0 .../server-action-rebuild.json.tpl | 0 .../{ => servers}/server-action-resize.json.tpl | 0 .../server-action-revertresize.json.tpl | 0 .../{ => servers}/server-get-resp.json.tpl | 0 .../server-ips-network-resp.json.tpl | 0 .../{ => servers}/server-ips-resp.json.tpl | 0 .../server-metadata-all-req.json.tpl | 0 .../server-metadata-all-resp.json.tpl | 0 .../{ => servers}/server-metadata-req.json.tpl | 0 .../{ => servers}/server-metadata-resp.json.tpl | 0 .../{ => servers}/server-post-req.json.tpl | 0 .../{ => servers}/server-post-resp.json.tpl | 0 .../{ => servers}/servers-details-resp.json.tpl | 0 .../{ => servers}/servers-list-resp.json.tpl | 0 .../{ => versions}/versions-get-resp.json.tpl | 0 nova/tests/functional/api_samples_test_base.py | 10 ++++++++-- nova/tests/functional/test_api_samples.py | 17 +++++++++++++++++ 76 files changed, 25 insertions(+), 2 deletions(-) rename doc/api_samples/{ => flavors}/flavor-get-resp.json (100%) rename doc/api_samples/{ => flavors}/flavors-list-resp.json (100%) rename doc/api_samples/{ => images}/image-get-resp.json (100%) rename doc/api_samples/{ => images}/image-meta-key-get.json (100%) rename doc/api_samples/{ => images}/image-meta-key-put-req.json (100%) rename doc/api_samples/{ => images}/image-meta-key-put-resp.json (100%) rename doc/api_samples/{ => images}/image-metadata-get-resp.json (100%) rename doc/api_samples/{ => images}/image-metadata-post-req.json (100%) rename doc/api_samples/{ => images}/image-metadata-post-resp.json (100%) rename doc/api_samples/{ => images}/image-metadata-put-req.json (100%) rename doc/api_samples/{ => images}/image-metadata-put-resp.json (100%) rename doc/api_samples/{ => images}/image-metadata-resp.json (100%) rename doc/api_samples/{ => images}/images-details-get-resp.json (100%) rename doc/api_samples/{ => images}/images-details-resp.json (100%) rename doc/api_samples/{ => images}/images-list-get-resp.json (100%) rename doc/api_samples/{ => images}/images-list-resp.json (100%) rename doc/api_samples/{ => limits}/limit-get-resp.json (100%) rename doc/api_samples/{ => servers}/server-action-changepassword.json (100%) rename doc/api_samples/{ => servers}/server-action-confirmresize.json (100%) rename doc/api_samples/{ => servers}/server-action-createimage.json (100%) rename doc/api_samples/{ => servers}/server-action-reboot.json (100%) rename doc/api_samples/{ => servers}/server-action-rebuild-resp.json (100%) rename doc/api_samples/{ => servers}/server-action-rebuild.json (100%) rename doc/api_samples/{ => servers}/server-action-resize.json (100%) rename doc/api_samples/{ => servers}/server-action-revertresize.json (100%) rename doc/api_samples/{ => servers}/server-get-resp.json (100%) rename doc/api_samples/{ => servers}/server-ips-network-resp.json (100%) rename doc/api_samples/{ => servers}/server-ips-resp.json (100%) rename doc/api_samples/{ => servers}/server-metadata-all-req.json (100%) rename doc/api_samples/{ => servers}/server-metadata-all-resp.json (100%) rename doc/api_samples/{ => servers}/server-metadata-req.json (100%) rename doc/api_samples/{ => servers}/server-metadata-resp.json (100%) rename doc/api_samples/{ => servers}/server-post-req.json (100%) rename doc/api_samples/{ => servers}/server-post-resp.json (100%) rename doc/api_samples/{ => servers}/servers-details-resp.json (100%) rename doc/api_samples/{ => servers}/servers-list-resp.json (100%) rename doc/api_samples/{ => versions}/versions-get-resp.json (100%) rename nova/tests/functional/api_samples/{ => flavors}/flavor-get-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => flavors}/flavors-list-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/image-get-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/image-meta-key-get.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/image-meta-key-put-req.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/image-meta-key-put-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/image-metadata-get-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/image-metadata-post-req.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/image-metadata-post-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/image-metadata-put-req.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/image-metadata-put-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/image-metadata-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/images-details-get-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/images-details-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/images-list-get-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => images}/images-list-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => limits}/limit-get-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-action-changepassword.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-action-confirmresize.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-action-createimage.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-action-reboot.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-action-rebuild.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-action-resize.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-action-revertresize.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-get-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-ips-network-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-ips-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-metadata-all-req.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-metadata-all-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-metadata-req.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-metadata-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-post-req.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/server-post-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/servers-details-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => servers}/servers-list-resp.json.tpl (100%) rename nova/tests/functional/api_samples/{ => versions}/versions-get-resp.json.tpl (100%) diff --git a/doc/api_samples/flavor-get-resp.json b/doc/api_samples/flavors/flavor-get-resp.json similarity index 100% rename from doc/api_samples/flavor-get-resp.json rename to doc/api_samples/flavors/flavor-get-resp.json diff --git a/doc/api_samples/flavors-list-resp.json b/doc/api_samples/flavors/flavors-list-resp.json similarity index 100% rename from doc/api_samples/flavors-list-resp.json rename to doc/api_samples/flavors/flavors-list-resp.json diff --git a/doc/api_samples/image-get-resp.json b/doc/api_samples/images/image-get-resp.json similarity index 100% rename from doc/api_samples/image-get-resp.json rename to doc/api_samples/images/image-get-resp.json diff --git a/doc/api_samples/image-meta-key-get.json b/doc/api_samples/images/image-meta-key-get.json similarity index 100% rename from doc/api_samples/image-meta-key-get.json rename to doc/api_samples/images/image-meta-key-get.json diff --git a/doc/api_samples/image-meta-key-put-req.json b/doc/api_samples/images/image-meta-key-put-req.json similarity index 100% rename from doc/api_samples/image-meta-key-put-req.json rename to doc/api_samples/images/image-meta-key-put-req.json diff --git a/doc/api_samples/image-meta-key-put-resp.json b/doc/api_samples/images/image-meta-key-put-resp.json similarity index 100% rename from doc/api_samples/image-meta-key-put-resp.json rename to doc/api_samples/images/image-meta-key-put-resp.json diff --git a/doc/api_samples/image-metadata-get-resp.json b/doc/api_samples/images/image-metadata-get-resp.json similarity index 100% rename from doc/api_samples/image-metadata-get-resp.json rename to doc/api_samples/images/image-metadata-get-resp.json diff --git a/doc/api_samples/image-metadata-post-req.json b/doc/api_samples/images/image-metadata-post-req.json similarity index 100% rename from doc/api_samples/image-metadata-post-req.json rename to doc/api_samples/images/image-metadata-post-req.json diff --git a/doc/api_samples/image-metadata-post-resp.json b/doc/api_samples/images/image-metadata-post-resp.json similarity index 100% rename from doc/api_samples/image-metadata-post-resp.json rename to doc/api_samples/images/image-metadata-post-resp.json diff --git a/doc/api_samples/image-metadata-put-req.json b/doc/api_samples/images/image-metadata-put-req.json similarity index 100% rename from doc/api_samples/image-metadata-put-req.json rename to doc/api_samples/images/image-metadata-put-req.json diff --git a/doc/api_samples/image-metadata-put-resp.json b/doc/api_samples/images/image-metadata-put-resp.json similarity index 100% rename from doc/api_samples/image-metadata-put-resp.json rename to doc/api_samples/images/image-metadata-put-resp.json diff --git a/doc/api_samples/image-metadata-resp.json b/doc/api_samples/images/image-metadata-resp.json similarity index 100% rename from doc/api_samples/image-metadata-resp.json rename to doc/api_samples/images/image-metadata-resp.json diff --git a/doc/api_samples/images-details-get-resp.json b/doc/api_samples/images/images-details-get-resp.json similarity index 100% rename from doc/api_samples/images-details-get-resp.json rename to doc/api_samples/images/images-details-get-resp.json diff --git a/doc/api_samples/images-details-resp.json b/doc/api_samples/images/images-details-resp.json similarity index 100% rename from doc/api_samples/images-details-resp.json rename to doc/api_samples/images/images-details-resp.json diff --git a/doc/api_samples/images-list-get-resp.json b/doc/api_samples/images/images-list-get-resp.json similarity index 100% rename from doc/api_samples/images-list-get-resp.json rename to doc/api_samples/images/images-list-get-resp.json diff --git a/doc/api_samples/images-list-resp.json b/doc/api_samples/images/images-list-resp.json similarity index 100% rename from doc/api_samples/images-list-resp.json rename to doc/api_samples/images/images-list-resp.json diff --git a/doc/api_samples/limit-get-resp.json b/doc/api_samples/limits/limit-get-resp.json similarity index 100% rename from doc/api_samples/limit-get-resp.json rename to doc/api_samples/limits/limit-get-resp.json diff --git a/doc/api_samples/server-action-changepassword.json b/doc/api_samples/servers/server-action-changepassword.json similarity index 100% rename from doc/api_samples/server-action-changepassword.json rename to doc/api_samples/servers/server-action-changepassword.json diff --git a/doc/api_samples/server-action-confirmresize.json b/doc/api_samples/servers/server-action-confirmresize.json similarity index 100% rename from doc/api_samples/server-action-confirmresize.json rename to doc/api_samples/servers/server-action-confirmresize.json diff --git a/doc/api_samples/server-action-createimage.json b/doc/api_samples/servers/server-action-createimage.json similarity index 100% rename from doc/api_samples/server-action-createimage.json rename to doc/api_samples/servers/server-action-createimage.json diff --git a/doc/api_samples/server-action-reboot.json b/doc/api_samples/servers/server-action-reboot.json similarity index 100% rename from doc/api_samples/server-action-reboot.json rename to doc/api_samples/servers/server-action-reboot.json diff --git a/doc/api_samples/server-action-rebuild-resp.json b/doc/api_samples/servers/server-action-rebuild-resp.json similarity index 100% rename from doc/api_samples/server-action-rebuild-resp.json rename to doc/api_samples/servers/server-action-rebuild-resp.json diff --git a/doc/api_samples/server-action-rebuild.json b/doc/api_samples/servers/server-action-rebuild.json similarity index 100% rename from doc/api_samples/server-action-rebuild.json rename to doc/api_samples/servers/server-action-rebuild.json diff --git a/doc/api_samples/server-action-resize.json b/doc/api_samples/servers/server-action-resize.json similarity index 100% rename from doc/api_samples/server-action-resize.json rename to doc/api_samples/servers/server-action-resize.json diff --git a/doc/api_samples/server-action-revertresize.json b/doc/api_samples/servers/server-action-revertresize.json similarity index 100% rename from doc/api_samples/server-action-revertresize.json rename to doc/api_samples/servers/server-action-revertresize.json diff --git a/doc/api_samples/server-get-resp.json b/doc/api_samples/servers/server-get-resp.json similarity index 100% rename from doc/api_samples/server-get-resp.json rename to doc/api_samples/servers/server-get-resp.json diff --git a/doc/api_samples/server-ips-network-resp.json b/doc/api_samples/servers/server-ips-network-resp.json similarity index 100% rename from doc/api_samples/server-ips-network-resp.json rename to doc/api_samples/servers/server-ips-network-resp.json diff --git a/doc/api_samples/server-ips-resp.json b/doc/api_samples/servers/server-ips-resp.json similarity index 100% rename from doc/api_samples/server-ips-resp.json rename to doc/api_samples/servers/server-ips-resp.json diff --git a/doc/api_samples/server-metadata-all-req.json b/doc/api_samples/servers/server-metadata-all-req.json similarity index 100% rename from doc/api_samples/server-metadata-all-req.json rename to doc/api_samples/servers/server-metadata-all-req.json diff --git a/doc/api_samples/server-metadata-all-resp.json b/doc/api_samples/servers/server-metadata-all-resp.json similarity index 100% rename from doc/api_samples/server-metadata-all-resp.json rename to doc/api_samples/servers/server-metadata-all-resp.json diff --git a/doc/api_samples/server-metadata-req.json b/doc/api_samples/servers/server-metadata-req.json similarity index 100% rename from doc/api_samples/server-metadata-req.json rename to doc/api_samples/servers/server-metadata-req.json diff --git a/doc/api_samples/server-metadata-resp.json b/doc/api_samples/servers/server-metadata-resp.json similarity index 100% rename from doc/api_samples/server-metadata-resp.json rename to doc/api_samples/servers/server-metadata-resp.json diff --git a/doc/api_samples/server-post-req.json b/doc/api_samples/servers/server-post-req.json similarity index 100% rename from doc/api_samples/server-post-req.json rename to doc/api_samples/servers/server-post-req.json diff --git a/doc/api_samples/server-post-resp.json b/doc/api_samples/servers/server-post-resp.json similarity index 100% rename from doc/api_samples/server-post-resp.json rename to doc/api_samples/servers/server-post-resp.json diff --git a/doc/api_samples/servers-details-resp.json b/doc/api_samples/servers/servers-details-resp.json similarity index 100% rename from doc/api_samples/servers-details-resp.json rename to doc/api_samples/servers/servers-details-resp.json diff --git a/doc/api_samples/servers-list-resp.json b/doc/api_samples/servers/servers-list-resp.json similarity index 100% rename from doc/api_samples/servers-list-resp.json rename to doc/api_samples/servers/servers-list-resp.json diff --git a/doc/api_samples/versions-get-resp.json b/doc/api_samples/versions/versions-get-resp.json similarity index 100% rename from doc/api_samples/versions-get-resp.json rename to doc/api_samples/versions/versions-get-resp.json diff --git a/nova/tests/functional/api_samples/flavor-get-resp.json.tpl b/nova/tests/functional/api_samples/flavors/flavor-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/flavor-get-resp.json.tpl rename to nova/tests/functional/api_samples/flavors/flavor-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/flavors-list-resp.json.tpl b/nova/tests/functional/api_samples/flavors/flavors-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/flavors-list-resp.json.tpl rename to nova/tests/functional/api_samples/flavors/flavors-list-resp.json.tpl diff --git a/nova/tests/functional/api_samples/image-get-resp.json.tpl b/nova/tests/functional/api_samples/images/image-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/image-get-resp.json.tpl rename to nova/tests/functional/api_samples/images/image-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/image-meta-key-get.json.tpl b/nova/tests/functional/api_samples/images/image-meta-key-get.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/image-meta-key-get.json.tpl rename to nova/tests/functional/api_samples/images/image-meta-key-get.json.tpl diff --git a/nova/tests/functional/api_samples/image-meta-key-put-req.json.tpl b/nova/tests/functional/api_samples/images/image-meta-key-put-req.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/image-meta-key-put-req.json.tpl rename to nova/tests/functional/api_samples/images/image-meta-key-put-req.json.tpl diff --git a/nova/tests/functional/api_samples/image-meta-key-put-resp.json.tpl b/nova/tests/functional/api_samples/images/image-meta-key-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/image-meta-key-put-resp.json.tpl rename to nova/tests/functional/api_samples/images/image-meta-key-put-resp.json.tpl diff --git a/nova/tests/functional/api_samples/image-metadata-get-resp.json.tpl b/nova/tests/functional/api_samples/images/image-metadata-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/image-metadata-get-resp.json.tpl rename to nova/tests/functional/api_samples/images/image-metadata-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/image-metadata-post-req.json.tpl b/nova/tests/functional/api_samples/images/image-metadata-post-req.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/image-metadata-post-req.json.tpl rename to nova/tests/functional/api_samples/images/image-metadata-post-req.json.tpl diff --git a/nova/tests/functional/api_samples/image-metadata-post-resp.json.tpl b/nova/tests/functional/api_samples/images/image-metadata-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/image-metadata-post-resp.json.tpl rename to nova/tests/functional/api_samples/images/image-metadata-post-resp.json.tpl diff --git a/nova/tests/functional/api_samples/image-metadata-put-req.json.tpl b/nova/tests/functional/api_samples/images/image-metadata-put-req.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/image-metadata-put-req.json.tpl rename to nova/tests/functional/api_samples/images/image-metadata-put-req.json.tpl diff --git a/nova/tests/functional/api_samples/image-metadata-put-resp.json.tpl b/nova/tests/functional/api_samples/images/image-metadata-put-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/image-metadata-put-resp.json.tpl rename to nova/tests/functional/api_samples/images/image-metadata-put-resp.json.tpl diff --git a/nova/tests/functional/api_samples/image-metadata-resp.json.tpl b/nova/tests/functional/api_samples/images/image-metadata-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/image-metadata-resp.json.tpl rename to nova/tests/functional/api_samples/images/image-metadata-resp.json.tpl diff --git a/nova/tests/functional/api_samples/images-details-get-resp.json.tpl b/nova/tests/functional/api_samples/images/images-details-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/images-details-get-resp.json.tpl rename to nova/tests/functional/api_samples/images/images-details-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/images-details-resp.json.tpl b/nova/tests/functional/api_samples/images/images-details-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/images-details-resp.json.tpl rename to nova/tests/functional/api_samples/images/images-details-resp.json.tpl diff --git a/nova/tests/functional/api_samples/images-list-get-resp.json.tpl b/nova/tests/functional/api_samples/images/images-list-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/images-list-get-resp.json.tpl rename to nova/tests/functional/api_samples/images/images-list-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/images-list-resp.json.tpl b/nova/tests/functional/api_samples/images/images-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/images-list-resp.json.tpl rename to nova/tests/functional/api_samples/images/images-list-resp.json.tpl diff --git a/nova/tests/functional/api_samples/limit-get-resp.json.tpl b/nova/tests/functional/api_samples/limits/limit-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/limit-get-resp.json.tpl rename to nova/tests/functional/api_samples/limits/limit-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/server-action-changepassword.json.tpl b/nova/tests/functional/api_samples/servers/server-action-changepassword.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-action-changepassword.json.tpl rename to nova/tests/functional/api_samples/servers/server-action-changepassword.json.tpl diff --git a/nova/tests/functional/api_samples/server-action-confirmresize.json.tpl b/nova/tests/functional/api_samples/servers/server-action-confirmresize.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-action-confirmresize.json.tpl rename to nova/tests/functional/api_samples/servers/server-action-confirmresize.json.tpl diff --git a/nova/tests/functional/api_samples/server-action-createimage.json.tpl b/nova/tests/functional/api_samples/servers/server-action-createimage.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-action-createimage.json.tpl rename to nova/tests/functional/api_samples/servers/server-action-createimage.json.tpl diff --git a/nova/tests/functional/api_samples/server-action-reboot.json.tpl b/nova/tests/functional/api_samples/servers/server-action-reboot.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-action-reboot.json.tpl rename to nova/tests/functional/api_samples/servers/server-action-reboot.json.tpl diff --git a/nova/tests/functional/api_samples/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_samples/servers/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-action-rebuild-resp.json.tpl rename to nova/tests/functional/api_samples/servers/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/functional/api_samples/server-action-rebuild.json.tpl b/nova/tests/functional/api_samples/servers/server-action-rebuild.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-action-rebuild.json.tpl rename to nova/tests/functional/api_samples/servers/server-action-rebuild.json.tpl diff --git a/nova/tests/functional/api_samples/server-action-resize.json.tpl b/nova/tests/functional/api_samples/servers/server-action-resize.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-action-resize.json.tpl rename to nova/tests/functional/api_samples/servers/server-action-resize.json.tpl diff --git a/nova/tests/functional/api_samples/server-action-revertresize.json.tpl b/nova/tests/functional/api_samples/servers/server-action-revertresize.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-action-revertresize.json.tpl rename to nova/tests/functional/api_samples/servers/server-action-revertresize.json.tpl diff --git a/nova/tests/functional/api_samples/server-get-resp.json.tpl b/nova/tests/functional/api_samples/servers/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-get-resp.json.tpl rename to nova/tests/functional/api_samples/servers/server-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/server-ips-network-resp.json.tpl b/nova/tests/functional/api_samples/servers/server-ips-network-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-ips-network-resp.json.tpl rename to nova/tests/functional/api_samples/servers/server-ips-network-resp.json.tpl diff --git a/nova/tests/functional/api_samples/server-ips-resp.json.tpl b/nova/tests/functional/api_samples/servers/server-ips-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-ips-resp.json.tpl rename to nova/tests/functional/api_samples/servers/server-ips-resp.json.tpl diff --git a/nova/tests/functional/api_samples/server-metadata-all-req.json.tpl b/nova/tests/functional/api_samples/servers/server-metadata-all-req.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-metadata-all-req.json.tpl rename to nova/tests/functional/api_samples/servers/server-metadata-all-req.json.tpl diff --git a/nova/tests/functional/api_samples/server-metadata-all-resp.json.tpl b/nova/tests/functional/api_samples/servers/server-metadata-all-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-metadata-all-resp.json.tpl rename to nova/tests/functional/api_samples/servers/server-metadata-all-resp.json.tpl diff --git a/nova/tests/functional/api_samples/server-metadata-req.json.tpl b/nova/tests/functional/api_samples/servers/server-metadata-req.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-metadata-req.json.tpl rename to nova/tests/functional/api_samples/servers/server-metadata-req.json.tpl diff --git a/nova/tests/functional/api_samples/server-metadata-resp.json.tpl b/nova/tests/functional/api_samples/servers/server-metadata-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-metadata-resp.json.tpl rename to nova/tests/functional/api_samples/servers/server-metadata-resp.json.tpl diff --git a/nova/tests/functional/api_samples/server-post-req.json.tpl b/nova/tests/functional/api_samples/servers/server-post-req.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-post-req.json.tpl rename to nova/tests/functional/api_samples/servers/server-post-req.json.tpl diff --git a/nova/tests/functional/api_samples/server-post-resp.json.tpl b/nova/tests/functional/api_samples/servers/server-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/server-post-resp.json.tpl rename to nova/tests/functional/api_samples/servers/server-post-resp.json.tpl diff --git a/nova/tests/functional/api_samples/servers-details-resp.json.tpl b/nova/tests/functional/api_samples/servers/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/servers-details-resp.json.tpl rename to nova/tests/functional/api_samples/servers/servers-details-resp.json.tpl diff --git a/nova/tests/functional/api_samples/servers-list-resp.json.tpl b/nova/tests/functional/api_samples/servers/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/servers-list-resp.json.tpl rename to nova/tests/functional/api_samples/servers/servers-list-resp.json.tpl diff --git a/nova/tests/functional/api_samples/versions-get-resp.json.tpl b/nova/tests/functional/api_samples/versions/versions-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/versions-get-resp.json.tpl rename to nova/tests/functional/api_samples/versions/versions-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples_test_base.py b/nova/tests/functional/api_samples_test_base.py index 1d15802835..2a263213b1 100644 --- a/nova/tests/functional/api_samples_test_base.py +++ b/nova/tests/functional/api_samples_test_base.py @@ -32,6 +32,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): ctype = 'json' all_extensions = False extension_name = None + sample_dir = None request_api_version = None _use_common_server_api_samples = False @@ -54,8 +55,13 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): if cls.all_extensions: parts.append('all_extensions') # Note(gmann): if _use_common_server_api_samples is set to True - # then common server sample files will be used. - if not cls._use_common_server_api_samples and cls.extension_name: + # then common server sample files present in 'servers' directory + # will be used. + elif cls._use_common_server_api_samples: + parts.append('servers') + elif cls.sample_dir: + parts.append(cls.sample_dir) + elif cls.extension_name: alias = importutils.import_class(cls.extension_name).alias parts.append(alias) parts.append(name + "." + cls.ctype + suffix) diff --git a/nova/tests/functional/test_api_samples.py b/nova/tests/functional/test_api_samples.py index 0e84c63967..9499f46fc8 100644 --- a/nova/tests/functional/test_api_samples.py +++ b/nova/tests/functional/test_api_samples.py @@ -161,6 +161,8 @@ class ApiSamplesTrap(ApiSampleTestBaseV2): class VersionsSampleJsonTest(ApiSampleTestBaseV2): + sample_dir = 'versions' + def test_versions_get(self): response = self._do_get('', strip_version=True) subs = self._get_regexes() @@ -192,6 +194,8 @@ class ServersSampleBase(ApiSampleTestBaseV2): class ServersSampleJsonTest(ServersSampleBase): + sample_dir = 'servers' + def test_servers_post(self): return self._post_server() @@ -228,6 +232,7 @@ class ServersSampleAllExtensionJsonTest(ServersSampleJsonTest): class ServersSampleHideAddressesJsonTest(ServersSampleJsonTest): + sample_dir = None extension_name = '.'.join(('nova.api.openstack.compute.contrib', 'hide_server_addresses', 'Hide_server_addresses')) @@ -247,6 +252,8 @@ class ServersSampleMultiStatusJsonTest(ServersSampleBase): class ServersMetadataJsonTest(ServersSampleBase): + sample_dir = 'servers' + def _create_and_set(self, subs): uuid = self._post_server() response = self._do_put('servers/%s/metadata' % uuid, @@ -308,6 +315,8 @@ class ServersMetadataJsonTest(ServersSampleBase): class ServersIpsJsonTest(ServersSampleBase): + sample_dir = 'servers' + def test_get(self): # Test getting a server's IP information. uuid = self._post_server() @@ -333,6 +342,7 @@ class ExtensionsSampleJsonTest(ApiSampleTestBaseV2): class FlavorsSampleJsonTest(ApiSampleTestBaseV2): + sample_dir = 'flavors' def test_flavors_get(self): response = self._do_get('flavors/1') @@ -386,6 +396,8 @@ class FlavorsSampleAllExtensionJsonTest(FlavorsSampleJsonTest): class ImagesSampleJsonTest(ApiSampleTestBaseV2): + sample_dir = 'images' + def test_images_list(self): # Get api sample of images get list request. response = self._do_get('images') @@ -450,6 +462,8 @@ class ImagesSampleJsonTest(ApiSampleTestBaseV2): class LimitsSampleJsonTest(ApiSampleTestBaseV2): + sample_dir = 'limits' + def test_limits_get(self): response = self._do_get('limits') subs = self._get_regexes() @@ -457,6 +471,8 @@ class LimitsSampleJsonTest(ApiSampleTestBaseV2): class ServersActionsJsonTest(ServersSampleBase): + sample_dir = 'servers' + def _test_server_action(self, uuid, action, subs=None, resp_tpl=None, code=202): subs = subs or {} @@ -4057,6 +4073,7 @@ class ServerGroupsSampleJsonTest(ServersSampleBase): class ServerGroupQuotas_LimitsSampleJsonTest(LimitsSampleJsonTest): + sample_dir = None extension_name = ("nova.api.openstack.compute.contrib." "server_group_quotas.Server_group_quotas")