aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilo Casagrande <milo.casagrande@linaro.org>2015-05-13 10:30:25 +0200
committerMilo Casagrande <milo.casagrande@linaro.org>2015-05-13 10:30:25 +0200
commit80a8bd071fac122b9c41f1a2487a1c52156c1ce2 (patch)
tree5794a200f1cf17b74e5f4de40d974eab2014b986
parenta7fe94335ef0422633eab06d426d760f9b1eb26d (diff)
Rename schema files and fix references.
* Rename the schema file names or some of them will be served by the API backend resulting in 404 errors.
-rw-r--r--doc/schema-boot.rst4
-rw-r--r--doc/schema-defconfig.rst4
-rw-r--r--doc/schema-job.rst4
-rw-r--r--doc/schema-lab.rst4
-rw-r--r--doc/schema-report.rst2
-rw-r--r--doc/schema-send.rst2
-rw-r--r--doc/schema-test-case.rst4
-rw-r--r--doc/schema-test-set.rst4
-rw-r--r--doc/schema-test-suite.rst4
-rw-r--r--doc/schema-token.rst4
-rw-r--r--doc/schema/1.0/get_boot.json (renamed from doc/schema/1.0/boot_get.json)2
-rw-r--r--doc/schema/1.0/get_defconfig.json (renamed from doc/schema/1.0/defconfig_get.json)4
-rw-r--r--doc/schema/1.0/get_job.json (renamed from doc/schema/1.0/job_get.json)4
-rw-r--r--doc/schema/1.0/get_lab.json (renamed from doc/schema/1.0/lab_get.json)4
-rw-r--r--doc/schema/1.0/get_report.json (renamed from doc/schema/1.0/report_get.json)4
-rw-r--r--doc/schema/1.0/get_test_case.json (renamed from doc/schema/1.0/test_case_get.json)4
-rw-r--r--doc/schema/1.0/get_test_set.json (renamed from doc/schema/1.0/test_set_get.json)4
-rw-r--r--doc/schema/1.0/get_test_suite.json (renamed from doc/schema/1.0/test_suite_get.json)4
-rw-r--r--doc/schema/1.0/get_token.json (renamed from doc/schema/1.0/token_get.json)4
-rw-r--r--doc/schema/1.0/post_boot.json (renamed from doc/schema/1.0/boot_post.json)2
-rw-r--r--doc/schema/1.0/post_defconfig.json (renamed from doc/schema/1.0/defconfig_post.json)4
-rw-r--r--doc/schema/1.0/post_job.json (renamed from doc/schema/1.0/job_post.json)4
-rw-r--r--doc/schema/1.0/post_lab.json (renamed from doc/schema/1.0/lab_post.json)4
-rw-r--r--doc/schema/1.0/post_send.json (renamed from doc/schema/1.0/send_post.json)4
-rw-r--r--doc/schema/1.0/post_test_case.json (renamed from doc/schema/1.0/test_case_post.json)4
-rw-r--r--doc/schema/1.0/post_test_set.json (renamed from doc/schema/1.0/test_set_post.json)4
-rw-r--r--doc/schema/1.0/post_test_suite.json (renamed from doc/schema/1.0/test_suite_post.json)4
-rw-r--r--doc/schema/1.0/post_token.json (renamed from doc/schema/1.0/token_post.json)4
28 files changed, 54 insertions, 50 deletions
diff --git a/doc/schema-boot.rst b/doc/schema-boot.rst
index f453575..5902614 100644
--- a/doc/schema-boot.rst
+++ b/doc/schema-boot.rst
@@ -14,7 +14,7 @@ and architecture values: ``board``-``job``-``kernel``-``defconfig``-``arch``.
Boot report ``name``-s are not unique. To uniquely identify a boot report it is
necessary to use its ``_id`` value.
-.. literalinclude:: schema/1.0/boot_get.json
+.. literalinclude:: schema/1.0/get_boot.json
:language: json
.. _schema_boot_post:
@@ -25,7 +25,7 @@ POST
The following schema defines the valid fields that a boot report document should
have when sent to the server.
-.. literalinclude:: schema/1.0/boot_post.json
+.. literalinclude:: schema/1.0/post_boot.json
:language: json
Notes
diff --git a/doc/schema-defconfig.rst b/doc/schema-defconfig.rst
index e7f36fd..e0156fa 100644
--- a/doc/schema-defconfig.rst
+++ b/doc/schema-defconfig.rst
@@ -16,7 +16,7 @@ GET
The following schema covers the data that is available with a GET request.
-.. literalinclude:: schema/1.0/defconfig_get.json
+.. literalinclude:: schema/1.0/get_defconfig.json
:language: json
.. _schema_defconfig_post:
@@ -31,7 +31,7 @@ The ``defconfig`` resource does not support POST requests. This schema is
placed here as a reference document in order to provide correct data to the
server.
-.. literalinclude:: schema/1.0/defconfig_post.json
+.. literalinclude:: schema/1.0/post_defconfig.json
:language: json
Notes
diff --git a/doc/schema-job.rst b/doc/schema-job.rst
index 48670e2..cb09c3c 100644
--- a/doc/schema-job.rst
+++ b/doc/schema-job.rst
@@ -25,7 +25,7 @@ GET
They are taken from the :ref:`defconfig schema <schema_defconfig>` at
import time and reported here for easier search.
-.. literalinclude:: schema/1.0/job_get.json
+.. literalinclude:: schema/1.0/get_job.json
:language: json
.. _schema_job_post:
@@ -36,7 +36,7 @@ POST
The following schema covers the data that should be available in the JSON
data sent to the server.
-.. literalinclude:: schema/1.0/job_post.json
+.. literalinclude:: schema/1.0/post_job.json
:language: json
diff --git a/doc/schema-lab.rst b/doc/schema-lab.rst
index 78c3710..113f117 100644
--- a/doc/schema-lab.rst
+++ b/doc/schema-lab.rst
@@ -20,7 +20,7 @@ As a rule of thumbs for creating a lab ``name``:
GET
***
-.. literalinclude:: schema/1.0/lab_get.json
+.. literalinclude:: schema/1.0/get_lab.json
:language: json
.. _schema_lab_post:
@@ -28,7 +28,7 @@ GET
POST
****
-.. literalinclude:: schema/1.0/lab_post.json
+.. literalinclude:: schema/1.0/post_lab.json
:language: json
More Info
diff --git a/doc/schema-report.rst b/doc/schema-report.rst
index 3a38da7..8585885 100644
--- a/doc/schema-report.rst
+++ b/doc/schema-report.rst
@@ -9,7 +9,7 @@ is used to provide a view on the reports send when error arises.
GET
***
-.. literalinclude:: schema/1.0/report_get.json
+.. literalinclude:: schema/1.0/get_report.json
:language: json
More Info
diff --git a/doc/schema-send.rst b/doc/schema-send.rst
index eead72d..ba35c5c 100644
--- a/doc/schema-send.rst
+++ b/doc/schema-send.rst
@@ -13,7 +13,7 @@ POST
The following schema covers the data that should be available in the JSON
data sent to the server.
-.. literalinclude:: schema/1.0/send_post.json
+.. literalinclude:: schema/1.0/post_send.json
:language: json
More Info
diff --git a/doc/schema-test-case.rst b/doc/schema-test-case.rst
index 2da5165..e309987 100644
--- a/doc/schema-test-case.rst
+++ b/doc/schema-test-case.rst
@@ -13,7 +13,7 @@ A test case can be associated with only one :ref:`test suite <schema_test_suite>
GET
***
-.. literalinclude:: schema/1.0/test_case_get.json
+.. literalinclude:: schema/1.0/get_test_case.json
:language: json
.. _schema_test_case_post:
@@ -21,7 +21,7 @@ GET
POST
****
-.. literalinclude:: schema/1.0/test_case_post.json
+.. literalinclude:: schema/1.0/post_test_case.json
:language: json
Notes
diff --git a/doc/schema-test-set.rst b/doc/schema-test-set.rst
index 843b0f5..363df2b 100644
--- a/doc/schema-test-set.rst
+++ b/doc/schema-test-set.rst
@@ -11,7 +11,7 @@ must define its own ``name`` and must be associated with a :ref:`test suite <sch
GET
***
-.. literalinclude:: schema/1.0/test_set_get.json
+.. literalinclude:: schema/1.0/get_test_set.json
:language: json
Notes
@@ -24,7 +24,7 @@ Notes
POST
****
-.. literalinclude:: schema/1.0/test_set_post.json
+.. literalinclude:: schema/1.0/post_test_set.json
:language: json
Notes
diff --git a/doc/schema-test-suite.rst b/doc/schema-test-suite.rst
index 64b38c9..ce93545 100644
--- a/doc/schema-test-suite.rst
+++ b/doc/schema-test-suite.rst
@@ -12,7 +12,7 @@ A test suite must define its own ``name`` and must be associated with a :ref:`la
GET
***
-.. literalinclude:: schema/1.0/test_suite_get.json
+.. literalinclude:: schema/1.0/get_test_suite.json
:language: json
Notes
@@ -25,7 +25,7 @@ Notes
POST
****
-.. literalinclude:: schema/1.0/test_suite_post.json
+.. literalinclude:: schema/1.0/get_test_suite.json
:language: json
Notes
diff --git a/doc/schema-token.rst b/doc/schema-token.rst
index 15cdfa4..4ea8981 100644
--- a/doc/schema-token.rst
+++ b/doc/schema-token.rst
@@ -10,7 +10,7 @@ A token object as stored in the database.
GET
***
-.. literalinclude:: schema/1.0/token_get.json
+.. literalinclude:: schema/1.0/get_token.json
:language: json
.. _schema_token_post:
@@ -18,7 +18,7 @@ GET
POST
****
-.. literalinclude:: schema/1.0/token_post.json
+.. literalinclude:: schema/1.0/post_token.json
:language: json
.. note::
diff --git a/doc/schema/1.0/boot_get.json b/doc/schema/1.0/get_boot.json
index 1604da9..9fc973c 100644
--- a/doc/schema/1.0/boot_get.json
+++ b/doc/schema/1.0/get_boot.json
@@ -1,4 +1,6 @@
{
+ "$schema": "http://api.kernelci.org/json-schema/1.0/get_boot.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/get_boot.json",
"title": "boot",
"description": "A boot report object",
"type": "object",
diff --git a/doc/schema/1.0/defconfig_get.json b/doc/schema/1.0/get_defconfig.json
index 381bd12..7279bf9 100644
--- a/doc/schema/1.0/defconfig_get.json
+++ b/doc/schema/1.0/get_defconfig.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/defconfig_get.json",
- "id": "http://api.kernelci.org/json-schema/1.0/defconfig_get.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/get_defconfig.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/get_defconfig.json",
"title": "defconfig",
"description": "A defconfig as built by the continuous integration system",
"type": "object",
diff --git a/doc/schema/1.0/job_get.json b/doc/schema/1.0/get_job.json
index aa23820..c110bf1 100644
--- a/doc/schema/1.0/job_get.json
+++ b/doc/schema/1.0/get_job.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/job_get.json",
- "id": "http://api.kernelci.org/json-schema/1.0/job_get.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/get_job.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/get_job.json",
"title": "job",
"description": "A job as provided by the CI loop",
"type": "object",
diff --git a/doc/schema/1.0/lab_get.json b/doc/schema/1.0/get_lab.json
index 99b62da..44b991e 100644
--- a/doc/schema/1.0/lab_get.json
+++ b/doc/schema/1.0/get_lab.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/lab_get.json",
- "id": "http://api.kernelci.org/json-schema/1.0/lab_get.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/get_lab.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/get_lab.json",
"title": "lab",
"description": "A lab object",
"type": "object",
diff --git a/doc/schema/1.0/report_get.json b/doc/schema/1.0/get_report.json
index c1a3abe..06ba680 100644
--- a/doc/schema/1.0/report_get.json
+++ b/doc/schema/1.0/get_report.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/report_get.json",
- "id": "http://api.kernelci.org/json-schema/1.0/report_get.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/get_report.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/get_report.json",
"title": "report",
"description": "A report object",
"type": "object",
diff --git a/doc/schema/1.0/test_case_get.json b/doc/schema/1.0/get_test_case.json
index c27d379..f22c67a 100644
--- a/doc/schema/1.0/test_case_get.json
+++ b/doc/schema/1.0/get_test_case.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/test_case_post.json",
- "id": "http://api.kernelci.org/json-schema/1.0/test_case_post.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/get_test_case.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/get_test_case.json",
"title": "test_case",
"description": "A test case JSON object as returned by the API",
"type": "object",
diff --git a/doc/schema/1.0/test_set_get.json b/doc/schema/1.0/get_test_set.json
index 8acbdf8..217a4c8 100644
--- a/doc/schema/1.0/test_set_get.json
+++ b/doc/schema/1.0/get_test_set.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/test_set_get.json",
- "id": "http://api.kernelci.org/json-schema/1.0/test_set_get.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/get_test_set.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/get_test_set.json",
"title": "test_set",
"description": "A test set JSON object as returned by the API",
"type": "object",
diff --git a/doc/schema/1.0/test_suite_get.json b/doc/schema/1.0/get_test_suite.json
index 1625bfd..64917ac 100644
--- a/doc/schema/1.0/test_suite_get.json
+++ b/doc/schema/1.0/get_test_suite.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/test_suite_get.json",
- "id": "http://api.kernelci.org/json-schema/1.0/test_suite_get.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/get_test_suite.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/get_test_suite.json",
"title": "test_suite",
"description": "A test suite JSON object as returned by the API",
"type": "object",
diff --git a/doc/schema/1.0/token_get.json b/doc/schema/1.0/get_token.json
index 0f40c00..5e5bc00 100644
--- a/doc/schema/1.0/token_get.json
+++ b/doc/schema/1.0/get_token.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/token_get.json",
- "id": "http://api.kernelci.org/json-schema/1.0/token_get.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/get_token.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/get_token.json",
"title": "token",
"description": "A token used to interact with the API",
"type": "object",
diff --git a/doc/schema/1.0/boot_post.json b/doc/schema/1.0/post_boot.json
index d23f599..bb5a82c 100644
--- a/doc/schema/1.0/boot_post.json
+++ b/doc/schema/1.0/post_boot.json
@@ -1,4 +1,6 @@
{
+ "$schema": "http://api.kernelci.org/json-schema/1.0/post_boot.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/post_boot.json",
"title": "boot",
"description": "A boot POST request object",
"type": "object",
diff --git a/doc/schema/1.0/defconfig_post.json b/doc/schema/1.0/post_defconfig.json
index 4474722..bbdb441 100644
--- a/doc/schema/1.0/defconfig_post.json
+++ b/doc/schema/1.0/post_defconfig.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/defconfig_post.json",
- "id": "http://api.kernelci.org/json-schema/1.0/defconfig_post.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/post_defconfig.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/post_defconfig.json",
"title": "defconfig",
"description": "A defconfig as built by the continuous integration system",
"type": "object",
diff --git a/doc/schema/1.0/job_post.json b/doc/schema/1.0/post_job.json
index b4c525d..c23cdfd 100644
--- a/doc/schema/1.0/job_post.json
+++ b/doc/schema/1.0/post_job.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/job_post.json",
- "id": "http://api.kernelci.org/json-schema/1.0/job_post.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/post_job.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/post_job.json",
"title": "job",
"description": "A job data to trigger build import",
"type": "object",
diff --git a/doc/schema/1.0/lab_post.json b/doc/schema/1.0/post_lab.json
index 5539472..59b06cb 100644
--- a/doc/schema/1.0/lab_post.json
+++ b/doc/schema/1.0/post_lab.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/lab_post.json",
- "id": "http://api.kernelci.org/json-schema/1.0/lab_post.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/post_lab.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/post_lab.json",
"title": "lab",
"description": "A lab object",
"type": "object",
diff --git a/doc/schema/1.0/send_post.json b/doc/schema/1.0/post_send.json
index c9f4e53..166d0c6 100644
--- a/doc/schema/1.0/send_post.json
+++ b/doc/schema/1.0/post_send.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/send_post.json",
- "id": "http://api.kernelci.org/json-schema/1.0/send_post.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/post_send.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/post_send.json",
"title": "send",
"description": "Data to trigger the email report",
"type": "object",
diff --git a/doc/schema/1.0/test_case_post.json b/doc/schema/1.0/post_test_case.json
index 8407201..882f592 100644
--- a/doc/schema/1.0/test_case_post.json
+++ b/doc/schema/1.0/post_test_case.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/test_case_post.json",
- "id": "http://api.kernelci.org/json-schema/1.0/test_case_post.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/post_test_case.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/post_test_case.json",
"title": "test_case",
"description": "A test case JSON object",
"type": "object",
diff --git a/doc/schema/1.0/test_set_post.json b/doc/schema/1.0/post_test_set.json
index 62cec3b..003b836 100644
--- a/doc/schema/1.0/test_set_post.json
+++ b/doc/schema/1.0/post_test_set.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/test_set_post.json",
- "id": "http://api.kernelci.org/json-schema/1.0/test_set_post.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/post_test_set.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/post_test_set.json",
"title": "test_set",
"description": "A test set JSON object",
"type": "object",
diff --git a/doc/schema/1.0/test_suite_post.json b/doc/schema/1.0/post_test_suite.json
index 6a4b066..5b97f82 100644
--- a/doc/schema/1.0/test_suite_post.json
+++ b/doc/schema/1.0/post_test_suite.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/test_suite_post.json",
- "id": "http://api.kernelci.org/json-schema/1.0/test_suite_post.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/post_test_suite.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/post_test_suite.json",
"title": "test_suite",
"description": "A test suite JSON object",
"type": "object",
diff --git a/doc/schema/1.0/token_post.json b/doc/schema/1.0/post_token.json
index f63577a..739c6c2 100644
--- a/doc/schema/1.0/token_post.json
+++ b/doc/schema/1.0/post_token.json
@@ -1,6 +1,6 @@
{
- "$schema": "http://api.kernelci.org/json-schema/1.0/token_post.json",
- "id": "http://api.kernelci.org/json-schema/1.0/token_post.json",
+ "$schema": "http://api.kernelci.org/json-schema/1.0/post_token.json",
+ "id": "http://api.kernelci.org/json-schema/1.0/post_token.json",
"title": "token",
"description": "The JSON schema to create/update tokens",
"type": "object",