From 9c172cf523eb26ec74e6ee82df912de0bca1bfc5 Mon Sep 17 00:00:00 2001 From: Diane Fleming Date: Wed, 21 May 2014 14:51:26 -0500 Subject: [PATCH] Update directory structure to match openstack-manuals Changed "Block Storage Service" to "Block Storage" Updated pom.xml files according to new directory structure Change-Id: Iecfa1a1c4d03f35ce2f35445707e9c509ba2ece9 author: diane fleming --- ...ide.xml => bk_blockstorage_api_ref_v1.xml} | 13 ++++--- v1/pom.xml | 6 ++-- .../samples/db-faults-badRequest.json | 0 v1/{src => }/samples/db-faults-badRequest.xml | 0 .../samples/db-faults-instanceFault.json | 0 .../samples/db-faults-instanceFault.xml | 0 .../samples/db-faults-itemNotFound.json | 0 .../samples/db-faults-itemNotFound.xml | 0 ...ide.xml => bk_blockstorage_api_ref_v2.xml} | 34 +++++++++---------- v2/pom.xml | 6 ++-- .../samples/db-faults-badRequest.json | 0 v2/{src => }/samples/db-faults-badRequest.xml | 0 .../samples/db-faults-instanceFault.json | 0 .../samples/db-faults-instanceFault.xml | 0 .../samples/db-faults-itemNotFound.json | 0 .../samples/db-faults-itemNotFound.xml | 0 16 files changed, 28 insertions(+), 31 deletions(-) rename v1/{src/openstack-blockstorage-devguide.xml => bk_blockstorage_api_ref_v1.xml} (99%) rename v1/{src => }/samples/db-faults-badRequest.json (100%) rename v1/{src => }/samples/db-faults-badRequest.xml (100%) rename v1/{src => }/samples/db-faults-instanceFault.json (100%) rename v1/{src => }/samples/db-faults-instanceFault.xml (100%) rename v1/{src => }/samples/db-faults-itemNotFound.json (100%) rename v1/{src => }/samples/db-faults-itemNotFound.xml (100%) rename v2/{src/openstack-blockstorage-devguide.xml => bk_blockstorage_api_ref_v2.xml} (97%) rename v2/{src => }/samples/db-faults-badRequest.json (100%) rename v2/{src => }/samples/db-faults-badRequest.xml (100%) rename v2/{src => }/samples/db-faults-instanceFault.json (100%) rename v2/{src => }/samples/db-faults-instanceFault.xml (100%) rename v2/{src => }/samples/db-faults-itemNotFound.json (100%) rename v2/{src => }/samples/db-faults-itemNotFound.xml (100%) diff --git a/v1/src/openstack-blockstorage-devguide.xml b/v1/bk_blockstorage_api_ref_v1.xml similarity index 99% rename from v1/src/openstack-blockstorage-devguide.xml rename to v1/bk_blockstorage_api_ref_v1.xml index b5e7cbe..7d9c3f0 100644 --- a/v1/src/openstack-blockstorage-devguide.xml +++ b/v1/bk_blockstorage_api_ref_v1.xml @@ -299,13 +299,12 @@ format="SVG" scale="60"/> representation that can be used to efficiently determine when the state of services has changed. - - + - - + + @@ -384,7 +383,7 @@ format="SVG" scale="60"/> for all API operations for all &GET;, &POST;, &PUT;, and &DELETE; calls for volumes:
Response FormatsResponse formats
FormatAccept HeaderQuery ExtensionAccept headerQuery extension Default
- + @@ -442,7 +441,7 @@ format="SVG" scale="60"/> Refer to the following table for the absolute limits that are set.
Default Rate LimitsDefault rate limits
Verb
- + @@ -479,7 +478,7 @@ format="SVG" scale="60"/> 2011-05-19T08:07:08-05:00
Absolute LimitsAbsolute limits
- + diff --git a/v1/pom.xml b/v1/pom.xml index 44cb760..f8712b4 100644 --- a/v1/pom.xml +++ b/v1/pom.xml @@ -59,7 +59,7 @@ 1.0${basedir}/target/docbkx/webhelp/api/openstack-block-storage0 - openstack-blockstorage-devguide-1.0 + openstack-blockstorage-api-ref @@ -84,9 +84,9 @@ true - src + . - openstack-blockstorage-devguide.xml + bk_blockstorage_api_ref_v1.xml reviewer openstack diff --git a/v1/src/samples/db-faults-badRequest.json b/v1/samples/db-faults-badRequest.json similarity index 100% rename from v1/src/samples/db-faults-badRequest.json rename to v1/samples/db-faults-badRequest.json diff --git a/v1/src/samples/db-faults-badRequest.xml b/v1/samples/db-faults-badRequest.xml similarity index 100% rename from v1/src/samples/db-faults-badRequest.xml rename to v1/samples/db-faults-badRequest.xml diff --git a/v1/src/samples/db-faults-instanceFault.json b/v1/samples/db-faults-instanceFault.json similarity index 100% rename from v1/src/samples/db-faults-instanceFault.json rename to v1/samples/db-faults-instanceFault.json diff --git a/v1/src/samples/db-faults-instanceFault.xml b/v1/samples/db-faults-instanceFault.xml similarity index 100% rename from v1/src/samples/db-faults-instanceFault.xml rename to v1/samples/db-faults-instanceFault.xml diff --git a/v1/src/samples/db-faults-itemNotFound.json b/v1/samples/db-faults-itemNotFound.json similarity index 100% rename from v1/src/samples/db-faults-itemNotFound.json rename to v1/samples/db-faults-itemNotFound.json diff --git a/v1/src/samples/db-faults-itemNotFound.xml b/v1/samples/db-faults-itemNotFound.xml similarity index 100% rename from v1/src/samples/db-faults-itemNotFound.xml rename to v1/samples/db-faults-itemNotFound.xml diff --git a/v2/src/openstack-blockstorage-devguide.xml b/v2/bk_blockstorage_api_ref_v2.xml similarity index 97% rename from v2/src/openstack-blockstorage-devguide.xml rename to v2/bk_blockstorage_api_ref_v2.xml index cb0e46a..b640307 100644 --- a/v2/src/openstack-blockstorage-devguide.xml +++ b/v2/bk_blockstorage_api_ref_v2.xml @@ -5,7 +5,7 @@ PUT'> POST'> DELETE'> - + @@ -30,9 +30,9 @@ format="SVG" scale="60"/> xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="openstack-blockstorage-devguide"> - OpenStack Block Storage Service API v2 Reference + OpenStack Block Storage API v2 Reference - Block Storage Service API Reference + Block Storage API Reference @@ -48,8 +48,8 @@ format="SVG" scale="60"/> 2014 OpenStack Foundation - API v2 - OpenStack Block Storage Service + API v2 and extensions + OpenStack Block Storage @@ -59,9 +59,8 @@ format="SVG" scale="60"/> This document is for software developers who develop - applications by using the OpenStack Block Storage Service - Application Programming Interface - (API). + applications by using the OpenStack Block Storage Application + Programming Interface (API). @@ -182,8 +181,8 @@ format="SVG" scale="60"/> xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml"> Overview - OpenStack Block Storage Service is a block-level storage - solution that enables you to: + OpenStack Block Storage is a block-level storage solution + that enables you to: Mount drives to OpenStack Cloud Servers to scale storage without paying for more compute @@ -515,9 +514,8 @@ X-Compute-Request-Id: req-8e0295cd-a283-46e4-96da-cae05cbfd1c7
Date and time format - The Block Storage Service uses an ISO-8601 compliant date - format for the display and consumption of date time - values. + Block Storage uses an ISO-8601 compliant date format for + the display and consumption of date time values. DB service date and time format yyyy-MM-dd'T'HH:mm:ss.SSSZ @@ -577,10 +575,10 @@ X-Compute-Request-Id: req-8e0295cd-a283-46e4-96da-cae05cbfd1c7
Faults - When an error occurs, the Block Storage Service returns a - fault object containing an HTTP error response code that - denotes the type of error. The response body returns - additional information about the fault. + When an error occurs, Block Storage returns a fault object + containing an HTTP error response code that denotes the type + of error. The response body returns additional information + about the fault. The following table lists possible fault types with their associated error codes and descriptions. @@ -660,7 +658,7 @@ X-Compute-Request-Id: req-8e0295cd-a283-46e4-96da-cae05cbfd1c7
- + diff --git a/v2/pom.xml b/v2/pom.xml index 2372a2d..45b8c15 100644 --- a/v2/pom.xml +++ b/v2/pom.xml @@ -59,7 +59,7 @@ 2.0${basedir}/target/docbkx/webhelp/api/openstack-block-storage0 - openstack-blockstorage-devguide-2.0 + openstack-blockstorage-api-ref @@ -84,9 +84,9 @@ true - src + . - openstack-blockstorage-devguide.xml + bk_blockstorage_api_ref_v2.xml reviewer openstack diff --git a/v2/src/samples/db-faults-badRequest.json b/v2/samples/db-faults-badRequest.json similarity index 100% rename from v2/src/samples/db-faults-badRequest.json rename to v2/samples/db-faults-badRequest.json diff --git a/v2/src/samples/db-faults-badRequest.xml b/v2/samples/db-faults-badRequest.xml similarity index 100% rename from v2/src/samples/db-faults-badRequest.xml rename to v2/samples/db-faults-badRequest.xml diff --git a/v2/src/samples/db-faults-instanceFault.json b/v2/samples/db-faults-instanceFault.json similarity index 100% rename from v2/src/samples/db-faults-instanceFault.json rename to v2/samples/db-faults-instanceFault.json diff --git a/v2/src/samples/db-faults-instanceFault.xml b/v2/samples/db-faults-instanceFault.xml similarity index 100% rename from v2/src/samples/db-faults-instanceFault.xml rename to v2/samples/db-faults-instanceFault.xml diff --git a/v2/src/samples/db-faults-itemNotFound.json b/v2/samples/db-faults-itemNotFound.json similarity index 100% rename from v2/src/samples/db-faults-itemNotFound.json rename to v2/samples/db-faults-itemNotFound.json diff --git a/v2/src/samples/db-faults-itemNotFound.xml b/v2/samples/db-faults-itemNotFound.xml similarity index 100% rename from v2/src/samples/db-faults-itemNotFound.xml rename to v2/samples/db-faults-itemNotFound.xml
Explanation of Date/Time Format CodesDate and time format codes
Code
serviceUnavailable 503The Block Storage Service is not available.Block Storage is not available.