From af18a0f993ffe6119f3b0c347c2c861c088d628c Mon Sep 17 00:00:00 2001 From: Diane Fleming Date: Sat, 4 Jan 2014 15:17:43 -0600 Subject: [PATCH] Remove text from json and xml files Closes-Bug: #1266077 Change-Id: I4a8982c40d2ee854ce1043ef73f64ac5bc2b3506 author: diane fleming --- v1/src/openstack-blockstorage-devguide.xml | 38 ++++--- v1/src/samples/db-faults-badRequest.json | 5 - v1/src/samples/db-faults-badRequest.xml | 14 +-- v1/src/samples/db-faults-instanceFault.json | 5 - v1/src/samples/db-faults-instanceFault.xml | 14 +-- v1/src/samples/db-faults-itemNotFound.json | 5 - v1/src/samples/db-faults-itemNotFound.xml | 13 +-- v2/src/openstack-blockstorage-devguide.xml | 113 ++++++++++---------- v2/src/samples/db-faults-badRequest.json | 13 +-- v2/src/samples/db-faults-badRequest.xml | 14 +-- v2/src/samples/db-faults-instanceFault.json | 13 +-- v2/src/samples/db-faults-instanceFault.xml | 14 +-- v2/src/samples/db-faults-itemNotFound.json | 13 +-- v2/src/samples/db-faults-itemNotFound.xml | 13 +-- 14 files changed, 124 insertions(+), 163 deletions(-) diff --git a/v1/src/openstack-blockstorage-devguide.xml b/v1/src/openstack-blockstorage-devguide.xml index 258a612..7fe1edd 100644 --- a/v1/src/openstack-blockstorage-devguide.xml +++ b/v1/src/openstack-blockstorage-devguide.xml @@ -566,14 +566,20 @@ format="SVG" scale="60"/> erred or cannot perform the requested operation: Example instanceFault Response: XML - + HTTP/1.1 500 Internal Server Error +Content-Type: application/xml +Content-Length: 121 +Date: Mon, 28 Nov 2011 18:19:37 GMT Example Fault Response: JSON - +HTTP/1.1 500 Internal Server Error +Content-Length: 120 +Content-Type: application/json; charset=UTF-8 +Date: Tue, 29 Nov 2011 00:33:48 GMT @@ -590,14 +596,18 @@ format="SVG" scale="60"/> when the volume size is invalid: Example badRequest Fault on Volume Size Errors: XML - - - - +HTTP/1.1 400 None +Content-Type: application/xml +Content-Length: 121 +Date: Mon, 28 Nov 2011 18:19:37 GMT + Example badRequest Fault on Volume Size Errors: JSON - +HTTP/1.1 400 None +Content-Length: 120 +Content-Type: application/json; charset=UTF-8 +Date: Tue, 29 Nov 2011 00:33:48 GMT @@ -605,14 +615,18 @@ format="SVG" scale="60"/> The next two examples show itemNotFound errors: Example itemNotFound Fault: XML - - - - + HTTP/1.1 404 Not Found +Content-Length: 147 +Content-Type: application/xml; charset=UTF-8 +Date: Mon, 28 Nov 2011 19:50:15 GMT + Example itemNotFound Fault: JSON - + HTTP/1.1 404 Not Found +Content-Length: 78 +Content-Type: application/json; charset=UTF-8 +Date: Tue, 29 Nov 2011 00:35:24 GMT diff --git a/v1/src/samples/db-faults-badRequest.json b/v1/src/samples/db-faults-badRequest.json index fcb4571..2b04f07 100644 --- a/v1/src/samples/db-faults-badRequest.json +++ b/v1/src/samples/db-faults-badRequest.json @@ -1,8 +1,3 @@ -HTTP/1.1 400 None -Content-Length: 120 -Content-Type: application/json; charset=UTF-8 -Date: Tue, 29 Nov 2011 00:33:48 GMT - { "badRequest": { "code": 400, diff --git a/v1/src/samples/db-faults-badRequest.xml b/v1/src/samples/db-faults-badRequest.xml index 72400d6..5a5de57 100644 --- a/v1/src/samples/db-faults-badRequest.xml +++ b/v1/src/samples/db-faults-badRequest.xml @@ -1,10 +1,6 @@ -HTTP/1.1 400 None -Content-Type: application/xml -Content-Length: 121 -Date: Mon, 28 Nov 2011 18:19:37 GMT - - - - Volume 'size' needs to be a positive integer value, -1.0 cannot be accepted. - + + + Volume 'size' needs to be a positive integer value, -1.0 + cannot be accepted. diff --git a/v1/src/samples/db-faults-instanceFault.json b/v1/src/samples/db-faults-instanceFault.json index 97299fc..e9b42d5 100644 --- a/v1/src/samples/db-faults-instanceFault.json +++ b/v1/src/samples/db-faults-instanceFault.json @@ -1,8 +1,3 @@ -HTTP/1.1 500 Internal Server Error -Content-Length: 120 -Content-Type: application/json; charset=UTF-8 -Date: Tue, 29 Nov 2011 00:33:48 GMT - { "instanceFault": { "code": 500, diff --git a/v1/src/samples/db-faults-instanceFault.xml b/v1/src/samples/db-faults-instanceFault.xml index 40a1ecf..a4fa33b 100644 --- a/v1/src/samples/db-faults-instanceFault.xml +++ b/v1/src/samples/db-faults-instanceFault.xml @@ -1,10 +1,6 @@ -HTTP/1.1 500 Internal Server Error -Content-Type: application/xml -Content-Length: 121 -Date: Mon, 28 Nov 2011 18:19:37 GMT - - - - The server has either erred or is incapable of performing the requested operation. - + + + The server has either erred or is incapable of + performing the requested operation. diff --git a/v1/src/samples/db-faults-itemNotFound.json b/v1/src/samples/db-faults-itemNotFound.json index 866329b..6c73183 100644 --- a/v1/src/samples/db-faults-itemNotFound.json +++ b/v1/src/samples/db-faults-itemNotFound.json @@ -1,8 +1,3 @@ -HTTP/1.1 404 Not Found -Content-Length: 78 -Content-Type: application/json; charset=UTF-8 -Date: Tue, 29 Nov 2011 00:35:24 GMT - { "itemNotFound": { "code": 404, diff --git a/v1/src/samples/db-faults-itemNotFound.xml b/v1/src/samples/db-faults-itemNotFound.xml index 19aeaa6..3d11d9d 100644 --- a/v1/src/samples/db-faults-itemNotFound.xml +++ b/v1/src/samples/db-faults-itemNotFound.xml @@ -1,10 +1,5 @@ -HTTP/1.1 404 Not Found -Content-Length: 147 -Content-Type: application/xml; charset=UTF-8 -Date: Mon, 28 Nov 2011 19:50:15 GMT - - - - The resource could not be found. - + + + The resource could not be found. diff --git a/v2/src/openstack-blockstorage-devguide.xml b/v2/src/openstack-blockstorage-devguide.xml index 7850729..cf4fce1 100644 --- a/v2/src/openstack-blockstorage-devguide.xml +++ b/v2/src/openstack-blockstorage-devguide.xml @@ -392,7 +392,7 @@ Host: dfw.blockstorage.api.openstackcloud.com X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb Accept: application/xml - Therefore an XML response format is returned: + An XML response format is returned: Response with headers HTTP/1.1 200 OK @@ -506,8 +506,7 @@ X-Compute-Request-Id: req-8e0295cd-a283-46e4-96da-cae05cbfd1c7 Block Storage - Maximum amount of block storage (in - GBs) + Maximum amount of block storage 1 TB @@ -670,12 +669,18 @@ X-Compute-Request-Id: req-8e0295cd-a283-46e4-96da-cae05cbfd1c7 requested operation: Example instanceFault response: XML - + HTTP/1.1 500 Internal Server Error +Content-Type: application/xml +Content-Length: 121 +Date: Mon, 28 Nov 2011 18:19:37 GMT Example fault response: JSON - + HTTP/1.1 500 Internal Server Error +Content-Length: 120 +Content-Type: application/json; charset=UTF-8 +Date: Tue, 29 Nov 2011 00:33:48 GMT The error code (code) is returned in the body @@ -695,25 +700,37 @@ X-Compute-Request-Id: req-8e0295cd-a283-46e4-96da-cae05cbfd1c7 Example badRequest fault on volume size errors: XML - + HTTP/1.1 400 None +Content-Type: application/xml +Content-Length: 121 +Date: Mon, 28 Nov 2011 18:19:37 GMT Example badRequest fault on volume size errors: JSON - + HTTP/1.1 400 None +Content-Length: 120 +Content-Type: application/json; charset=UTF-8 +Date: Tue, 29 Nov 2011 00:33:48 GMT The next two examples show itemNotFound errors: Example itemNotFound fault: XML - + HTTP/1.1 404 Not Found +Content-Length: 147 +Content-Type: application/xml; charset=UTF-8 +Date: Mon, 28 Nov 2011 19:50:15 GMT Example itemNotFound fault: JSON - + HTTP/1.1 404 Not Found +Content-Length: 78 +Content-Type: application/json; charset=UTF-8 +Date: Tue, 29 Nov 2011 00:35:24 GMT @@ -740,55 +757,50 @@ X-Compute-Request-Id: req-8e0295cd-a283-46e4-96da-cae05cbfd1c7 CREATING - The volume is being created. - + The volume is being created. AVAILABLE The volume is ready to be attached to an - instance. - + instance. ATTACHING - The volume is attaching to an instance. - + The volume is attaching to an + instance. IN-USE - The volume is attached to an instance. - + The volume is attached to an + instance. DELETING - The volume is being deleted. - + The volume is being deleted. ERROR - An error has occurred with the volume. - + An error has occurred with the + volume. ERROR_DELETING - There was an error deleting the volume. - + There was an error deleting the + volume. BACKING-UP - The volume is being backed up. - + The volume is being backed up. RESTORING-BACKUP - A backup is being restored to the volume. - + A backup is being restored to the + volume. ERROR_RESTORING There was an error restoring a backup to the - volume. - + volume. @@ -827,32 +839,28 @@ X-Compute-Request-Id: req-8e0295cd-a283-46e4-96da-cae05cbfd1c7 CREATING - The snapshot is being created. - + The snapshot is being created. AVAILABLE - The snapshot is ready to be used. - + The snapshot is ready to be used. DELETING - The snapshot is being deleted. - + The snapshot is being deleted. ERROR - An error occurred with the snapshot. - + An error occurred with the snapshot. ERROR_DELETING - There was an error deleting the snapshot. - + There was an error deleting the + snapshot. @@ -906,41 +914,36 @@ X-Compute-Request-Id: req-8e0295cd-a283-46e4-96da-cae05cbfd1c7 CREATING - The backup is being created. - + The backup is being created. AVAILABLE The backup is ready to be restored to a - volume. - + volume. DELETING - The backup is being deleted. - + The backup is being deleted. ERROR - An error has occurred with the backup. - + An error has occurred with the + backup. RESTORING The backup is being restored to a - volume. - + volume. ERROR_RESTORING There was an error restoring a backup to the - volume. - + volume. @@ -1028,7 +1031,7 @@ Accept: application/json Create backup response: JSON - Returns status code 202 on success + Returns status code 202 on success.
List backups @@ -1048,7 +1051,7 @@ Accept: application/json &GET; /backups Lists backups defined in Block Storage that the - tenant who submits the request can access. + tenant who submits the request can access. @@ -1083,7 +1086,7 @@ Accept: application/json /backups/details Lists detailed information for backups defined in Block Storage that the tenant who submits the - request can access. + request can access. @@ -1117,7 +1120,7 @@ Accept: application/json &GET; /backups/backup-id Lists detailed information for a specified backup - ID. + ID. diff --git a/v2/src/samples/db-faults-badRequest.json b/v2/src/samples/db-faults-badRequest.json index fcb4571..ddde378 100644 --- a/v2/src/samples/db-faults-badRequest.json +++ b/v2/src/samples/db-faults-badRequest.json @@ -1,11 +1,6 @@ -HTTP/1.1 400 None -Content-Length: 120 -Content-Type: application/json; charset=UTF-8 -Date: Tue, 29 Nov 2011 00:33:48 GMT - { - "badRequest": { - "code": 400, - "message": "Volume 'size' needs to be a positive integer value, -1.0 cannot be accepted." - } + "badRequest":{ + "code":400, + "message":"Volume 'size' needs to be a positive integer value, -1.0 cannot be accepted." + } } diff --git a/v2/src/samples/db-faults-badRequest.xml b/v2/src/samples/db-faults-badRequest.xml index 4161680..1388dc8 100644 --- a/v2/src/samples/db-faults-badRequest.xml +++ b/v2/src/samples/db-faults-badRequest.xml @@ -1,10 +1,6 @@ -HTTP/1.1 400 None -Content-Type: application/xml -Content-Length: 121 -Date: Mon, 28 Nov 2011 18:19:37 GMT - - - - Volume 'size' needs to be a positive integer value, -1.0 cannot be accepted. - + + + Volume 'size' needs to be a positive integer value, -1.0 + cannot be accepted. diff --git a/v2/src/samples/db-faults-instanceFault.json b/v2/src/samples/db-faults-instanceFault.json index 97299fc..58ab3df 100644 --- a/v2/src/samples/db-faults-instanceFault.json +++ b/v2/src/samples/db-faults-instanceFault.json @@ -1,11 +1,6 @@ -HTTP/1.1 500 Internal Server Error -Content-Length: 120 -Content-Type: application/json; charset=UTF-8 -Date: Tue, 29 Nov 2011 00:33:48 GMT - { - "instanceFault": { - "code": 500, - "message": "The server has either erred or is incapable of performing the requested operation." - } + "instanceFault":{ + "code":500, + "message":"The server has either erred or is incapable of performing the requested operation." + } } diff --git a/v2/src/samples/db-faults-instanceFault.xml b/v2/src/samples/db-faults-instanceFault.xml index 3329112..4b26769 100644 --- a/v2/src/samples/db-faults-instanceFault.xml +++ b/v2/src/samples/db-faults-instanceFault.xml @@ -1,10 +1,6 @@ -HTTP/1.1 500 Internal Server Error -Content-Type: application/xml -Content-Length: 121 -Date: Mon, 28 Nov 2011 18:19:37 GMT - - - - The server has either erred or is incapable of performing the requested operation. - + + + The server has either erred or is incapable of + performing the requested operation. diff --git a/v2/src/samples/db-faults-itemNotFound.json b/v2/src/samples/db-faults-itemNotFound.json index 866329b..8718a23 100644 --- a/v2/src/samples/db-faults-itemNotFound.json +++ b/v2/src/samples/db-faults-itemNotFound.json @@ -1,11 +1,6 @@ -HTTP/1.1 404 Not Found -Content-Length: 78 -Content-Type: application/json; charset=UTF-8 -Date: Tue, 29 Nov 2011 00:35:24 GMT - { - "itemNotFound": { - "code": 404, - "message": "The resource could not be found." - } + "itemNotFound":{ + "code":404, + "message":"The resource could not be found." + } } diff --git a/v2/src/samples/db-faults-itemNotFound.xml b/v2/src/samples/db-faults-itemNotFound.xml index 72df201..e75bca8 100644 --- a/v2/src/samples/db-faults-itemNotFound.xml +++ b/v2/src/samples/db-faults-itemNotFound.xml @@ -1,10 +1,5 @@ -HTTP/1.1 404 Not Found -Content-Length: 147 -Content-Type: application/xml; charset=UTF-8 -Date: Mon, 28 Nov 2011 19:50:15 GMT - - - - The resource could not be found. - + + + The resource could not be found.