From 5229d2eec4a8ccdc54672abd260cd1a7c4ad4298 Mon Sep 17 00:00:00 2001 From: He Jie Xu Date: Fri, 14 Aug 2015 16:11:13 +0800 Subject: [PATCH] Move the v2 api_sample functional tests This patch move the all v2.1 api sample tests under 'functional/api_sample_tests'. Also move sample files under 'doc/api-samples'. Co-Authored-By: Ed Leafe Co-Authored-By: Alex Xu Partial-Bug: #1462901 Change-Id: I2b924f2ad7687a23a018a9b658e8acd9e04d7963 --- .../api_samples/os-aggregates/aggregate-add-host-post-req.json | 0 .../api_samples/os-aggregates/aggregate-metadata-post-req.json | 0 doc/{v3 => }/api_samples/os-aggregates/aggregate-post-req.json | 0 doc/{v3 => }/api_samples/os-aggregates/aggregate-post-resp.json | 0 .../os-aggregates/aggregate-remove-host-post-req.json | 0 .../api_samples/os-aggregates/aggregate-update-post-req.json | 0 .../api_samples/os-aggregates/aggregate-update-post-resp.json | 0 .../os-aggregates/aggregates-add-host-post-resp.json | 0 doc/{v3 => }/api_samples/os-aggregates/aggregates-get-resp.json | 0 .../api_samples/os-aggregates/aggregates-list-get-resp.json | 0 .../os-aggregates/aggregates-metadata-post-resp.json | 0 .../os-aggregates/aggregates-remove-host-post-resp.json | 0 .../os-aggregates/aggregate-add-host-post-req.json.tpl | 0 .../os-aggregates/aggregate-metadata-post-req.json.tpl | 0 .../api_samples/os-aggregates/aggregate-post-req.json.tpl | 0 .../api_samples/os-aggregates/aggregate-post-resp.json.tpl | 0 .../os-aggregates/aggregate-remove-host-post-req.json.tpl | 0 .../os-aggregates/aggregate-update-post-req.json.tpl | 0 .../os-aggregates/aggregate-update-post-resp.json.tpl | 0 .../os-aggregates/aggregates-add-host-post-resp.json.tpl | 0 .../api_samples/os-aggregates/aggregates-get-resp.json.tpl | 0 .../api_samples/os-aggregates/aggregates-list-get-resp.json.tpl | 0 .../os-aggregates/aggregates-metadata-post-resp.json.tpl | 0 .../os-aggregates/aggregates-remove-host-post-resp.json.tpl | 0 .../functional/{v3 => api_sample_tests}/test_aggregates.py | 2 +- 25 files changed, 1 insertion(+), 1 deletion(-) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-add-host-post-req.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-metadata-post-req.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-post-req.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-remove-host-post-req.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-update-post-req.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregate-update-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregates-add-host-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregates-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregates-list-get-resp.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregates-metadata-post-resp.json (100%) rename doc/{v3 => }/api_samples/os-aggregates/aggregates-remove-host-post-resp.json (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-update-post-req.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregates-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl (100%) rename nova/tests/functional/{v3 => api_sample_tests}/test_aggregates.py (98%) diff --git a/doc/v3/api_samples/os-aggregates/aggregate-add-host-post-req.json b/doc/api_samples/os-aggregates/aggregate-add-host-post-req.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-add-host-post-req.json rename to doc/api_samples/os-aggregates/aggregate-add-host-post-req.json diff --git a/doc/v3/api_samples/os-aggregates/aggregate-metadata-post-req.json b/doc/api_samples/os-aggregates/aggregate-metadata-post-req.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-metadata-post-req.json rename to doc/api_samples/os-aggregates/aggregate-metadata-post-req.json diff --git a/doc/v3/api_samples/os-aggregates/aggregate-post-req.json b/doc/api_samples/os-aggregates/aggregate-post-req.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-post-req.json rename to doc/api_samples/os-aggregates/aggregate-post-req.json diff --git a/doc/v3/api_samples/os-aggregates/aggregate-post-resp.json b/doc/api_samples/os-aggregates/aggregate-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-post-resp.json rename to doc/api_samples/os-aggregates/aggregate-post-resp.json diff --git a/doc/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.json b/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.json rename to doc/api_samples/os-aggregates/aggregate-remove-host-post-req.json diff --git a/doc/v3/api_samples/os-aggregates/aggregate-update-post-req.json b/doc/api_samples/os-aggregates/aggregate-update-post-req.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-update-post-req.json rename to doc/api_samples/os-aggregates/aggregate-update-post-req.json diff --git a/doc/v3/api_samples/os-aggregates/aggregate-update-post-resp.json b/doc/api_samples/os-aggregates/aggregate-update-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregate-update-post-resp.json rename to doc/api_samples/os-aggregates/aggregate-update-post-resp.json diff --git a/doc/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json b/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json rename to doc/api_samples/os-aggregates/aggregates-add-host-post-resp.json diff --git a/doc/v3/api_samples/os-aggregates/aggregates-get-resp.json b/doc/api_samples/os-aggregates/aggregates-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregates-get-resp.json rename to doc/api_samples/os-aggregates/aggregates-get-resp.json diff --git a/doc/v3/api_samples/os-aggregates/aggregates-list-get-resp.json b/doc/api_samples/os-aggregates/aggregates-list-get-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregates-list-get-resp.json rename to doc/api_samples/os-aggregates/aggregates-list-get-resp.json diff --git a/doc/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json b/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json rename to doc/api_samples/os-aggregates/aggregates-metadata-post-resp.json diff --git a/doc/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json b/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.json similarity index 100% rename from doc/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json rename to doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.json diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-add-host-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-metadata-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-remove-host-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-update-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-update-post-req.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-update-post-req.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-update-post-req.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregate-update-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-add-host-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregates-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregates-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-list-get-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-metadata-post-resp.json.tpl diff --git a/nova/tests/functional/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl similarity index 100% rename from nova/tests/functional/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-aggregates/aggregates-remove-host-post-resp.json.tpl diff --git a/nova/tests/functional/v3/test_aggregates.py b/nova/tests/functional/api_sample_tests/test_aggregates.py similarity index 98% rename from nova/tests/functional/v3/test_aggregates.py rename to nova/tests/functional/api_sample_tests/test_aggregates.py index dc102c7e0..b0187f6b2 100644 --- a/nova/tests/functional/v3/test_aggregates.py +++ b/nova/tests/functional/api_sample_tests/test_aggregates.py @@ -15,7 +15,7 @@ from oslo_config import cfg -from nova.tests.functional.v3 import api_sample_base +from nova.tests.functional.api_sample_tests import api_sample_base CONF = cfg.CONF CONF.import_opt('osapi_compute_extension',