openstack
/
trove
Code Issues Proposed changes

Pretty print JSON sample files 

Pretty print JSON samples to follow JSON formatting conventions (
https://wiki.openstack.org/wiki/Documentation/Conventions#JSON_formatting_conventions).

Change-Id: I26b2404e79d000d206516cea68d88acf23717569
Partial-Bug: #1217503
This commit is contained in:
Andreas Jaeger 2014-05-09 10:51:19 +02:00
parent e58fea01da
commit 5987ef710b
29 changed files with 329 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apidocs/src/samples/db-change-users-password-request.json
View File

@ -1,12 +1,12 @@
{
"users": [
{
"name": "dbuser1",
"password": "newpassword"
},
{
"name": "dbuser2",
"password": "anotherpassword"
}
]
"users": [
{
"name": "dbuser1",
"password": "newpassword"
},
{
"name": "dbuser2",
"password": "anotherpassword"
}
]
}

2
apidocs/src/samples/db-check-root-user-response.json
View File

@ -1,3 +1,3 @@
{
"rootEnabled": true
}
}

2
apidocs/src/samples/db-create-databases-request.json
View File

@ -12,4 +12,4 @@
"name": "oneMoreDB"
}
]
}
}

58
apidocs/src/samples/db-create-instance-request.json
View File

@ -1,30 +1,30 @@
{
"instance":{
"databases":[
{
"character_set":"utf8",
"collate":"utf8_general_ci",
"name":"sampledb"
},
{
"name":"nextround"
}
],
"flavorRef":1,
"name":"json_rack_instance",
"users":[
{
"databases":[
{
"name":"sampledb"
}
],
"name":"demouser",
"password":"demopassword"
}
],
"volume":{
"size":2
}
}
}
"instance": {
"databases": [
{
"character_set": "utf8",
"collate": "utf8_general_ci",
"name": "sampledb"
},
{
"name": "nextround"
}
],
"flavorRef": 1,
"name": "json_rack_instance",
"users": [
{
"databases": [
{
"name": "sampledb"
}
],
"name": "demouser",
"password": "demopassword"
}
],
"volume": {
"size": 2
}
}
}

60
apidocs/src/samples/db-create-instance-response.json
View File

@ -1,35 +1,35 @@
{
"instance":{
"created":"2013-03-18T19:09:17",
"flavor":{
"id":"1",
"links":[
"instance": {
"created": "2013-03-18T19:09:17",
"flavor": {
"id": "1",
"links": [
{
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
"rel": "self"
},
{
"href": "https://ord.databases.api.rackspacecloud.com/flavors/1",
"rel": "bookmark"
}
]
},
"id": "44b277eb-39be-4921-be31-3d61b43651d7",
"links": [
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
"rel":"self"
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel": "self"
},
{
"href":"https://ord.databases.api.rackspacecloud.com/flavors/1",
"rel":"bookmark"
"href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel": "bookmark"
}
]
},
"id":"44b277eb-39be-4921-be31-3d61b43651d7",
"links":[
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel":"self"
},
{
"href":"https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel":"bookmark"
}
],
"name":"json_rack_instance",
"status":"BUILD",
"updated":"2013-03-18T19:09:17",
"volume":{
"size":2
}
}
}
],
"name": "json_rack_instance",
"status": "BUILD",
"updated": "2013-03-18T19:09:17",
"volume": {
"size": 2
}
}
}

50
apidocs/src/samples/db-create-users-request.json
View File

@ -1,26 +1,26 @@
{
"users":[
{
"database":"databaseA",
"name":"dbuser1",
"password":"password"
},
{
"databases":[
{
"name":"databaseB"
},
{
"name":"databaseC"
}
],
"name":"dbuser2",
"password":"password"
},
{
"database":"databaseD",
"name":"dbuser3",
"password":"password"
}
]
}
"users": [
{
"database": "databaseA",
"name": "dbuser1",
"password": "password"
},
{
"databases": [
{
"name": "databaseB"
},
{
"name": "databaseC"
}
],
"name": "dbuser2",
"password": "password"
},
{
"database": "databaseD",
"name": "dbuser3",
"password": "password"
}
]
}

2
apidocs/src/samples/db-enable-root-user-response.json
View File

@ -3,4 +3,4 @@
"name": "root",
"password": "12345"
}
}
}

2
apidocs/src/samples/db-faults-badRequest.json
View File

@ -3,4 +3,4 @@
"code": 400,
"message": "Volume 'size' needs to be a positive integer value, -1.0 cannot be accepted."
}
}
}

2
apidocs/src/samples/db-faults-instanceFault.json
View File

@ -3,4 +3,4 @@
"code": 500,
"message": "The server has either erred or is incapable of performing the requested operation."
}
}
}

2
apidocs/src/samples/db-faults-itemNotFound.json
View File

