diff --git a/.gitignore b/.gitignore index 33f51ec..f2564bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -.DS_Store? +.DS_Store target/ diff --git a/doc/.DS_Store b/doc/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/doc/.DS_Store differ diff --git a/doc/pom.xml b/doc/pom.xml index 0ea3a41..2be010d 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -7,7 +7,7 @@ org.openstack.docs openstack-guide - 1.0 + 2.0 jar OpenStack Guides @@ -51,20 +51,30 @@ com.rackspace.cloud.api clouddocs-maven-plugin - 1.2.0 + 1.4.0 - goal1 + goal1v2 generate-pdf generate-sources false + + true + src/docbkx + + quantum-api-2.0/quantum-api-guide.xml + + http://docs.openstack.org/api/openstack-network/2.0/content/ + reviewer + openstack + - goal2 + goal2v2 generate-webhelp @@ -72,9 +82,107 @@ 1 - openstackdocs + os-quantum-guides 1 UA-17511903-6 + + true + src/docbkx + + quantum-api-2.0/quantum-api-guide.xml + + http://docs.openstack.org/api/openstack-network/2.0/content/ + reviewer + openstack + + + appendix toc,title + article/appendix nop + article toc,title + book title,figure,table,example,equation + chapter toc,title + part toc,title + preface toc,title + qandadiv toc + qandaset toc + reference toc,title + set toc,title + + + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + goal1v1 + + generate-pdf + + generate-sources + + false + + true + src/docbkx + + quantum-api-1.0/quantum-api-guide.xml + + http://docs.openstack.org/api/openstack-network/1.0/content/ + reviewer + openstack + + + + + goal2v1 + + generate-webhelp + + generate-sources + + + 1 + + os-quantum-guides + + 1 + UA-17511903-6 + + true + src/docbkx + + quantum-api-1.0/quantum-api-guide.xml + + http://docs.openstack.org/api/openstack-network/1.0/content/ + reviewer + openstack + appendix toc,title article/appendix nop @@ -111,7 +219,7 @@ - + @@ -119,17 +227,19 @@ - - + + + + true src/docbkx - quantum-api-1.0/quantum-api-guide.xml + quantum-api-2.0/quantum-api-guide.xml - http://docs.openstack.org/api/openstack-network/1.0/content/ + http://docs.openstack.org/api/openstack-network/2.0/content/ reviewer openstack - + diff --git a/doc/src/docbkx/.DS_Store b/doc/src/docbkx/.DS_Store new file mode 100644 index 0000000..c9236bf Binary files /dev/null and b/doc/src/docbkx/.DS_Store differ diff --git a/doc/src/docbkx/quantum-api-1.0/quantum-api-guide.xml b/doc/src/docbkx/quantum-api-1.0/quantum-api-guide.xml index 7ef6e6d..b535a09 100644 --- a/doc/src/docbkx/quantum-api-1.0/quantum-api-guide.xml +++ b/doc/src/docbkx/quantum-api-1.0/quantum-api-guide.xml @@ -71,6 +71,18 @@ (API). + + + 2012-08-08 + + + + Corrected the titles of some + examples. + + + + 2012-04-18 @@ -345,57 +357,45 @@
Attachment - - An attachment represents an interface plugged into a logical - port. At any time at most one attachment can be plugged into a - given port. - - An attachment typically identified a virtual network interface. - Network interfaces are typically defined in an external services - which uses Quantum, for instance the OpenStack Compute service, - Nova. - + An attachment represents an interface plugged into a + logical port. At any time at most one attachment can + be plugged into a given port. An attachment typically identified a virtual network interface. + Network interfaces are typically defined in an + external services which uses Quantum, for instance the + OpenStack Compute service, Nova.
General API Information - - The OpenStack Quantum API is defined as a ReSTful HTTP + The OpenStack Quantum API is defined as a ReSTful HTTP service. The API takes advantage of all aspects of the HTTP protocol (methods, URIs, media types, response codes, etc.) and providers are free to use existing features of the protocol such as caching, persistent connections, and - content compression among others. For example, providers + content compression among others. For example, providers who employ a caching layer may respond with a 203 when a request is served from the cache instead of a 200. Additionally, providers may offer support for conditional &GET; requests using ETags, or they may send a redirect in - response to a &GET; request. Clients should be written to - account for these differences. - + response to a &GET; request. Clients should be written to + account for these differences.
Authentication - - The current version of the OpenStack Quantum service - does not require that each request will include the credentials - of the user submitting the request. - - However, Quantum deployments can support several - authentication schemes (OAuth, Basic Auth, Token). The - authentication scheme used is determined by the - provider of the Quantum service. Please contact - your provider to determine the best way to - authenticate against this API. - + The current version of the OpenStack Quantum service + does not require that each request will include the + credentials of the user submitting the request. However, Quantum deployments can support several authentication + schemes (OAuth, Basic Auth, Token). The authentication + scheme used is determined by the provider of the + Quantum service. Please contact your provider to + determine the best way to authenticate against this + API. Ideally, middleware modules for Authentication and/or Authorization should be inserted in the first stages of the Quantum pipeline (available in etc/quantum.conf). - - Some authentication schemes may require that the - API operate using SSL over HTTP (HTTPS). - + Some authentication schemes may require that the + API operate using SSL over HTTP (HTTPS).
@@ -667,12 +667,11 @@ Content-Type application/json - - Applications should be prepared to ignore response - data that contains extension elements. + Applications should be prepared to ignore + response data that contains extension elements. Applications should also verify that an extension - is available before submitting an extended request. - + is available before submitting an extended + request. @@ -896,7 +895,8 @@ Content-Type application/json This operation does not require a request body. - Networks List Request/Response (XML) + Networks List Details Request/Response + (XML) Request: GET /tenants/XYZ/networks/detail.xml Response: @@ -905,7 +905,8 @@ Content-Type application/json - Networks List Request/Response (JSON) + Networks List Details Request/Response + (JSON) Request: GET /tenants/XYZ/networks/detail.json Response: @@ -1005,7 +1006,8 @@ Content-Type application/json This operation does not require a request body. - Show Network Detail Request/Response (XML) + Show Network Details Request/Response + (XML) Request: GET /tenants/XYZ/networks/8bec1293-16bd-4568-ba75-1f58bec0b4c3/detail.xml Response: @@ -1013,7 +1015,8 @@ Content-Type application/json - Show Network Detail Request/Response (JSON) + Show Network Details Request/Response + (JSON) Request: GET /tenants/XYZ/networks/8bec1293-16bd-4568-ba75-1f58bec0b4c3/detail.json Response: @@ -1140,7 +1143,7 @@ Content-Type application/json case the identifier in the request body will be ignored. - Update Network Request/Response (XML) + Update Network Request (XML) Request: PUT /tenants/XYZ/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1.xml @@ -1149,7 +1152,7 @@ Content-Type application/json response body. - Update Network Request/Response (JSON) + Update Network Request (JSON) Request: PUT /tenants/XYZ/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1.json @@ -1203,7 +1206,7 @@ Content-Type application/json This operation cannot be undone. This operation does not require a request body. - Delete Network Request/Response (XML) + Delete Network Request (XML) Request: DELETE /tenants/XYZ/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1.xml Response: @@ -1211,7 +1214,7 @@ Content-Type application/json response body. - Update Network Request/Response (JSON) + Delete Network Request (JSON) Request: DELETE /tenants/XYZ/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1.json Response: @@ -1425,14 +1428,16 @@ Content-Type application/json return the identifier of the attachment as well. This operation does not require a request body. - Show Port Detail Request/Response (XML) + Show Port Details Request/Response + (XML) Request: GET /tenants/33/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1/ports/98017ddc-efc8-4c25-a915-774b2a633855/detail.xml Response: - Show Port Detail Request/Response (JSON) + Show Port Details Request/Response + (JSON) Request: GET /tenants/33/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1/ports/98017ddc-efc8-4c25-a915-774b2a633855/detail.json Response: @@ -1568,24 +1573,24 @@ Content-Type application/json the new administrative state for the port. - Set Port State Request/Response (XML) + Update Port Request (XML) Request: PUT tenants/33/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1/ports/98017ddc-efc8-4c25-a915-774b2a633855.xml Response: No data is returned in the response - body.. + body. - Create Port Request/Response (JSON) + Update Port Request (JSON) Request: PUT tenants/33/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1/ports/98017ddc-efc8-4c25-a915-774b2a633855.json Response: No data is returned in the - response body.. + response body.
@@ -1637,7 +1642,7 @@ Content-Type application/json This operation does not require a request body. - Delete Port State Request/Response (XML) + Delete Port Request (XML) Request: DELETE tenants/33/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1/ports/98017ddc-efc8-4c25-a915-774b2a633855.xml Response: @@ -1645,7 +1650,7 @@ Content-Type application/json body.. - Create Port Request/Response (JSON) + Delete Port Request (JSON) Request: DELETE tenants/33/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1/ports/98017ddc-efc8-4c25-a915-774b2a633855.json Response: @@ -1704,7 +1709,8 @@ Content-Type application/json with no id attribute set. This operation does not require a request body. - Show Attachment (XML) + Show Attachment Request/Response + (XML) Request: GET /tenants/XYZ/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1/ports/b832be00-6553-4f69-af33-acd554e36d08/attachment.xml Response (attachment set): @@ -1715,7 +1721,8 @@ Content-Type application/json - Show Attachment (JSON) + Show Attachment Request/Response + (JSON) Request: GET /tenants/XYZ/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1/ports/b832be00-6553-4f69-af33-acd554e36d08/attachment.json Response (attachment set): @@ -1784,7 +1791,7 @@ Content-Type application/json to the attachment to plug into the port. - Plug Attachment (XML) + Plug Attachment Request (XML) Request: PUT /tenants/XYZ/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1/ports/b832be00-6553-4f69-af33-acd554e36d08/attachment.xml @@ -1793,7 +1800,7 @@ Content-Type application/json in the response body. - Plug Attachment (JSON) + Plug Attachment Request (JSON) Request: PUT /tenants/XYZ/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1/ports/b832be00-6553-4f69-af33-acd554e36d08/attachment.json @@ -1804,7 +1811,7 @@ Content-Type application/json
- Unplug Attachment from Port + Delete Attachment from Port @@ -1838,7 +1845,7 @@ Content-Type application/json operation has no effect. This operation does not require a request body. - Remove Attachment (XML) + Delete Attachment Request (XML) Request: DELETE /tenants/XYZ/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1/ports/b832be00-6553-4f69-af33-acd554e36d08/attachment.xml Response: @@ -1846,7 +1853,7 @@ Content-Type application/json in the response body. - Remove Attachment (JSON) + Delete Attachment Request (JSON) Request: DELETE /tenants/XYZ/networks/158233b0-ca9a-40b4-8614-54a4a99d47d1/ports/b832be00-6553-4f69-af33-acd554e36d08/attachment.json Response: diff --git a/doc/src/docbkx/quantum-api-2.0/.DS_Store b/doc/src/docbkx/quantum-api-2.0/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/doc/src/docbkx/quantum-api-2.0/.DS_Store differ diff --git a/doc/src/docbkx/quantum-api-2.0/ch_preface.xml b/doc/src/docbkx/quantum-api-2.0/ch_preface.xml new file mode 100644 index 0000000..9ed4471 --- /dev/null +++ b/doc/src/docbkx/quantum-api-2.0/ch_preface.xml @@ -0,0 +1,140 @@ + + + + + + + + +GET'> +PUT'> +POST'> +DELETE'> + + + + + + + + +'> + + + + + + + + +'> + +]> + + + Preface + The Quantum project provides virtual networking services + among devices managed by the OpenStack + compute service. + This document describes the features available with the + &APIv2;. + We welcome feedback, comments, and bug reports at bugs.launchpad.net/Quantum. +
+ Intended Audience + This guide is for + software developers who create applications by using the + &APIv2;. To use this information, you should have a + general understanding of the OpenStack Quantum network + service, the OpenStack compute service, and the + integration between the two. You should also have access + to a plugin that implements the &APIv2;. + You should also + be familiar with: + + + ReSTful web services + + + HTTP/1.1 + + + JSON and XML data serialization formats + + +
+ +
+ Document Change History + This version of the document replaces and obsoletes all + previous versions. The following table describes the most + recent changes: + + +
+ +
+ Resources + Use the following resources in conjunction with this + guide: + + + + + Resource + See + + + + + + Related documents + + OpenStack Manuals + + + + OpenStack Quantum Wiki + + http://wiki.openstack.org/Quantum + + + +
+ +
diff --git a/doc/src/docbkx/quantum-api-2.0/common.ent b/doc/src/docbkx/quantum-api-2.0/common.ent new file mode 100644 index 0000000..19acc7e --- /dev/null +++ b/doc/src/docbkx/quantum-api-2.0/common.ent @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + '> + + + + + + '> + + + + + + '> + + + + + + '> + + + + + + '> + + + + + + + + +