From 3024e16881e04d160741c2578b2a651d54431689 Mon Sep 17 00:00:00 2001 From: He Jie Xu Date: Fri, 14 Aug 2015 15:31:20 +0800 Subject: [PATCH] Move legacy v2 api smaple tests This patch moves legacy v2 api sample tests under 'nova/tests/functional/api_sample_tests/legacy_v2' Also create new API sample test base class for matching new path in 'nova/tests/functional/api_sample_tests/legacy_v2/ - api_samples_test_base.py' Change-Id: Ib455d4fc9d1f9a2a7e9a744f7e63086b3cf49c5e Partial-Bug: #1462901 --- .../OS-EXT-IPS-MAC/server-get-resp.json | 0 .../OS-EXT-IPS-MAC/servers-detail-resp.json | 0 .../OS-EXT-IPS/server-get-resp.json | 0 .../OS-EXT-IPS/servers-detail-resp.json | 0 .../OS-EXT-VIF-NET/vifs-list-resp.json | 0 .../all_extensions/flavor-get-resp.json | 0 .../all_extensions/flavors-list-resp.json | 0 .../server-action-changepassword.json | 0 .../server-action-confirmresize.json | 0 .../server-action-createimage.json | 0 .../all_extensions/server-action-reboot.json | 0 .../server-action-rebuild-resp.json | 0 .../all_extensions/server-action-rebuild.json | 0 .../all_extensions/server-action-resize.json | 0 .../server-action-revertresize.json | 0 .../all_extensions/server-get-resp.json | 0 .../all_extensions/server-post-req.json | 0 .../all_extensions/server-post-resp.json | 0 .../all_extensions/servers-details-resp.json | 0 .../all_extensions/servers-list-resp.json | 0 .../flavors/flavor-get-resp.json | 0 .../flavors/flavors-list-resp.json | 0 .../limits/limit-get-resp.json | 0 .../os-admin-actions/admin-actions-lock.json | 0 .../baremetal-node-add-interface-req.json | 0 .../baremetal-node-add-interface-resp.json | 0 .../baremetal-node-create-req.json | 0 .../baremetal-node-create-resp.json | 0 ...aremetal-node-create-with-address-req.json | 0 ...remetal-node-create-with-address-resp.json | 0 .../baremetal-node-list-resp.json | 0 .../baremetal-node-remove-interface-req.json | 0 .../baremetal-node-show-resp.json | 0 .../floating-ips-create-req.json | 0 .../floating-ips-create-resp.json | 0 .../floating-ips-get-resp.json | 0 .../floating-ips-list-empty-resp.json | 0 .../floating-ips-list-resp.json | 0 .../server-get-resp-rescue.json | 0 .../server-rescue-req.json | 0 .../server-rescue.json | 0 .../limit-get-resp.json | 0 .../usedlimits-get-resp.json | 0 .../servers-list-resp.json | 0 .../usedlimitsforadmin-get-resp.json | 0 .../os-used-limits/usedlimits-get-resp.json | 0 .../os-virtual-interfaces/vifs-list-resp.json | 0 .../servers/server-post-req.json | 0 .../servers/server-post-resp.json | 0 .../versions/versions-get-resp.json | 0 .../__init__.py} | 0 .../OS-EXT-IPS-MAC/server-get-resp.json.tpl | 0 .../servers-detail-resp.json.tpl | 0 .../OS-EXT-IPS/server-get-resp.json.tpl | 0 .../OS-EXT-IPS/servers-detail-resp.json.tpl | 0 .../OS-EXT-VIF-NET/vifs-list-resp.json.tpl | 0 .../legacy_v2}/README.rst | 0 .../api_sample_tests/legacy_v2/__init__.py | 0 .../all_extensions/flavor-get-resp.json.tpl | 0 .../all_extensions/flavors-list-resp.json.tpl | 0 .../server-action-changepassword.json.tpl | 0 .../server-action-confirmresize.json.tpl | 0 .../server-action-createimage.json.tpl | 0 .../server-action-reboot.json.tpl | 0 .../server-action-rebuild-resp.json.tpl | 0 .../server-action-rebuild.json.tpl | 0 .../server-action-resize.json.tpl | 0 .../server-action-revertresize.json.tpl | 0 .../all_extensions/server-get-resp.json.tpl | 0 .../all_extensions/server-post-req.json.tpl | 0 .../all_extensions/server-post-resp.json.tpl | 0 .../servers-details-resp.json.tpl | 0 .../all_extensions/servers-list-resp.json.tpl | 0 .../legacy_v2/api_samples_test_base.py | 53 +++++++++++++++++++ .../flavors/flavor-get-resp.json.tpl | 0 .../flavors/flavors-list-resp.json.tpl | 0 .../legacy_v2}/limits/limit-get-resp.json.tpl | 0 .../floating-ips-create-nopool-req.json.tpl | 0 .../floating-ips-create-req.json.tpl | 0 .../floating-ips-create-resp.json.tpl | 0 .../floating-ips-get-resp.json.tpl | 0 .../floating-ips-list-empty-resp.json.tpl | 0 .../floating-ips-list-resp.json.tpl | 0 .../server-get-resp-rescue.json.tpl | 0 .../server-rescue-req.json.tpl | 0 .../server-rescue.json.tpl | 0 .../limit-get-resp.json.tpl | 0 .../usedlimits-get-resp.json.tpl | 0 .../servers-list-resp.json.tpl | 0 .../usedlimitsforadmin-get-resp.json.tpl | 0 .../usedlimits-get-resp.json.tpl | 0 .../vifs-list-resp.json.tpl | 0 .../servers/server-post-req.json.tpl | 0 .../servers/server-post-resp.json.tpl | 0 .../legacy_v2}/test_api_samples.py | 3 +- .../versions/versions-get-resp.json.tpl | 0 96 files changed, 55 insertions(+), 1 deletion(-) rename doc/api_samples/{ => legacy_v2}/OS-EXT-IPS-MAC/server-get-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/OS-EXT-IPS-MAC/servers-detail-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/OS-EXT-IPS/server-get-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/OS-EXT-IPS/servers-detail-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/OS-EXT-VIF-NET/vifs-list-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/flavor-get-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/flavors-list-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/server-action-changepassword.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/server-action-confirmresize.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/server-action-createimage.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/server-action-reboot.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/server-action-rebuild-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/server-action-rebuild.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/server-action-resize.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/server-action-revertresize.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/server-get-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/server-post-req.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/server-post-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/servers-details-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/all_extensions/servers-list-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/flavors/flavor-get-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/flavors/flavors-list-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/limits/limit-get-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-admin-actions/admin-actions-lock.json (100%) rename doc/api_samples/{ => legacy_v2}/os-baremetal-ext-status/baremetal-node-add-interface-req.json (100%) rename doc/api_samples/{ => legacy_v2}/os-baremetal-ext-status/baremetal-node-add-interface-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-baremetal-ext-status/baremetal-node-create-req.json (100%) rename doc/api_samples/{ => legacy_v2}/os-baremetal-ext-status/baremetal-node-create-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-baremetal-ext-status/baremetal-node-create-with-address-req.json (100%) rename doc/api_samples/{ => legacy_v2}/os-baremetal-ext-status/baremetal-node-create-with-address-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-baremetal-ext-status/baremetal-node-list-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-baremetal-ext-status/baremetal-node-remove-interface-req.json (100%) rename doc/api_samples/{ => legacy_v2}/os-baremetal-ext-status/baremetal-node-show-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-extended-floating-ips/floating-ips-create-req.json (100%) rename doc/api_samples/{ => legacy_v2}/os-extended-floating-ips/floating-ips-create-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-extended-floating-ips/floating-ips-get-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-extended-floating-ips/floating-ips-list-empty-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-extended-floating-ips/floating-ips-list-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-extended-rescue-with-image/server-get-resp-rescue.json (100%) rename doc/api_samples/{ => legacy_v2}/os-extended-rescue-with-image/server-rescue-req.json (100%) rename doc/api_samples/{ => legacy_v2}/os-extended-rescue-with-image/server-rescue.json (100%) rename doc/api_samples/{ => legacy_v2}/os-server-group-quotas/limit-get-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-server-group-quotas/usedlimits-get-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-server-list-multi-status/servers-list-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-used-limits/usedlimits-get-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/os-virtual-interfaces/vifs-list-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/servers/server-post-req.json (100%) rename doc/api_samples/{ => legacy_v2}/servers/server-post-resp.json (100%) rename doc/api_samples/{ => legacy_v2}/versions/versions-get-resp.json (100%) rename nova/tests/functional/{api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.json.tpl => api_sample_tests/__init__.py} (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/OS-EXT-IPS-MAC/server-get-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/OS-EXT-IPS/server-get-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/OS-EXT-IPS/servers-detail-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/OS-EXT-VIF-NET/vifs-list-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/README.rst (100%) create mode 100644 nova/tests/functional/api_sample_tests/legacy_v2/__init__.py rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/flavor-get-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/flavors-list-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/server-action-changepassword.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/server-action-confirmresize.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/server-action-createimage.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/server-action-reboot.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/server-action-rebuild-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/server-action-rebuild.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/server-action-resize.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/server-action-revertresize.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/server-get-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/server-post-req.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/server-post-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/servers-details-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/all_extensions/servers-list-resp.json.tpl (100%) create mode 100644 nova/tests/functional/api_sample_tests/legacy_v2/api_samples_test_base.py rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/flavors/flavor-get-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/flavors/flavors-list-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/limits/limit-get-resp.json.tpl (100%) create mode 100644 nova/tests/functional/api_sample_tests/legacy_v2/os-extended-floating-ips/floating-ips-create-nopool-req.json.tpl rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-extended-floating-ips/floating-ips-create-req.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-extended-floating-ips/floating-ips-create-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-extended-floating-ips/floating-ips-get-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-extended-floating-ips/floating-ips-list-empty-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-extended-floating-ips/floating-ips-list-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-extended-rescue-with-image/server-rescue-req.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-extended-rescue-with-image/server-rescue.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-server-group-quotas/limit-get-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-server-group-quotas/usedlimits-get-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-server-list-multi-status/servers-list-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-used-limits/usedlimits-get-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/os-virtual-interfaces/vifs-list-resp.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/servers/server-post-req.json.tpl (100%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/servers/server-post-resp.json.tpl (100%) rename nova/tests/functional/{ => api_sample_tests/legacy_v2}/test_api_samples.py (99%) rename nova/tests/functional/{api_samples => api_sample_tests/legacy_v2}/versions/versions-get-resp.json.tpl (100%) diff --git a/doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.json b/doc/api_samples/legacy_v2/OS-EXT-IPS-MAC/server-get-resp.json similarity index 100% rename from doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.json rename to doc/api_samples/legacy_v2/OS-EXT-IPS-MAC/server-get-resp.json diff --git a/doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json b/doc/api_samples/legacy_v2/OS-EXT-IPS-MAC/servers-detail-resp.json similarity index 100% rename from doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json rename to doc/api_samples/legacy_v2/OS-EXT-IPS-MAC/servers-detail-resp.json diff --git a/doc/api_samples/OS-EXT-IPS/server-get-resp.json b/doc/api_samples/legacy_v2/OS-EXT-IPS/server-get-resp.json similarity index 100% rename from doc/api_samples/OS-EXT-IPS/server-get-resp.json rename to doc/api_samples/legacy_v2/OS-EXT-IPS/server-get-resp.json diff --git a/doc/api_samples/OS-EXT-IPS/servers-detail-resp.json b/doc/api_samples/legacy_v2/OS-EXT-IPS/servers-detail-resp.json similarity index 100% rename from doc/api_samples/OS-EXT-IPS/servers-detail-resp.json rename to doc/api_samples/legacy_v2/OS-EXT-IPS/servers-detail-resp.json diff --git a/doc/api_samples/OS-EXT-VIF-NET/vifs-list-resp.json b/doc/api_samples/legacy_v2/OS-EXT-VIF-NET/vifs-list-resp.json similarity index 100% rename from doc/api_samples/OS-EXT-VIF-NET/vifs-list-resp.json rename to doc/api_samples/legacy_v2/OS-EXT-VIF-NET/vifs-list-resp.json diff --git a/doc/api_samples/all_extensions/flavor-get-resp.json b/doc/api_samples/legacy_v2/all_extensions/flavor-get-resp.json similarity index 100% rename from doc/api_samples/all_extensions/flavor-get-resp.json rename to doc/api_samples/legacy_v2/all_extensions/flavor-get-resp.json diff --git a/doc/api_samples/all_extensions/flavors-list-resp.json b/doc/api_samples/legacy_v2/all_extensions/flavors-list-resp.json similarity index 100% rename from doc/api_samples/all_extensions/flavors-list-resp.json rename to doc/api_samples/legacy_v2/all_extensions/flavors-list-resp.json diff --git a/doc/api_samples/all_extensions/server-action-changepassword.json b/doc/api_samples/legacy_v2/all_extensions/server-action-changepassword.json similarity index 100% rename from doc/api_samples/all_extensions/server-action-changepassword.json rename to doc/api_samples/legacy_v2/all_extensions/server-action-changepassword.json diff --git a/doc/api_samples/all_extensions/server-action-confirmresize.json b/doc/api_samples/legacy_v2/all_extensions/server-action-confirmresize.json similarity index 100% rename from doc/api_samples/all_extensions/server-action-confirmresize.json rename to doc/api_samples/legacy_v2/all_extensions/server-action-confirmresize.json diff --git a/doc/api_samples/all_extensions/server-action-createimage.json b/doc/api_samples/legacy_v2/all_extensions/server-action-createimage.json similarity index 100% rename from doc/api_samples/all_extensions/server-action-createimage.json rename to doc/api_samples/legacy_v2/all_extensions/server-action-createimage.json diff --git a/doc/api_samples/all_extensions/server-action-reboot.json b/doc/api_samples/legacy_v2/all_extensions/server-action-reboot.json similarity index 100% rename from doc/api_samples/all_extensions/server-action-reboot.json rename to doc/api_samples/legacy_v2/all_extensions/server-action-reboot.json diff --git a/doc/api_samples/all_extensions/server-action-rebuild-resp.json b/doc/api_samples/legacy_v2/all_extensions/server-action-rebuild-resp.json similarity index 100% rename from doc/api_samples/all_extensions/server-action-rebuild-resp.json rename to doc/api_samples/legacy_v2/all_extensions/server-action-rebuild-resp.json diff --git a/doc/api_samples/all_extensions/server-action-rebuild.json b/doc/api_samples/legacy_v2/all_extensions/server-action-rebuild.json similarity index 100% rename from doc/api_samples/all_extensions/server-action-rebuild.json rename to doc/api_samples/legacy_v2/all_extensions/server-action-rebuild.json diff --git a/doc/api_samples/all_extensions/server-action-resize.json b/doc/api_samples/legacy_v2/all_extensions/server-action-resize.json similarity index 100% rename from doc/api_samples/all_extensions/server-action-resize.json rename to doc/api_samples/legacy_v2/all_extensions/server-action-resize.json diff --git a/doc/api_samples/all_extensions/server-action-revertresize.json b/doc/api_samples/legacy_v2/all_extensions/server-action-revertresize.json similarity index 100% rename from doc/api_samples/all_extensions/server-action-revertresize.json rename to doc/api_samples/legacy_v2/all_extensions/server-action-revertresize.json diff --git a/doc/api_samples/all_extensions/server-get-resp.json b/doc/api_samples/legacy_v2/all_extensions/server-get-resp.json similarity index 100% rename from doc/api_samples/all_extensions/server-get-resp.json rename to doc/api_samples/legacy_v2/all_extensions/server-get-resp.json diff --git a/doc/api_samples/all_extensions/server-post-req.json b/doc/api_samples/legacy_v2/all_extensions/server-post-req.json similarity index 100% rename from doc/api_samples/all_extensions/server-post-req.json rename to doc/api_samples/legacy_v2/all_extensions/server-post-req.json diff --git a/doc/api_samples/all_extensions/server-post-resp.json b/doc/api_samples/legacy_v2/all_extensions/server-post-resp.json similarity index 100% rename from doc/api_samples/all_extensions/server-post-resp.json rename to doc/api_samples/legacy_v2/all_extensions/server-post-resp.json diff --git a/doc/api_samples/all_extensions/servers-details-resp.json b/doc/api_samples/legacy_v2/all_extensions/servers-details-resp.json similarity index 100% rename from doc/api_samples/all_extensions/servers-details-resp.json rename to doc/api_samples/legacy_v2/all_extensions/servers-details-resp.json diff --git a/doc/api_samples/all_extensions/servers-list-resp.json b/doc/api_samples/legacy_v2/all_extensions/servers-list-resp.json similarity index 100% rename from doc/api_samples/all_extensions/servers-list-resp.json rename to doc/api_samples/legacy_v2/all_extensions/servers-list-resp.json diff --git a/doc/api_samples/flavors/flavor-get-resp.json b/doc/api_samples/legacy_v2/flavors/flavor-get-resp.json similarity index 100% rename from doc/api_samples/flavors/flavor-get-resp.json rename to doc/api_samples/legacy_v2/flavors/flavor-get-resp.json diff --git a/doc/api_samples/flavors/flavors-list-resp.json b/doc/api_samples/legacy_v2/flavors/flavors-list-resp.json similarity index 100% rename from doc/api_samples/flavors/flavors-list-resp.json rename to doc/api_samples/legacy_v2/flavors/flavors-list-resp.json diff --git a/doc/api_samples/limits/limit-get-resp.json b/doc/api_samples/legacy_v2/limits/limit-get-resp.json similarity index 100% rename from doc/api_samples/limits/limit-get-resp.json rename to doc/api_samples/legacy_v2/limits/limit-get-resp.json diff --git a/doc/api_samples/os-admin-actions/admin-actions-lock.json b/doc/api_samples/legacy_v2/os-admin-actions/admin-actions-lock.json similarity index 100% rename from doc/api_samples/os-admin-actions/admin-actions-lock.json rename to doc/api_samples/legacy_v2/os-admin-actions/admin-actions-lock.json diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.json b/doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-add-interface-req.json similarity index 100% rename from doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.json rename to doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-add-interface-req.json diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.json b/doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-add-interface-resp.json similarity index 100% rename from doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.json rename to doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-add-interface-resp.json diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-req.json b/doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-create-req.json similarity index 100% rename from doc/api_samples/os-baremetal-ext-status/baremetal-node-create-req.json rename to doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-create-req.json diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.json b/doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-create-resp.json similarity index 100% rename from doc/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.json rename to doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-create-resp.json diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.json b/doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-create-with-address-req.json similarity index 100% rename from doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.json rename to doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-create-with-address-req.json diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.json b/doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-create-with-address-resp.json similarity index 100% rename from doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.json rename to doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-create-with-address-resp.json diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.json b/doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-list-resp.json similarity index 100% rename from doc/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.json rename to doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-list-resp.json diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.json b/doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-remove-interface-req.json similarity index 100% rename from doc/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.json rename to doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-remove-interface-req.json diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.json b/doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-show-resp.json similarity index 100% rename from doc/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.json rename to doc/api_samples/legacy_v2/os-baremetal-ext-status/baremetal-node-show-resp.json diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-create-req.json b/doc/api_samples/legacy_v2/os-extended-floating-ips/floating-ips-create-req.json similarity index 100% rename from doc/api_samples/os-extended-floating-ips/floating-ips-create-req.json rename to doc/api_samples/legacy_v2/os-extended-floating-ips/floating-ips-create-req.json diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-create-resp.json b/doc/api_samples/legacy_v2/os-extended-floating-ips/floating-ips-create-resp.json similarity index 100% rename from doc/api_samples/os-extended-floating-ips/floating-ips-create-resp.json rename to doc/api_samples/legacy_v2/os-extended-floating-ips/floating-ips-create-resp.json diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-get-resp.json b/doc/api_samples/legacy_v2/os-extended-floating-ips/floating-ips-get-resp.json similarity index 100% rename from doc/api_samples/os-extended-floating-ips/floating-ips-get-resp.json rename to doc/api_samples/legacy_v2/os-extended-floating-ips/floating-ips-get-resp.json diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.json b/doc/api_samples/legacy_v2/os-extended-floating-ips/floating-ips-list-empty-resp.json similarity index 100% rename from doc/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.json rename to doc/api_samples/legacy_v2/os-extended-floating-ips/floating-ips-list-empty-resp.json diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-list-resp.json b/doc/api_samples/legacy_v2/os-extended-floating-ips/floating-ips-list-resp.json similarity index 100% rename from doc/api_samples/os-extended-floating-ips/floating-ips-list-resp.json rename to doc/api_samples/legacy_v2/os-extended-floating-ips/floating-ips-list-resp.json diff --git a/doc/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.json b/doc/api_samples/legacy_v2/os-extended-rescue-with-image/server-get-resp-rescue.json similarity index 100% rename from doc/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.json rename to doc/api_samples/legacy_v2/os-extended-rescue-with-image/server-get-resp-rescue.json diff --git a/doc/api_samples/os-extended-rescue-with-image/server-rescue-req.json b/doc/api_samples/legacy_v2/os-extended-rescue-with-image/server-rescue-req.json similarity index 100% rename from doc/api_samples/os-extended-rescue-with-image/server-rescue-req.json rename to doc/api_samples/legacy_v2/os-extended-rescue-with-image/server-rescue-req.json diff --git a/doc/api_samples/os-extended-rescue-with-image/server-rescue.json b/doc/api_samples/legacy_v2/os-extended-rescue-with-image/server-rescue.json similarity index 100% rename from doc/api_samples/os-extended-rescue-with-image/server-rescue.json rename to doc/api_samples/legacy_v2/os-extended-rescue-with-image/server-rescue.json diff --git a/doc/api_samples/os-server-group-quotas/limit-get-resp.json b/doc/api_samples/legacy_v2/os-server-group-quotas/limit-get-resp.json similarity index 100% rename from doc/api_samples/os-server-group-quotas/limit-get-resp.json rename to doc/api_samples/legacy_v2/os-server-group-quotas/limit-get-resp.json diff --git a/doc/api_samples/os-server-group-quotas/usedlimits-get-resp.json b/doc/api_samples/legacy_v2/os-server-group-quotas/usedlimits-get-resp.json similarity index 100% rename from doc/api_samples/os-server-group-quotas/usedlimits-get-resp.json rename to doc/api_samples/legacy_v2/os-server-group-quotas/usedlimits-get-resp.json diff --git a/doc/api_samples/os-server-list-multi-status/servers-list-resp.json b/doc/api_samples/legacy_v2/os-server-list-multi-status/servers-list-resp.json similarity index 100% rename from doc/api_samples/os-server-list-multi-status/servers-list-resp.json rename to doc/api_samples/legacy_v2/os-server-list-multi-status/servers-list-resp.json diff --git a/doc/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json b/doc/api_samples/legacy_v2/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json similarity index 100% rename from doc/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json rename to doc/api_samples/legacy_v2/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json diff --git a/doc/api_samples/os-used-limits/usedlimits-get-resp.json b/doc/api_samples/legacy_v2/os-used-limits/usedlimits-get-resp.json similarity index 100% rename from doc/api_samples/os-used-limits/usedlimits-get-resp.json rename to doc/api_samples/legacy_v2/os-used-limits/usedlimits-get-resp.json diff --git a/doc/api_samples/os-virtual-interfaces/vifs-list-resp.json b/doc/api_samples/legacy_v2/os-virtual-interfaces/vifs-list-resp.json similarity index 100% rename from doc/api_samples/os-virtual-interfaces/vifs-list-resp.json rename to doc/api_samples/legacy_v2/os-virtual-interfaces/vifs-list-resp.json diff --git a/doc/api_samples/servers/server-post-req.json b/doc/api_samples/legacy_v2/servers/server-post-req.json similarity index 100% rename from doc/api_samples/servers/server-post-req.json rename to doc/api_samples/legacy_v2/servers/server-post-req.json diff --git a/doc/api_samples/servers/server-post-resp.json b/doc/api_samples/legacy_v2/servers/server-post-resp.json similarity index 100% rename from doc/api_samples/servers/server-post-resp.json rename to doc/api_samples/legacy_v2/servers/server-post-resp.json diff --git a/doc/api_samples/versions/versions-get-resp.json b/doc/api_samples/legacy_v2/versions/versions-get-resp.json similarity index 100% rename from doc/api_samples/versions/versions-get-resp.json rename to doc/api_samples/legacy_v2/versions/versions-get-resp.json diff --git a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.json.tpl b/nova/tests/functional/api_sample_tests/__init__.py similarity index 100% rename from nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.json.tpl rename to nova/tests/functional/api_sample_tests/__init__.py diff --git a/nova/tests/functional/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/OS-EXT-IPS-MAC/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/OS-EXT-IPS-MAC/server-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl diff --git a/nova/tests/functional/api_samples/OS-EXT-IPS/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/OS-EXT-IPS/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/OS-EXT-IPS/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/OS-EXT-IPS/server-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/OS-EXT-IPS/servers-detail-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/OS-EXT-IPS/servers-detail-resp.json.tpl diff --git a/nova/tests/functional/api_samples/OS-EXT-VIF-NET/vifs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/OS-EXT-VIF-NET/vifs-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/OS-EXT-VIF-NET/vifs-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/OS-EXT-VIF-NET/vifs-list-resp.json.tpl diff --git a/nova/tests/functional/api_samples/README.rst b/nova/tests/functional/api_sample_tests/legacy_v2/README.rst similarity index 100% rename from nova/tests/functional/api_samples/README.rst rename to nova/tests/functional/api_sample_tests/legacy_v2/README.rst diff --git a/nova/tests/functional/api_sample_tests/legacy_v2/__init__.py b/nova/tests/functional/api_sample_tests/legacy_v2/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/nova/tests/functional/api_samples/all_extensions/flavor-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/flavor-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/flavor-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/flavor-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/flavors-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/flavors-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/flavors-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/flavors-list-resp.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-changepassword.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-changepassword.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/server-action-changepassword.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-changepassword.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-confirmresize.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-confirmresize.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/server-action-confirmresize.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-confirmresize.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-createimage.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-createimage.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/server-action-createimage.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-createimage.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-reboot.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-reboot.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/server-action-reboot.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-reboot.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-rebuild-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-rebuild-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/server-action-rebuild-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-rebuild-resp.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-rebuild.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-rebuild.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/server-action-rebuild.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-rebuild.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-resize.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-resize.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/server-action-resize.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-resize.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/server-action-revertresize.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-revertresize.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/server-action-revertresize.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-action-revertresize.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/server-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-post-req.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/server-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-post-req.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/server-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/server-post-resp.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/servers-details-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/servers-details-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/servers-details-resp.json.tpl diff --git a/nova/tests/functional/api_samples/all_extensions/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/all_extensions/servers-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/all_extensions/servers-list-resp.json.tpl diff --git a/nova/tests/functional/api_sample_tests/legacy_v2/api_samples_test_base.py b/nova/tests/functional/api_sample_tests/legacy_v2/api_samples_test_base.py new file mode 100644 index 0000000000..3c92eaee79 --- /dev/null +++ b/nova/tests/functional/api_sample_tests/legacy_v2/api_samples_test_base.py @@ -0,0 +1,53 @@ +# Copyright 2015 Intel Corporation. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import os.path +from oslo_utils import importutils + +from nova.tests.functional import api_samples_test_base + + +class ApiSampleTestBase(api_samples_test_base.ApiSampleTestBase): + + @classmethod + def _get_sample_path(cls, name, dirname, suffix='', api_version=None): + parts = [dirname] + 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 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) + return os.path.join(*parts) + + @classmethod + def _get_sample(cls, name, api_version=None): + dirname = os.path.dirname(os.path.abspath(__file__)) + dirname = os.path.normpath( + os.path.join(dirname, "../../../../../doc/api_samples/legacy_v2")) + return cls._get_sample_path(name, dirname, api_version=api_version) + + @classmethod + def _get_template(cls, name, api_version=None): + dirname = os.path.dirname(os.path.abspath(__file__)) + return cls._get_sample_path(name, dirname, suffix='.tpl', + api_version=api_version) diff --git a/nova/tests/functional/api_samples/flavors/flavor-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/flavors/flavor-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/flavors/flavor-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/flavors/flavor-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/flavors/flavors-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/flavors/flavors-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/flavors/flavors-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/flavors/flavors-list-resp.json.tpl diff --git a/nova/tests/functional/api_samples/limits/limit-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/limits/limit-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/limits/limit-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/limits/limit-get-resp.json.tpl diff --git a/nova/tests/functional/api_sample_tests/legacy_v2/os-extended-floating-ips/floating-ips-create-nopool-req.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-extended-floating-ips/floating-ips-create-nopool-req.json.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-req.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-extended-floating-ips/floating-ips-create-req.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-req.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-extended-floating-ips/floating-ips-create-req.json.tpl diff --git a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-extended-floating-ips/floating-ips-create-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-create-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-extended-floating-ips/floating-ips-create-resp.json.tpl diff --git a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-extended-floating-ips/floating-ips-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-extended-floating-ips/floating-ips-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-extended-floating-ips/floating-ips-list-empty-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-extended-floating-ips/floating-ips-list-empty-resp.json.tpl diff --git a/nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-extended-floating-ips/floating-ips-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-extended-floating-ips/floating-ips-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-extended-floating-ips/floating-ips-list-resp.json.tpl diff --git a/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl diff --git a/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-rescue-req.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-extended-rescue-with-image/server-rescue-req.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-extended-rescue-with-image/server-rescue-req.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-extended-rescue-with-image/server-rescue-req.json.tpl diff --git a/nova/tests/functional/api_samples/os-extended-rescue-with-image/server-rescue.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-extended-rescue-with-image/server-rescue.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-extended-rescue-with-image/server-rescue.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-extended-rescue-with-image/server-rescue.json.tpl diff --git a/nova/tests/functional/api_samples/os-server-group-quotas/limit-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-server-group-quotas/limit-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-server-group-quotas/limit-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-server-group-quotas/limit-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/os-server-group-quotas/usedlimits-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-server-group-quotas/usedlimits-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-server-group-quotas/usedlimits-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-server-group-quotas/usedlimits-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/os-server-list-multi-status/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-server-list-multi-status/servers-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-server-list-multi-status/servers-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-server-list-multi-status/servers-list-resp.json.tpl diff --git a/nova/tests/functional/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-used-limits-for-admin/usedlimitsforadmin-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/os-used-limits/usedlimits-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-used-limits/usedlimits-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-used-limits/usedlimits-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-used-limits/usedlimits-get-resp.json.tpl diff --git a/nova/tests/functional/api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-virtual-interfaces/vifs-list-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/os-virtual-interfaces/vifs-list-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/os-virtual-interfaces/vifs-list-resp.json.tpl diff --git a/nova/tests/functional/api_samples/servers/server-post-req.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/servers/server-post-req.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/servers/server-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/servers/server-post-req.json.tpl diff --git a/nova/tests/functional/api_samples/servers/server-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/servers/server-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/servers/server-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/servers/server-post-resp.json.tpl diff --git a/nova/tests/functional/test_api_samples.py b/nova/tests/functional/api_sample_tests/legacy_v2/test_api_samples.py similarity index 99% rename from nova/tests/functional/test_api_samples.py rename to nova/tests/functional/api_sample_tests/legacy_v2/test_api_samples.py index a7418ebd2a..6742bd2ca5 100644 --- a/nova/tests/functional/test_api_samples.py +++ b/nova/tests/functional/api_sample_tests/legacy_v2/test_api_samples.py @@ -27,7 +27,8 @@ import testtools from nova.console import manager as console_manager # noqa - only for cfg from nova.network.neutronv2 import api as neutron_api # noqa - only for cfg from nova import test -from nova.tests.functional import api_samples_test_base +from nova.tests.functional.api_sample_tests.legacy_v2 import \ + api_samples_test_base from nova.tests.functional import integrated_helpers from nova.tests.unit.api.openstack import fakes from nova.tests.unit import fake_network diff --git a/nova/tests/functional/api_samples/versions/versions-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/versions/versions-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/api_samples/versions/versions-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/legacy_v2/versions/versions-get-resp.json.tpl