@ -3,4 +3,4 @@
"code": 404,
"message": "The resource could not be found."
}
}
}

2
apidocs/src/samples/db-flavors-by-id-response.json
View File

@ -14,4 +14,4 @@
"name": "512MB Instance",
"ram": 512
}
}
}

2
apidocs/src/samples/db-flavors-response.json
View File

@ -91,4 +91,4 @@
"ram": 16384
}
]
}
}

16
apidocs/src/samples/db-grant-user-access-request.json
View File

@ -1,10 +1,10 @@
{
"databases": [
{
"name": "databaseC"
},
{
"name": "databaseD"
}
]
"databases": [
{
"name": "databaseC"
},
{
"name": "databaseD"
}
]
}

6
apidocs/src/samples/db-instance-resize-instance-request.json
View File

@ -1,5 +1,5 @@
{
"resize":{
"flavorRef":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/2"
}
"resize": {
"flavorRef": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/2"
}
}

10
apidocs/src/samples/db-instance-resize-volume-request.json
View File

@ -1,7 +1,7 @@
{
"resize":{
"volume":{
"size":4
}
}
"resize": {
"volume": {
"size": 4
}
}
}

4
apidocs/src/samples/db-instance-restart-request.json
View File

@ -1,5 +1,3 @@
{
"restart":{
}
"restart": {}
}

60
apidocs/src/samples/db-instance-status-detail-response.json
View File

@ -1,36 +1,36 @@
{
"instance":{
"created":"2013-03-18T19:09:17",
"flavor":{
"id":"1",
"links":[
"instance": {
"created": "2013-03-18T19:09:17",
"flavor": {
"id": "1",
"links": [
{
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
"rel": "self"
},
{
"href": "https://ord.databases.api.rackspacecloud.com/flavors/1",
"rel": "bookmark"
}
]
},
"id": "44b277eb-39be-4921-be31-3d61b43651d7",
"links": [
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
"rel":"self"
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel": "self"
},
{
"href":"https://ord.databases.api.rackspacecloud.com/flavors/1",
"rel":"bookmark"
"href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel": "bookmark"
}
]
},
"id":"44b277eb-39be-4921-be31-3d61b43651d7",
"links":[
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel":"self"
},
{
"href":"https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel":"bookmark"
}
],
"name":"json_rack_instance",
"status":"ACTIVE",
"updated":"2013-03-18T19:09:17",
"volume":{
"size":2,
"used":0.16368598397821188
}
}
],
"name": "json_rack_instance",
"status": "ACTIVE",
"updated": "2013-03-18T19:09:17",
"volume": {
"size": 2,
"used": 0.16368598397821188
}
}
}

132
apidocs/src/samples/db-instances-index-pagination-response.json
View File

@ -1,72 +1,72 @@
{
"instances":[
{
"flavor":{
"id":"1",
"links":[
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
"rel":"self"
},
{
"href":"https://ord.databases.api.rackspacecloud.com/flavors/1",
"rel":"bookmark"
}
]
},
"id":"098653ba-218b-47ce-936a-e0b749101f81",
"links":[
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81",
"rel":"self"
"instances": [
{
"flavor": {
"id": "1",
"links": [
{
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
"rel": "self"
},
{
"href": "https://ord.databases.api.rackspacecloud.com/flavors/1",
"rel": "bookmark"
}
]
},
{
"href":"https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81",
"rel":"bookmark"
"id": "098653ba-218b-47ce-936a-e0b749101f81",
"links": [
{
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81",
"rel": "self"
},
{
"href": "https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81",
"rel": "bookmark"
}
],
"name": "xml_rack_instance",
"status": "ACTIVE",
"volume": {
"size": 2
}
],
"name":"xml_rack_instance",
"status":"ACTIVE",
"volume":{
"size":2
}
},
{
"flavor":{
"id":"1",
"links":[
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
"rel":"self"
},
{
"href":"https://ord.databases.api.rackspacecloud.com/flavors/1",
"rel":"bookmark"
}
]
},
"id":"44b277eb-39be-4921-be31-3d61b43651d7",
"links":[
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel":"self"
},
{
"flavor": {
"id": "1",
"links": [
{
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
"rel": "self"
},
{
"href": "https://ord.databases.api.rackspacecloud.com/flavors/1",
"rel": "bookmark"
}
]
},
{
"href":"https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel":"bookmark"
"id": "44b277eb-39be-4921-be31-3d61b43651d7",
"links": [
{
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel": "self"
},
{
"href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel": "bookmark"
}
],
"name": "json_rack_instance",
"status": "ACTIVE",
"volume": {
"size": 2
}
],
"name":"json_rack_instance",
"status":"ACTIVE",
"volume":{
"size":2
}
}
],
"links":[
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances?marker=44b277eb-39be-4921-be31-3d61b43651d7&limit=2",
"rel":"next"
}
]
}
],
"links": [
{
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances?marker=44b277eb-39be-4921-be31-3d61b43651d7&limit=2",
"rel": "next"
}
]
}

