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

54 files changed, 14 insertions, 3 deletions

diff --git a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json b/doc/api_samples/all_extensions/extensions-get-resp.json
index 22eb1e207..22eb1e207 100644
--- a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json
+++ b/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
index 4532244d9..4532244d9 100644
--- a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.xml
+++ b/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
index bbd681e66..bbd681e66 100644
--- a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json
+++ b/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
index fe0451c1e..fe0451c1e 100644
--- a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml
+++ b/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
index ab86d2a52..ab86d2a52 100644
--- a/nova/tests/integrated/api_samples/all_extensions/flavors-list-resp.json
+++ b/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
index 435f96be5..435f96be5 100644
--- a/nova/tests/integrated/api_samples/all_extensions/flavors-list-resp.xml
+++ b/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
index 3eb1870f9..3eb1870f9 100644
--- a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json
+++ b/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
index 6f2d8587f..6f2d8587f 100644
--- a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml
+++ b/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
index 2269848f4..2269848f4 100644
--- a/nova/tests/integrated/api_samples/all_extensions/server-post-req.json
+++ b/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
index 2dbbb4438..2dbbb4438 100644
--- a/nova/tests/integrated/api_samples/all_extensions/server-post-req.xml
+++ b/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
index a8dc8258a..a8dc8258a 100644
--- a/nova/tests/integrated/api_samples/all_extensions/server-post-resp.json
+++ b/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
index 1754dc700..1754dc700 100644
--- a/nova/tests/integrated/api_samples/all_extensions/server-post-resp.xml
+++ b/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
index 160238eea..160238eea 100644
--- a/nova/tests/integrated/api_samples/flavor-get-resp.json
+++ b/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
index 93b91a531..93b91a531 100644
--- a/nova/tests/integrated/api_samples/flavor-get-resp.xml
+++ b/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
index ab86d2a52..ab86d2a52 100644
--- a/nova/tests/integrated/api_samples/flavors-list-resp.json
+++ b/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
index 435f96be5..435f96be5 100644
--- a/nova/tests/integrated/api_samples/flavors-list-resp.xml
+++ b/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
index da419650d..da419650d 100644
--- a/nova/tests/integrated/api_samples/image-get-resp.json
+++ b/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
index 77fa67bb1..77fa67bb1 100644
--- a/nova/tests/integrated/api_samples/image-get-resp.xml
+++ b/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
index 6d022eb97..6d022eb97 100644
--- a/nova/tests/integrated/api_samples/image-meta-key-get.json
+++ b/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
index 1de6b4078..1de6b4078 100644
--- a/nova/tests/integrated/api_samples/image-meta-key-get.xml
+++ b/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
index 8dec6767d..8dec6767d 100644
--- a/nova/tests/integrated/api_samples/image-meta-key-put-req.json
+++ b/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
index 23a6f4718..23a6f4718 100644
--- a/nova/tests/integrated/api_samples/image-meta-key-put-req.xml
+++ b/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
index 3db563ec1..3db563ec1 100644
--- a/nova/tests/integrated/api_samples/image-meta-key-put-resp.json
+++ b/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
index c989c38a2..c989c38a2 100644
--- a/nova/tests/integrated/api_samples/image-meta-key-put-resp.xml
+++ b/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
index 588f688d5..588f688d5 100644
--- a/nova/tests/integrated/api_samples/image-metadata-get-resp.json
+++ b/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
index 8409016bf..8409016bf 100644
--- a/nova/tests/integrated/api_samples/image-metadata-get-resp.xml
+++ b/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
index 8447c3dec..8447c3dec 100644
--- a/nova/tests/integrated/api_samples/image-metadata-post-req.json
+++ b/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
index db1b74572..db1b74572 100644
--- a/nova/tests/integrated/api_samples/image-metadata-post-req.xml
+++ b/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
index 9479bb339..9479bb339 100644
--- a/nova/tests/integrated/api_samples/image-metadata-post-resp.json
+++ b/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
index 1d96bd9af..1d96bd9af 100644
--- a/nova/tests/integrated/api_samples/image-metadata-post-resp.xml
+++ b/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
index 36fbc003d..36fbc003d 100644
--- a/nova/tests/integrated/api_samples/image-metadata-put-req.json
+++ b/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
index 454d9294f..454d9294f 100644
--- a/nova/tests/integrated/api_samples/image-metadata-put-req.xml
+++ b/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
index c8c5ee9c4..c8c5ee9c4 100644
--- a/nova/tests/integrated/api_samples/image-metadata-put-resp.json
+++ b/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
index 7011871cc..7011871cc 100644
--- a/nova/tests/integrated/api_samples/image-metadata-put-resp.xml
+++ b/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
index 657f0b197..657f0b197 100644
--- a/nova/tests/integrated/api_samples/image-metadata-resp.json
+++ b/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
index 44a0e1d77..44a0e1d77 100644
--- a/nova/tests/integrated/api_samples/images-details-get-resp.json
+++ b/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
index 654251a33..654251a33 100644
--- a/nova/tests/integrated/api_samples/images-details-get-resp.xml
+++ b/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
index 44a0e1d77..44a0e1d77 100644
--- a/nova/tests/integrated/api_samples/images-details-resp.json
+++ b/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
index 654251a33..654251a33 100644
--- a/nova/tests/integrated/api_samples/images-details-resp.xml
+++ b/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
index eb14ed3c7..eb14ed3c7 100644
--- a/nova/tests/integrated/api_samples/images-list-get-resp.json
+++ b/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
index 0674afb09..0674afb09 100644
--- a/nova/tests/integrated/api_samples/images-list-get-resp.xml
+++ b/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
index eb14ed3c7..eb14ed3c7 100644
--- a/nova/tests/integrated/api_samples/images-list-resp.json
+++ b/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
index 0674afb09..0674afb09 100644
--- a/nova/tests/integrated/api_samples/images-list-resp.xml
+++ b/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
index a4bc99bf9..a4bc99bf9 100644
--- a/nova/tests/integrated/api_samples/limit-get-resp.json
+++ b/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
index 8157eeb11..8157eeb11 100644
--- a/nova/tests/integrated/api_samples/limit-get-resp.xml
+++ b/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
index c6ebd4195..c6ebd4195 100644
--- a/nova/tests/integrated/api_samples/server-get-resp.json
+++ b/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
index e59319e42..e59319e42 100644
--- a/nova/tests/integrated/api_samples/server-get-resp.xml
+++ b/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
index 2269848f4..2269848f4 100644
--- a/nova/tests/integrated/api_samples/server-post-req.json
+++ b/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
index 2dbbb4438..2dbbb4438 100644
--- a/nova/tests/integrated/api_samples/server-post-req.xml
+++ b/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
index 29ce13717..29ce13717 100644
--- a/nova/tests/integrated/api_samples/server-post-resp.json
+++ b/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
index 9725f33bf..9725f33bf 100644
--- a/nova/tests/integrated/api_samples/server-post-resp.xml
+++ b/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
index 8bcc7f4f2..8bcc7f4f2 100644
--- a/nova/tests/integrated/api_samples/versions-get-resp.json
+++ b/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
index d0cea0cd5..d0cea0cd5 100644
--- a/nova/tests/integrated/api_samples/versions-get-resp.xml
+++ b/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 3d703f3f1..42acb58e3 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