From 6bc7055adc93212a7314bcf94203ada594c11bb1 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 5 Sep 2012 22:08:40 +0100 Subject: [PATCH] Move api_samples to doc dir The generated api_samples aren't used for the tests, they're only included in git so that they can be synced into the docs. Move them to the doc/ dir to make that more clear since I keep forgetting. Change-Id: I0851ac0ee234dc1e8740666716733e05f856ddec --- .../all_extensions/extensions-get-resp.json | 0 .../all_extensions/extensions-get-resp.xml | 0 .../all_extensions/flavor-get-resp.json | 0 .../all_extensions/flavor-get-resp.xml | 0 .../all_extensions/flavors-list-resp.json | 0 .../all_extensions/flavors-list-resp.xml | 0 .../all_extensions/server-get-resp.json | 0 .../all_extensions/server-get-resp.xml | 0 .../all_extensions/server-post-req.json | 0 .../all_extensions/server-post-req.xml | 0 .../all_extensions/server-post-resp.json | 0 .../all_extensions/server-post-resp.xml | 0 .../api_samples/flavor-get-resp.json | 0 .../api_samples/flavor-get-resp.xml | 0 .../api_samples/flavors-list-resp.json | 0 .../api_samples/flavors-list-resp.xml | 0 .../api_samples/image-get-resp.json | 0 .../api_samples/image-get-resp.xml | 0 .../api_samples/image-meta-key-get.json | 0 .../api_samples/image-meta-key-get.xml | 0 .../api_samples/image-meta-key-put-req.json | 0 .../api_samples/image-meta-key-put-req.xml | 0 .../api_samples/image-meta-key-put-resp.json | 0 .../api_samples/image-meta-key-put-resp.xml | 0 .../api_samples/image-metadata-get-resp.json | 0 .../api_samples/image-metadata-get-resp.xml | 0 .../api_samples/image-metadata-post-req.json | 0 .../api_samples/image-metadata-post-req.xml | 0 .../api_samples/image-metadata-post-resp.json | 0 .../api_samples/image-metadata-post-resp.xml | 0 .../api_samples/image-metadata-put-req.json | 0 .../api_samples/image-metadata-put-req.xml | 0 .../api_samples/image-metadata-put-resp.json | 0 .../api_samples/image-metadata-put-resp.xml | 0 .../api_samples/image-metadata-resp.json | 0 .../api_samples/images-details-get-resp.json | 0 .../api_samples/images-details-get-resp.xml | 0 .../api_samples/images-details-resp.json | 0 .../api_samples/images-details-resp.xml | 0 .../api_samples/images-list-get-resp.json | 0 .../api_samples/images-list-get-resp.xml | 0 .../api_samples/images-list-resp.json | 0 .../api_samples/images-list-resp.xml | 0 .../api_samples/limit-get-resp.json | 0 .../api_samples/limit-get-resp.xml | 0 .../api_samples/server-get-resp.json | 0 .../api_samples/server-get-resp.xml | 0 .../api_samples/server-post-req.json | 0 .../api_samples/server-post-req.xml | 0 .../api_samples/server-post-resp.json | 0 .../api_samples/server-post-resp.xml | 0 .../api_samples/versions-get-resp.json | 0 .../api_samples/versions-get-resp.xml | 0 nova/tests/integrated/test_api_samples.py | 17 ++++++++++++++--- 54 files changed, 14 insertions(+), 3 deletions(-) rename {nova/tests/integrated => doc}/api_samples/all_extensions/extensions-get-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/all_extensions/extensions-get-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/all_extensions/flavor-get-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/all_extensions/flavor-get-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/all_extensions/flavors-list-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/all_extensions/flavors-list-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/all_extensions/server-get-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/all_extensions/server-get-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/all_extensions/server-post-req.json (100%) rename {nova/tests/integrated => doc}/api_samples/all_extensions/server-post-req.xml (100%) rename {nova/tests/integrated => doc}/api_samples/all_extensions/server-post-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/all_extensions/server-post-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/flavor-get-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/flavor-get-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/flavors-list-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/flavors-list-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/image-get-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/image-get-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/image-meta-key-get.json (100%) rename {nova/tests/integrated => doc}/api_samples/image-meta-key-get.xml (100%) rename {nova/tests/integrated => doc}/api_samples/image-meta-key-put-req.json (100%) rename {nova/tests/integrated => doc}/api_samples/image-meta-key-put-req.xml (100%) rename {nova/tests/integrated => doc}/api_samples/image-meta-key-put-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/image-meta-key-put-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/image-metadata-get-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/image-metadata-get-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/image-metadata-post-req.json (100%) rename {nova/tests/integrated => doc}/api_samples/image-metadata-post-req.xml (100%) rename {nova/tests/integrated => doc}/api_samples/image-metadata-post-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/image-metadata-post-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/image-metadata-put-req.json (100%) rename {nova/tests/integrated => doc}/api_samples/image-metadata-put-req.xml (100%) rename {nova/tests/integrated => doc}/api_samples/image-metadata-put-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/image-metadata-put-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/image-metadata-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/images-details-get-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/images-details-get-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/images-details-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/images-details-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/images-list-get-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/images-list-get-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/images-list-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/images-list-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/limit-get-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/limit-get-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/server-get-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/server-get-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/server-post-req.json (100%) rename {nova/tests/integrated => doc}/api_samples/server-post-req.xml (100%) rename {nova/tests/integrated => doc}/api_samples/server-post-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/server-post-resp.xml (100%) rename {nova/tests/integrated => doc}/api_samples/versions-get-resp.json (100%) rename {nova/tests/integrated => doc}/api_samples/versions-get-resp.xml (100%) diff --git a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json b/doc/api_samples/all_extensions/extensions-get-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json rename to doc/api_samples/all_extensions/extensions-get-resp.json diff --git a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.xml rename to doc/api_samples/all_extensions/extensions-get-resp.xml diff --git a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json b/doc/api_samples/all_extensions/flavor-get-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json rename to doc/api_samples/all_extensions/flavor-get-resp.json diff --git a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml b/doc/api_samples/all_extensions/flavor-get-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml rename to doc/api_samples/all_extensions/flavor-get-resp.xml diff --git a/nova/tests/integrated/api_samples/all_extensions/flavors-list-resp.json b/doc/api_samples/all_extensions/flavors-list-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/flavors-list-resp.json rename to doc/api_samples/all_extensions/flavors-list-resp.json diff --git a/nova/tests/integrated/api_samples/all_extensions/flavors-list-resp.xml b/doc/api_samples/all_extensions/flavors-list-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/flavors-list-resp.xml rename to doc/api_samples/all_extensions/flavors-list-resp.xml diff --git a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json b/doc/api_samples/all_extensions/server-get-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-get-resp.json rename to doc/api_samples/all_extensions/server-get-resp.json diff --git a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml b/doc/api_samples/all_extensions/server-get-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml rename to doc/api_samples/all_extensions/server-get-resp.xml diff --git a/nova/tests/integrated/api_samples/all_extensions/server-post-req.json b/doc/api_samples/all_extensions/server-post-req.json similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-post-req.json rename to doc/api_samples/all_extensions/server-post-req.json diff --git a/nova/tests/integrated/api_samples/all_extensions/server-post-req.xml b/doc/api_samples/all_extensions/server-post-req.xml similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-post-req.xml rename to doc/api_samples/all_extensions/server-post-req.xml diff --git a/nova/tests/integrated/api_samples/all_extensions/server-post-resp.json b/doc/api_samples/all_extensions/server-post-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-post-resp.json rename to doc/api_samples/all_extensions/server-post-resp.json diff --git a/nova/tests/integrated/api_samples/all_extensions/server-post-resp.xml b/doc/api_samples/all_extensions/server-post-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/all_extensions/server-post-resp.xml rename to doc/api_samples/all_extensions/server-post-resp.xml diff --git a/nova/tests/integrated/api_samples/flavor-get-resp.json b/doc/api_samples/flavor-get-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/flavor-get-resp.json rename to doc/api_samples/flavor-get-resp.json diff --git a/nova/tests/integrated/api_samples/flavor-get-resp.xml b/doc/api_samples/flavor-get-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/flavor-get-resp.xml rename to doc/api_samples/flavor-get-resp.xml diff --git a/nova/tests/integrated/api_samples/flavors-list-resp.json b/doc/api_samples/flavors-list-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/flavors-list-resp.json rename to doc/api_samples/flavors-list-resp.json diff --git a/nova/tests/integrated/api_samples/flavors-list-resp.xml b/doc/api_samples/flavors-list-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/flavors-list-resp.xml rename to doc/api_samples/flavors-list-resp.xml diff --git a/nova/tests/integrated/api_samples/image-get-resp.json b/doc/api_samples/image-get-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/image-get-resp.json rename to doc/api_samples/image-get-resp.json diff --git a/nova/tests/integrated/api_samples/image-get-resp.xml b/doc/api_samples/image-get-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/image-get-resp.xml rename to doc/api_samples/image-get-resp.xml diff --git a/nova/tests/integrated/api_samples/image-meta-key-get.json b/doc/api_samples/image-meta-key-get.json similarity index 100% rename from nova/tests/integrated/api_samples/image-meta-key-get.json rename to doc/api_samples/image-meta-key-get.json diff --git a/nova/tests/integrated/api_samples/image-meta-key-get.xml b/doc/api_samples/image-meta-key-get.xml similarity index 100% rename from nova/tests/integrated/api_samples/image-meta-key-get.xml rename to doc/api_samples/image-meta-key-get.xml diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-req.json b/doc/api_samples/image-meta-key-put-req.json similarity index 100% rename from nova/tests/integrated/api_samples/image-meta-key-put-req.json rename to doc/api_samples/image-meta-key-put-req.json diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-req.xml b/doc/api_samples/image-meta-key-put-req.xml similarity index 100% rename from nova/tests/integrated/api_samples/image-meta-key-put-req.xml rename to doc/api_samples/image-meta-key-put-req.xml diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-resp.json b/doc/api_samples/image-meta-key-put-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/image-meta-key-put-resp.json rename to doc/api_samples/image-meta-key-put-resp.json diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-resp.xml b/doc/api_samples/image-meta-key-put-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/image-meta-key-put-resp.xml rename to doc/api_samples/image-meta-key-put-resp.xml diff --git a/nova/tests/integrated/api_samples/image-metadata-get-resp.json b/doc/api_samples/image-metadata-get-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-get-resp.json rename to doc/api_samples/image-metadata-get-resp.json diff --git a/nova/tests/integrated/api_samples/image-metadata-get-resp.xml b/doc/api_samples/image-metadata-get-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-get-resp.xml rename to doc/api_samples/image-metadata-get-resp.xml diff --git a/nova/tests/integrated/api_samples/image-metadata-post-req.json b/doc/api_samples/image-metadata-post-req.json similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-post-req.json rename to doc/api_samples/image-metadata-post-req.json diff --git a/nova/tests/integrated/api_samples/image-metadata-post-req.xml b/doc/api_samples/image-metadata-post-req.xml similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-post-req.xml rename to doc/api_samples/image-metadata-post-req.xml diff --git a/nova/tests/integrated/api_samples/image-metadata-post-resp.json b/doc/api_samples/image-metadata-post-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-post-resp.json rename to doc/api_samples/image-metadata-post-resp.json diff --git a/nova/tests/integrated/api_samples/image-metadata-post-resp.xml b/doc/api_samples/image-metadata-post-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-post-resp.xml rename to doc/api_samples/image-metadata-post-resp.xml diff --git a/nova/tests/integrated/api_samples/image-metadata-put-req.json b/doc/api_samples/image-metadata-put-req.json similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-put-req.json rename to doc/api_samples/image-metadata-put-req.json diff --git a/nova/tests/integrated/api_samples/image-metadata-put-req.xml b/doc/api_samples/image-metadata-put-req.xml similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-put-req.xml rename to doc/api_samples/image-metadata-put-req.xml diff --git a/nova/tests/integrated/api_samples/image-metadata-put-resp.json b/doc/api_samples/image-metadata-put-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-put-resp.json rename to doc/api_samples/image-metadata-put-resp.json diff --git a/nova/tests/integrated/api_samples/image-metadata-put-resp.xml b/doc/api_samples/image-metadata-put-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-put-resp.xml rename to doc/api_samples/image-metadata-put-resp.xml diff --git a/nova/tests/integrated/api_samples/image-metadata-resp.json b/doc/api_samples/image-metadata-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/image-metadata-resp.json rename to doc/api_samples/image-metadata-resp.json diff --git a/nova/tests/integrated/api_samples/images-details-get-resp.json b/doc/api_samples/images-details-get-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/images-details-get-resp.json rename to doc/api_samples/images-details-get-resp.json diff --git a/nova/tests/integrated/api_samples/images-details-get-resp.xml b/doc/api_samples/images-details-get-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/images-details-get-resp.xml rename to doc/api_samples/images-details-get-resp.xml diff --git a/nova/tests/integrated/api_samples/images-details-resp.json b/doc/api_samples/images-details-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/images-details-resp.json rename to doc/api_samples/images-details-resp.json diff --git a/nova/tests/integrated/api_samples/images-details-resp.xml b/doc/api_samples/images-details-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/images-details-resp.xml rename to doc/api_samples/images-details-resp.xml diff --git a/nova/tests/integrated/api_samples/images-list-get-resp.json b/doc/api_samples/images-list-get-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/images-list-get-resp.json rename to doc/api_samples/images-list-get-resp.json diff --git a/nova/tests/integrated/api_samples/images-list-get-resp.xml b/doc/api_samples/images-list-get-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/images-list-get-resp.xml rename to doc/api_samples/images-list-get-resp.xml diff --git a/nova/tests/integrated/api_samples/images-list-resp.json b/doc/api_samples/images-list-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/images-list-resp.json rename to doc/api_samples/images-list-resp.json diff --git a/nova/tests/integrated/api_samples/images-list-resp.xml b/doc/api_samples/images-list-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/images-list-resp.xml rename to doc/api_samples/images-list-resp.xml diff --git a/nova/tests/integrated/api_samples/limit-get-resp.json b/doc/api_samples/limit-get-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/limit-get-resp.json rename to doc/api_samples/limit-get-resp.json diff --git a/nova/tests/integrated/api_samples/limit-get-resp.xml b/doc/api_samples/limit-get-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/limit-get-resp.xml rename to doc/api_samples/limit-get-resp.xml diff --git a/nova/tests/integrated/api_samples/server-get-resp.json b/doc/api_samples/server-get-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/server-get-resp.json rename to doc/api_samples/server-get-resp.json diff --git a/nova/tests/integrated/api_samples/server-get-resp.xml b/doc/api_samples/server-get-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/server-get-resp.xml rename to doc/api_samples/server-get-resp.xml diff --git a/nova/tests/integrated/api_samples/server-post-req.json b/doc/api_samples/server-post-req.json similarity index 100% rename from nova/tests/integrated/api_samples/server-post-req.json rename to doc/api_samples/server-post-req.json diff --git a/nova/tests/integrated/api_samples/server-post-req.xml b/doc/api_samples/server-post-req.xml similarity index 100% rename from nova/tests/integrated/api_samples/server-post-req.xml rename to doc/api_samples/server-post-req.xml diff --git a/nova/tests/integrated/api_samples/server-post-resp.json b/doc/api_samples/server-post-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/server-post-resp.json rename to doc/api_samples/server-post-resp.json diff --git a/nova/tests/integrated/api_samples/server-post-resp.xml b/doc/api_samples/server-post-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/server-post-resp.xml rename to doc/api_samples/server-post-resp.xml diff --git a/nova/tests/integrated/api_samples/versions-get-resp.json b/doc/api_samples/versions-get-resp.json similarity index 100% rename from nova/tests/integrated/api_samples/versions-get-resp.json rename to doc/api_samples/versions-get-resp.json diff --git a/nova/tests/integrated/api_samples/versions-get-resp.xml b/doc/api_samples/versions-get-resp.xml similarity index 100% rename from nova/tests/integrated/api_samples/versions-get-resp.xml rename to doc/api_samples/versions-get-resp.xml diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 3d703f3f1812..42acb58e3893 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -84,8 +84,8 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): return to_dict(etree.fromstring(data)) @classmethod - def _get_sample(cls, name, suffix=''): - parts = [os.path.dirname(os.path.abspath(__file__))] + def _get_sample_path(cls, name, dirname, suffix=''): + parts = [dirname] parts.append('api_samples') if cls.all_extensions: parts.append('all_extensions') @@ -94,8 +94,19 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): parts.append(name + "." + cls.ctype + suffix) return os.path.join(*parts) + @classmethod + def _get_sample(cls, name): + dirname = os.path.dirname(os.path.abspath(__file__)) + dirname = os.path.join(dirname, "../../../doc") + return cls._get_sample_path(name, dirname) + + @classmethod + def _get_template(cls, name): + dirname = os.path.dirname(os.path.abspath(__file__)) + return cls._get_sample_path(name, dirname, suffix='.tpl') + def _read_template(self, name): - template = self._get_sample(name, suffix='.tpl') + template = self._get_template(name) if self.generate_samples and not os.path.exists(template): with open(template, 'w') as outf: pass