120
apidocs/src/samples/db-instances-index-response.json
View File

@ -1,66 +1,66 @@
{
"instances":[
{
"flavor":{
"id":"1",
"links":[
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
"rel":"self"
},
{
"href":"https://ord.databases.api.rackspacecloud.com/flavors/1",
"rel":"bookmark"
}
]
},
"id":"098653ba-218b-47ce-936a-e0b749101f81",
"links":[
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81",
"rel":"self"
"instances": [
{
"flavor": {
"id": "1",
"links": [
{
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
"rel": "self"
},
{
"href": "https://ord.databases.api.rackspacecloud.com/flavors/1",
"rel": "bookmark"
}
]
},
{
"href":"https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81",
"rel":"bookmark"
"id": "098653ba-218b-47ce-936a-e0b749101f81",
"links": [
{
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81",
"rel": "self"
},
{
"href": "https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81",
"rel": "bookmark"
}
],
"name": "xml_rack_instance",
"status": "ACTIVE",
"volume": {
"size": 2
}
],
"name":"xml_rack_instance",
"status":"ACTIVE",
"volume":{
"size":2
}
},
{
"flavor":{
"id":"1",
"links":[
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
"rel":"self"
},
{
"href":"https://ord.databases.api.rackspacecloud.com/flavors/1",
"rel":"bookmark"
}
]
},
"id":"44b277eb-39be-4921-be31-3d61b43651d7",
"links":[
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel":"self"
},
{
"flavor": {
"id": "1",
"links": [
{
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
"rel": "self"
},
{
"href": "https://ord.databases.api.rackspacecloud.com/flavors/1",
"rel": "bookmark"
}
]
},
{
"href":"https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel":"bookmark"
"id": "44b277eb-39be-4921-be31-3d61b43651d7",
"links": [
{
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel": "self"
},
{
"href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
"rel": "bookmark"
}
],
"name": "json_rack_instance",
"status": "ACTIVE",
"volume": {
"size": 2
}
],
"name":"json_rack_instance",
"status":"ACTIVE",
"volume":{
"size":2
}
}
]
}
]
}

24
apidocs/src/samples/db-list-databases-pagination-response.json
View File

@ -1,13 +1,13 @@
{
"databases":[
{
"name":"anotherdb"
}
],
"links":[
{
"href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/databases?marker=anotherdb&limit=1",
"rel":"next"
}
]
}
"databases": [
{
"name": "anotherdb"
}
],
"links": [
{
"href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/databases?marker=anotherdb&limit=1",
"rel": "next"
}
]
}

34
apidocs/src/samples/db-list-databases-response.json
View File

@ -1,19 +1,19 @@
{
"databases":[
{
"name":"anotherdb"
},
{
"name":"nextround"
},
{
"name":"oneMoreDB"
},
{
"name":"sampledb"
},
{
"name":"testingdb"
}
]
"databases": [
{
"name": "anotherdb"
},
{
"name": "nextround"
},
{
"name": "oneMoreDB"
},
{
"name": "sampledb"
},
{
"name": "testingdb"
}
]
}

16
apidocs/src/samples/db-list-user-access-response.json
View File

@ -1,10 +1,10 @@
{
"databases": [
{
"name": "databaseA"
},
{
"name": "databaseB"
}
]
"databases": [
{
"name": "databaseA"
},
{
"name": "databaseB"
}
]
}

22
apidocs/src/samples/db-list-user-dbs-response.json
View File

@ -1,13 +1,13 @@
{
"user": {
"name": "exampleuser",
"databases": [
{
"name": "databaseA"
},
{
"name": "databaseB"
}
]
}
"user": {
"name": "exampleuser",
"databases": [
{
"name": "databaseA"
},
{
"name": "databaseB"
}
]
}
}

2
apidocs/src/samples/db-list-users-pagination-response.json
View File

@ -22,4 +22,4 @@
"name": "dbuser2"
}
]
}
}

2
apidocs/src/samples/db-list-users-response.json
View File

@ -28,4 +28,4 @@
"name": "demouser"
}
]
}
}

2
apidocs/src/samples/db-version-response.json
View File

@ -10,4 +10,4 @@
"status": "CURRENT",
"updated": "2012-01-01T00:00:00Z"
}
}
}

2
apidocs/src/samples/db-versions-response.json
View File

@ -12,4 +12,4 @@
"updated": "2012-01-01T00:00:00Z"
}
]
}
}

2
trove/templates/mysql/validation-rules.json
View File

@ -221,4 +221,4 @@
"type": "string"
}
]
}
}

2
trove/templates/percona/validation-rules.json
View File

@ -221,4 +221,4 @@
"type": "string"
}
]
}
}