diff --git a/qiskit/schemas/backend_config_schema.json b/qiskit/schemas/backend_configuration_schema.json similarity index 100% rename from qiskit/schemas/backend_config_schema.json rename to qiskit/schemas/backend_configuration_schema.json diff --git a/qiskit/schemas/backend_props_schema.json b/qiskit/schemas/backend_properties_schema.json similarity index 100% rename from qiskit/schemas/backend_props_schema.json rename to qiskit/schemas/backend_properties_schema.json diff --git a/qiskit/schemas/backend_status_schema.json b/qiskit/schemas/backend_status_schema.json index 59eb6ce07985..7c28d2394cdc 100644 --- a/qiskit/schemas/backend_status_schema.json +++ b/qiskit/schemas/backend_status_schema.json @@ -4,14 +4,14 @@ "description": "OpenQuantum backend status schema", "type": "object", "required": [ - "available", + "operational", "pending_jobs", "status_msg" ], "properties": { - "available": { + "operational": { "type": "boolean", - "description": "Backend is available true/false" + "description": "Backend operational and accepting jobs (true/false)" }, "pending_jobs": { "type": "integer", "minimum": 0, @@ -22,4 +22,4 @@ "description": "Status message" } } -} \ No newline at end of file +} diff --git a/qiskit/schemas/default_pulse_config_schema.json b/qiskit/schemas/default_pulse_configuration_schema.json similarity index 100% rename from qiskit/schemas/default_pulse_config_schema.json rename to qiskit/schemas/default_pulse_configuration_schema.json diff --git a/qiskit/schemas/examples/backend_config_example_openpulse.json b/qiskit/schemas/examples/backend_configuration_openpulse_example.json similarity index 100% rename from qiskit/schemas/examples/backend_config_example_openpulse.json rename to qiskit/schemas/examples/backend_configuration_openpulse_example.json diff --git a/qiskit/schemas/examples/backend_config_example_openqasm.json b/qiskit/schemas/examples/backend_configuration_openqasm_example.json similarity index 100% rename from qiskit/schemas/examples/backend_config_example_openqasm.json rename to qiskit/schemas/examples/backend_configuration_openqasm_example.json diff --git a/qiskit/schemas/examples/backend_props_example.json b/qiskit/schemas/examples/backend_properties_example.json similarity index 100% rename from qiskit/schemas/examples/backend_props_example.json rename to qiskit/schemas/examples/backend_properties_example.json diff --git a/qiskit/schemas/examples/backend_status_example.json b/qiskit/schemas/examples/backend_status_example.json index 9889d69b7589..4fecb020d794 100644 --- a/qiskit/schemas/examples/backend_status_example.json +++ b/qiskit/schemas/examples/backend_status_example.json @@ -1,5 +1,5 @@ { - "available": false, + "operational": false, "pending_jobs": 10, "status_msg": "Paused for recalibration" -} \ No newline at end of file +} diff --git a/qiskit/schemas/examples/default_pulse_config_example.json b/qiskit/schemas/examples/default_pulse_configuration_example.json similarity index 100% rename from qiskit/schemas/examples/default_pulse_config_example.json rename to qiskit/schemas/examples/default_pulse_configuration_example.json diff --git a/qiskit/schemas/examples/qobj_example_openpulse.json b/qiskit/schemas/examples/qobj_openpulse_example.json similarity index 100% rename from qiskit/schemas/examples/qobj_example_openpulse.json rename to qiskit/schemas/examples/qobj_openpulse_example.json diff --git a/qiskit/schemas/examples/qobj_example_openqasm.json b/qiskit/schemas/examples/qobj_openqasm_example.json similarity index 100% rename from qiskit/schemas/examples/qobj_example_openqasm.json rename to qiskit/schemas/examples/qobj_openqasm_example.json diff --git a/qiskit/schemas/examples/result_example_openpulse_lev0.json b/qiskit/schemas/examples/result_openpulse_level_0_example.json similarity index 100% rename from qiskit/schemas/examples/result_example_openpulse_lev0.json rename to qiskit/schemas/examples/result_openpulse_level_0_example.json diff --git a/qiskit/schemas/examples/result_example_openpulse_lev1.json b/qiskit/schemas/examples/result_openpulse_level_1_example.json similarity index 100% rename from qiskit/schemas/examples/result_example_openpulse_lev1.json rename to qiskit/schemas/examples/result_openpulse_level_1_example.json diff --git a/qiskit/schemas/examples/result_example_openqasm.json b/qiskit/schemas/examples/result_openqasm_example.json similarity index 100% rename from qiskit/schemas/examples/result_example_openqasm.json rename to qiskit/schemas/examples/result_openqasm_example.json diff --git a/qiskit/schemas/examples/result_example_snapshots.json b/qiskit/schemas/examples/result_snapshots_example.json similarity index 100% rename from qiskit/schemas/examples/result_example_snapshots.json rename to qiskit/schemas/examples/result_snapshots_example.json diff --git a/qiskit/schemas/examples/result_example_statevector_simulator.json b/qiskit/schemas/examples/result_statevector_simulator_example.json similarity index 100% rename from qiskit/schemas/examples/result_example_statevector_simulator.json rename to qiskit/schemas/examples/result_statevector_simulator_example.json diff --git a/qiskit/schemas/examples/result_example_unitary_simulator.json b/qiskit/schemas/examples/result_unitary_simulator_example.json similarity index 100% rename from qiskit/schemas/examples/result_example_unitary_simulator.json rename to qiskit/schemas/examples/result_unitary_simulator_example.json diff --git a/test/schemas/check_schemas.py b/test/schemas/check_schemas.py index 1a7de8d8e921..23c63980691a 100644 --- a/test/schemas/check_schemas.py +++ b/test/schemas/check_schemas.py @@ -17,8 +17,6 @@ """ Created on Sat Apr 21 01:58:06 2018 -@author: dcmckay - Test the schemas against the examples as a batch file. Run as `python test_schemas.py' """ @@ -38,22 +36,22 @@ print(cur_file_path) """List the schemas and their examples.""" -schema_tests.append({"schema": "backend_config_schema.json", +schema_tests.append({"schema": "backend_configuration_schema.json", "examples": [ - "backend_config_example_openpulse.json", - "backend_config_example_openqasm.json" + "backend_configuration_openpulse_example.json", + "backend_configuration_openqasm_example.json" ]}) -schema_tests.append({"schema": "backend_props_schema.json", +schema_tests.append({"schema": "backend_properties_schema.json", "examples": [ - "backend_props_example.json" + "backend_properties_example.json" ]}) schema_tests.append({"schema": "backend_status_schema.json", "examples": [ "backend_status_example.json" ]}) -schema_tests.append({"schema": "default_pulse_config_schema.json", +schema_tests.append({"schema": "default_pulse_configuration_schema.json", "examples": [ - "default_pulse_config_example.json" + "default_pulse_configuration_example.json" ]}) schema_tests.append({"schema": "job_status_schema.json", "examples": [ @@ -61,17 +59,17 @@ ]}) schema_tests.append({"schema": "qobj_schema.json", "examples": [ - "qobj_example_openpulse.json", - "qobj_example_openqasm.json" + "qobj_openpulse_example.json", + "qobj_openqasm_example.json" ]}) schema_tests.append({"schema": "result_schema.json", "examples": [ - "result_example_openqasm.json", - "result_example_openpulse_lev0.json", - "result_example_openpulse_lev1.json", - "result_example_snapshots.json", - "result_example_statevector_simulator.json", - "result_example_unitary_simulator.json" + "result_openqasm_example.json", + "result_openpulse_level_0_example.json", + "result_openpulse_level_1_example.json", + "result_snapshots_example.json", + "result_statevector_simulator_example.json", + "result_unitary_simulator_example.json" ]}) """Run through each schema."""