From 559aedc3d994ff575590fc92c6361fd7748957e5 Mon Sep 17 00:00:00 2001 From: Brad Hall Date: Fri, 23 Sep 2011 20:04:22 -0700 Subject: [PATCH] Merge from launchpad quantum/diablo branch: merge salv's fix to remove keystone middleware: lp855151 one more 202->200 from tyler merge tylers additional 202 -> 200 changes merge additions to OVS readme describing running with multiple hosts merge brad's changes to make create API calls return 200, not 202 merge unit test for showing unset attachment merging API docs branch Merge: lp:~yinliu2/quantum/bug856564 Merge: lp:~bgh/quantum/bug850261 Change-Id: I56fe24c59f918737e57b562343c33ec6dcceac60 --- doc/Makefile | 96 + doc/__init__.py | 13 + doc/pom.xml | 135 ++ doc/source/__init__.py | 13 + doc/source/conf.py | 245 ++ doc/source/docbkx/docbkx-example/README | 14 + doc/source/docbkx/docbkx-example/pom.xml | 38 + .../docbkx-example/src/docbkx/example.xml | 318 +++ .../src/docbkx/figures/example.sdx | 79 + .../src/docbkx/figures/example.svg | 523 +++++ doc/source/docbkx/quantum-api-1.0/common.ent | 112 + .../quantum-api-1.0/figures/Arrow_east.svg | 70 + .../figures/Check_mark_23x20_02.svg | 60 + .../docbkx/quantum-api-1.0/js/shjs/sh_java.js | 337 +++ .../quantum-api-1.0/js/shjs/sh_javascript.js | 347 +++ .../docbkx/quantum-api-1.0/js/shjs/sh_main.js | 538 +++++ .../docbkx/quantum-api-1.0/js/shjs/sh_xml.js | 115 + .../js/trc/schema/controller.js | 184 ++ .../js/trc/schema/layoutManager.js | 137 ++ .../js/trc/schema/sampleManager.js | 342 +++ .../docbkx/quantum-api-1.0/js/trc/util.js | 564 +++++ .../quantum-api-1.0/quantum-api-guide.xml | 2011 +++++++++++++++++ .../samples/att-get-res-none.json | 3 + .../samples/att-get-res-none.xml | 1 + .../quantum-api-1.0/samples/att-get-res.json | 6 + .../quantum-api-1.0/samples/att-get-res.xml | 1 + .../quantum-api-1.0/samples/att-put-req.json | 6 + .../quantum-api-1.0/samples/att-put-req.xml | 2 + .../quantum-api-1.0/samples/extensions.json | 19 + .../quantum-api-1.0/samples/extensions.xml | 21 + .../docbkx/quantum-api-1.0/samples/fault.json | 7 + .../docbkx/quantum-api-1.0/samples/fault.xml | 8 + .../samples/network-get-detail-res.json | 22 + .../samples/network-get-detail-res.xml | 14 + .../samples/network-get-res.json | 7 + .../samples/network-get-res.xml | 3 + .../samples/network-post-req.json | 6 + .../samples/network-post-req.xml | 2 + .../samples/network-post-res.json | 6 + .../samples/network-post-res.xml | 2 + .../samples/networks-get-detail-res.json | 13 + .../samples/networks-get-detail-res.xml | 8 + .../samples/networks-get-res.json | 11 + .../samples/networks-get-res.xml | 4 + .../samples/networks-post-req.json | 5 + .../samples/networks-post-req.xml | 2 + .../samples/networks-post-res.json | 5 + .../samples/networks-post-res.xml | 2 + .../quantum-api-1.0/samples/notfound.json | 7 + .../quantum-api-1.0/samples/notfound.xml | 7 + .../samples/notimplemented.json | 7 + .../samples/notimplemented.xml | 5 + .../samples/port-get-detail-res.json | 12 + .../samples/port-get-detail-res.xml | 6 + .../quantum-api-1.0/samples/port-get-res.json | 8 + .../quantum-api-1.0/samples/port-get-res.xml | 3 + .../samples/port-post-req.json | 6 + .../quantum-api-1.0/samples/port-post-req.xml | 2 + .../samples/port-post-res.json | 6 + .../quantum-api-1.0/samples/port-post-res.xml | 2 + .../samples/ports-get-detail-res.json | 12 + .../samples/ports-get-detail-res.xml | 8 + .../samples/ports-get-res.json | 11 + .../quantum-api-1.0/samples/ports-get-res.xml | 6 + .../quantum-api-1.0/samples/private.json | 9 + .../quantum-api-1.0/samples/private.xml | 6 + .../quantum-api-1.0/samples/public.json | 11 + .../docbkx/quantum-api-1.0/samples/public.xml | 8 + .../quantum-api-1.0/samples/versions-atom.xml | 22 + .../quantum-api-1.0/samples/versions.json | 24 + .../quantum-api-1.0/samples/versions.xml | 12 + .../docbkx/quantum-api-1.0/style/schema.css | 82 + .../quantum-api-1.0/style/shjs/sh_acid.css | 151 ++ .../style/shjs/sh_darkblue.css | 151 ++ .../quantum-api-1.0/style/shjs/sh_emacs.css | 139 ++ .../quantum-api-1.0/style/shjs/sh_night.css | 151 ++ .../quantum-api-1.0/style/shjs/sh_pablo.css | 151 ++ .../quantum-api-1.0/style/shjs/sh_print.css | 145 ++ .../quantum-api-1.0/style/shjs/sh_style.css | 66 + .../style/shjs/sh_whitengrey.css | 139 ++ .../docbkx/quantum-api-1.0/xsd/.htaccess | 6 + .../docbkx/quantum-api-1.0/xsd/actions.xsd | 439 ++++ .../quantum-api-1.0/xsd/affinity-id.xjb | 11 + .../quantum-api-1.0/xsd/affinity-id.xsd | 39 + .../docbkx/quantum-api-1.0/xsd/api-common.xjb | 11 + .../docbkx/quantum-api-1.0/xsd/api-common.xsd | 66 + doc/source/docbkx/quantum-api-1.0/xsd/api.xjb | 21 + doc/source/docbkx/quantum-api-1.0/xsd/api.xsd | 103 + .../docbkx/quantum-api-1.0/xsd/atom.xjb | 11 + .../docbkx/quantum-api-1.0/xsd/atom/atom.xsd | 105 + .../docbkx/quantum-api-1.0/xsd/atom/xml.xsd | 294 +++ .../docbkx/quantum-api-1.0/xsd/backup.xsd | 378 ++++ .../docbkx/quantum-api-1.0/xsd/common.xsd | 156 ++ .../quantum-api-1.0/xsd/ext/rax-dme/api.xsd | 38 + .../xsd/ext/rax-dme/rax-dme.xsd | 25 + .../docbkx/quantum-api-1.0/xsd/extensions.xsd | 203 ++ .../docbkx/quantum-api-1.0/xsd/faults.xsd | 532 +++++ .../docbkx/quantum-api-1.0/xsd/flavor.xsd | 244 ++ .../docbkx/quantum-api-1.0/xsd/image.xsd | 443 ++++ .../docbkx/quantum-api-1.0/xsd/ipgroup.xsd | 245 ++ .../docbkx/quantum-api-1.0/xsd/limits.xsd | 315 +++ .../docbkx/quantum-api-1.0/xsd/metadata.xsd | 89 + .../docbkx/quantum-api-1.0/xsd/server.xsd | 1013 +++++++++ .../docbkx/quantum-api-1.0/xsd/shareip.xjb | 11 + .../docbkx/quantum-api-1.0/xsd/shareip.xsd | 83 + .../docbkx/quantum-api-1.0/xsd/txt.htaccess | 4 + .../docbkx/quantum-api-1.0/xsd/version.xsd | 355 +++ .../docbkx/quantum-api-1.0/xslt/schema.xsl | 1342 +++++++++++ doc/source/index.rst | 26 + etc/quantum.conf | 17 - extensions/credential.py | 2 +- extensions/portprofile.py | 6 +- extensions/qos.py | 4 +- quantum/api/networks.py | 5 +- quantum/api/ports.py | 5 +- quantum/common/authentication.py | 374 --- quantum/common/authorization.py | 107 - .../cisco/tests/unit/test_cisco_extension.py | 10 +- quantum/plugins/openvswitch/README | 20 + run_tests.sh | 11 +- tests/unit/test_api.py | 26 +- 121 files changed, 14531 insertions(+), 516 deletions(-) create mode 100644 doc/Makefile create mode 100644 doc/__init__.py create mode 100644 doc/pom.xml create mode 100644 doc/source/__init__.py create mode 100644 doc/source/conf.py create mode 100644 doc/source/docbkx/docbkx-example/README create mode 100644 doc/source/docbkx/docbkx-example/pom.xml create mode 100644 doc/source/docbkx/docbkx-example/src/docbkx/example.xml create mode 100644 doc/source/docbkx/docbkx-example/src/docbkx/figures/example.sdx create mode 100644 doc/source/docbkx/docbkx-example/src/docbkx/figures/example.svg create mode 100644 doc/source/docbkx/quantum-api-1.0/common.ent create mode 100644 doc/source/docbkx/quantum-api-1.0/figures/Arrow_east.svg create mode 100644 doc/source/docbkx/quantum-api-1.0/figures/Check_mark_23x20_02.svg create mode 100644 doc/source/docbkx/quantum-api-1.0/js/shjs/sh_java.js create mode 100644 doc/source/docbkx/quantum-api-1.0/js/shjs/sh_javascript.js create mode 100644 doc/source/docbkx/quantum-api-1.0/js/shjs/sh_main.js create mode 100644 doc/source/docbkx/quantum-api-1.0/js/shjs/sh_xml.js create mode 100644 doc/source/docbkx/quantum-api-1.0/js/trc/schema/controller.js create mode 100644 doc/source/docbkx/quantum-api-1.0/js/trc/schema/layoutManager.js create mode 100644 doc/source/docbkx/quantum-api-1.0/js/trc/schema/sampleManager.js create mode 100644 doc/source/docbkx/quantum-api-1.0/js/trc/util.js create mode 100644 doc/source/docbkx/quantum-api-1.0/quantum-api-guide.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/att-get-res-none.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/att-get-res-none.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/att-get-res.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/att-get-res.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/att-put-req.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/att-put-req.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/extensions.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/extensions.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/fault.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/fault.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/network-get-detail-res.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/network-get-detail-res.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/network-get-res.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/network-get-res.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/network-post-req.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/network-post-req.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/network-post-res.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/network-post-res.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/networks-get-detail-res.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/networks-get-detail-res.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/networks-get-res.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/networks-get-res.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/networks-post-req.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/networks-post-req.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/networks-post-res.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/networks-post-res.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/notfound.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/notfound.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/notimplemented.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/notimplemented.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/port-get-detail-res.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/port-get-detail-res.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/port-get-res.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/port-get-res.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/port-post-req.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/port-post-req.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/port-post-res.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/port-post-res.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/ports-get-detail-res.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/ports-get-detail-res.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/ports-get-res.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/ports-get-res.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/private.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/private.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/public.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/public.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/versions-atom.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/versions.json create mode 100644 doc/source/docbkx/quantum-api-1.0/samples/versions.xml create mode 100644 doc/source/docbkx/quantum-api-1.0/style/schema.css create mode 100644 doc/source/docbkx/quantum-api-1.0/style/shjs/sh_acid.css create mode 100644 doc/source/docbkx/quantum-api-1.0/style/shjs/sh_darkblue.css create mode 100644 doc/source/docbkx/quantum-api-1.0/style/shjs/sh_emacs.css create mode 100644 doc/source/docbkx/quantum-api-1.0/style/shjs/sh_night.css create mode 100644 doc/source/docbkx/quantum-api-1.0/style/shjs/sh_pablo.css create mode 100644 doc/source/docbkx/quantum-api-1.0/style/shjs/sh_print.css create mode 100644 doc/source/docbkx/quantum-api-1.0/style/shjs/sh_style.css create mode 100644 doc/source/docbkx/quantum-api-1.0/style/shjs/sh_whitengrey.css create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/.htaccess create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/actions.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/affinity-id.xjb create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/affinity-id.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/api-common.xjb create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/api-common.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/api.xjb create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/api.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/atom.xjb create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/atom/atom.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/atom/xml.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/backup.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/common.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/ext/rax-dme/api.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/ext/rax-dme/rax-dme.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/extensions.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/faults.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/flavor.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/image.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/ipgroup.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/limits.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/metadata.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/server.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/shareip.xjb create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/shareip.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/txt.htaccess create mode 100644 doc/source/docbkx/quantum-api-1.0/xsd/version.xsd create mode 100644 doc/source/docbkx/quantum-api-1.0/xslt/schema.xsl create mode 100644 doc/source/index.rst delete mode 100755 quantum/common/authentication.py delete mode 100644 quantum/common/authorization.py diff --git a/doc/Makefile b/doc/Makefile new file mode 100644 index 0000000000..b63e30032c --- /dev/null +++ b/doc/Makefile @@ -0,0 +1,96 @@ +# Makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS = +SPHINXBUILD = sphinx-build +SPHINXSOURCE = source +PAPER = +BUILDDIR = build + +# Internal variables. +PAPEROPT_a4 = -D latex_paper_size=a4 +PAPEROPT_letter = -D latex_paper_size=letter +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SPHINXSOURCE) + +.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest + +.DEFAULT_GOAL = html + +help: + @echo "Please use \`make ' where is one of" + @echo " html to make standalone HTML files" + @echo " dirhtml to make HTML files named index.html in directories" + @echo " pickle to make pickle files" + @echo " json to make JSON files" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " qthelp to make HTML files and a qthelp project" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " changes to make an overview of all changed/added/deprecated items" + @echo " linkcheck to check all external links for integrity" + @echo " doctest to run all doctests embedded in the documentation (if enabled)" + +clean: + -rm -rf $(BUILDDIR)/* + if [ -f .autogenerated ] ; then \ + cat .autogenerated | xargs rm ; \ + rm .autogenerated ; \ + fi + +html: + $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." + +dirhtml: + $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." + +pickle: + $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle + @echo + @echo "Build finished; now you can process the pickle files." + +json: + $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json + @echo + @echo "Build finished; now you can process the JSON files." + +htmlhelp: + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp + @echo + @echo "Build finished; now you can run HTML Help Workshop with the" \ + ".hhp project file in $(BUILDDIR)/htmlhelp." + +qthelp: + $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp + @echo + @echo "Build finished; now you can run "qcollectiongenerator" with the" \ + ".qhcp project file in $(BUILDDIR)/qthelp, like this:" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/nova.qhcp" + @echo "To view the help file:" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/nova.qhc" + +latex: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." + @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ + "run these through (pdf)latex." + +changes: + $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes + @echo + @echo "The overview file is in $(BUILDDIR)/changes." + +linkcheck: + $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck + @echo + @echo "Link check complete; look for any errors in the above output " \ + "or in $(BUILDDIR)/linkcheck/output.txt." + +doctest: + $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest + @echo "Testing of doctests in the sources finished, look at the " \ + "results in $(BUILDDIR)/doctest/output.txt." diff --git a/doc/__init__.py b/doc/__init__.py new file mode 100644 index 0000000000..fdc958380b --- /dev/null +++ b/doc/__init__.py @@ -0,0 +1,13 @@ +# Copyright (C) 2011 OpenStack LLC. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. \ No newline at end of file diff --git a/doc/pom.xml b/doc/pom.xml new file mode 100644 index 0000000000..dcc387cd12 --- /dev/null +++ b/doc/pom.xml @@ -0,0 +1,135 @@ + + + + 4.0.0 + + org.openstack.docs + openstack-guide + 1.0.0-SNAPSHOT + jar + OpenStack Guides + + + + + + Rackspace Research Repositories + + true + + + + rackspace-research + Rackspace Research Repository + http://maven.research.rackspacecloud.com/content/groups/public/ + + + + + rackspace-research + Rackspace Research Repository + http://maven.research.rackspacecloud.com/content/groups/public/ + + + + + + + + + target/docbkx/pdf + + **/*.fo + + + + + + + com.rackspace.cloud.api + clouddocs-maven-plugin + 1.0.5-SNAPSHOT + + + goal1 + + generate-pdf + + generate-sources + + false + + + + goal2 + + generate-webhelp + + generate-sources + + + 0 + openstackdocs + 1 + UA-17511903-6 + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + true + source/docbkx + + quantum-api-1.0/quantum-api-guide.xml + + reviewer + openstack + + + + + + diff --git a/doc/source/__init__.py b/doc/source/__init__.py new file mode 100644 index 0000000000..fdc958380b --- /dev/null +++ b/doc/source/__init__.py @@ -0,0 +1,13 @@ +# Copyright (C) 2011 OpenStack LLC. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. \ No newline at end of file diff --git a/doc/source/conf.py b/doc/source/conf.py new file mode 100644 index 0000000000..f63ed82bd5 --- /dev/null +++ b/doc/source/conf.py @@ -0,0 +1,245 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2010 OpenStack, LLC. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# Keystone documentation build configuration file, created by +# sphinx-quickstart on Tue May 18 13:50:15 2010. +# +# This file is execfile()'d with the current directory set to it's containing +# dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +import os +import sys + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +sys.path.append([os.path.abspath('../quantum'), + os.path.abspath('..'), + os.path.abspath('../bin') + ]) + +# -- General configuration --------------------------------------------------- + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +extensions = ['sphinx.ext.autodoc', + 'sphinx.ext.coverage', + 'sphinx.ext.ifconfig', + 'sphinx.ext.intersphinx', + 'sphinx.ext.pngmath', + 'sphinx.ext.graphviz', + 'sphinx.ext.todo'] + +todo_include_todos = True + +# Add any paths that contain templates here, relative to this directory. +templates_path = [] +if os.getenv('HUDSON_PUBLISH_DOCS'): + templates_path = ['_ga', '_templates'] +else: + templates_path = ['_templates'] + +# The suffix of source filenames. +source_suffix = '.rst' + +# The encoding of source files. +#source_encoding = 'utf-8' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'Quantum' +copyright = u'2011-present, OpenStack, LLC.' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# Version info +# TODO(salvatore-orlando): replace here once Bug #826563 is fixed +release = '2011.3' +# The short X.Y version. +version = '2011.3' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +#today = '' +# Else, today_fmt is used as the format for a strftime call. +#today_fmt = '%B %d, %Y' + +# List of documents that shouldn't be included in the build. +#unused_docs = [] + +# List of directories, relative to source directory, that shouldn't be searched +# for source files. +exclude_trees = [] + +# The reST default role (for this markup: `text`) to use for all documents. +#default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +#add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +#add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +show_authors = True + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# A list of ignored prefixes for module index sorting. +modindex_common_prefix = ['quantum.'] + +# -- Options for man page output -------------------------------------------- + +# Grouping the document tree for man pages. +# List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual' + +#man_pages = [ +# ('man/cli', 'quantum', u'Quantum Command Line Interface', +# [u'OpenStack'], 1) +# ] + + +# -- Options for HTML output ------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. Major themes that come with +# Sphinx are currently 'default' and 'sphinxdoc'. +html_theme_path = ["."] +html_theme = '_theme' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +#html_theme_options = {} + +# Add any paths that contain custom themes here, relative to this directory. +#html_theme_path = ['_theme'] + +# The name for this set of Sphinx documents. If None, it defaults to +# " v documentation". +#html_title = None + +# A shorter title for the navigation bar. Default is the same as html_title. +#html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +#html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +#html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +#html_last_updated_fmt = '%b %d, %Y' + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +#html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +#html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +#html_additional_pages = {} + +# If false, no module index is generated. +#html_use_modindex = True + +# If false, no index is generated. +#html_use_index = True + +# If true, the index is split into individual pages for each letter. +#html_split_index = False + +# If true, links to the reST sources are added to the pages. +#html_show_sourcelink = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +#html_use_opensearch = '' + +# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = '' + +# Output file base name for HTML help builder. +htmlhelp_basename = 'quantumdoc' + + +# -- Options for LaTeX output ------------------------------------------------ + +# The paper size ('letter' or 'a4'). +#latex_paper_size = 'letter' + +# The font size ('10pt', '11pt' or '12pt'). +#latex_font_size = '10pt' + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, author, +# documentclass [howto/manual]). +latex_documents = [ + ('index', 'Quantum.tex', u'Quantum Documentation', + u'Quantum development team', 'manual'), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +#latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +#latex_use_parts = False + +# Additional stuff for the LaTeX preamble. +#latex_preamble = '' + +# Documents to append as an appendix to all manuals. +#latex_appendices = [] + +# If false, no module index is generated. +#latex_use_modindex = True + +# Example configuration for intersphinx: refer to the Python standard library. +intersphinx_mapping = {'python': ('http://docs.python.org/', None), + 'nova': ('http://nova.openstack.org', None), + 'swift': ('http://swift.openstack.org', None), + 'glance': ('http://glance.openstack.org', None)} diff --git a/doc/source/docbkx/docbkx-example/README b/doc/source/docbkx/docbkx-example/README new file mode 100644 index 0000000000..e1545671b3 --- /dev/null +++ b/doc/source/docbkx/docbkx-example/README @@ -0,0 +1,14 @@ +README + +This docbkx-example folder is provided for those who want to use the maven mojo supplied with the project to build their own documents to PDF and HTML (webhelp) format. It's intended to be a template and model. + +You can edit the src/docbkx/example.xml file using vi, emacs, or another DocBook editor. At Rackspace we use Oxygen. Both Oxygen and XML Mind offer free licenses to those working on open source project documentation. + +To build the output, install Apache Maven (https://maven.apache.org/) and then run: + +mvn clean generate-sources + +in the directory containing the pom.xml file. + +Feel free to ask questions of the openstack-docs team at https://launchpad.net/~openstack-doc. + diff --git a/doc/source/docbkx/docbkx-example/pom.xml b/doc/source/docbkx/docbkx-example/pom.xml new file mode 100644 index 0000000000..f281971a5d --- /dev/null +++ b/doc/source/docbkx/docbkx-example/pom.xml @@ -0,0 +1,38 @@ + + 4.0.0 + my-groupid + my-guide + 1.0.0-SNAPSHOT + jar + OpenStack stand alone documentation examples + + + + + com.agilejava.docbkx + docbkx-maven-plugin + + + + generate-pdf + generate-webhelp + + generate-sources + + + + true + 100 + + + + + + + + + + + + + diff --git a/doc/source/docbkx/docbkx-example/src/docbkx/example.xml b/doc/source/docbkx/docbkx-example/src/docbkx/example.xml new file mode 100644 index 0000000000..96f1c64c10 --- /dev/null +++ b/doc/source/docbkx/docbkx-example/src/docbkx/example.xml @@ -0,0 +1,318 @@ + + Maven Example Documentation + + + + + + + + Badges! We don't need any stinking badges! + + + + 2011 + Timothy D. Witham + + Example v0.1 + Product Name Doesn't Exist - it's an example!™ + 2011-01-01 + + + Copyright details are filled in by the template. Change the value of the role + attribute on the legalnotice element to change the license. + + + + This document is intended for individuals who whish to produce documentation using Maven and having + the same "feel" as the documentation that is produced by the mainline OpenStack projects. + + + + this is a placeholder for the front cover + + + this is a placeholder for the back cover + + + + Overview + Welcome to the getting started with Maven documentation. Congratulations you have + successfully downloaded and built the example. + + For more details on the Product Name service, please refer to http://www.rackspacecloud.com/cloud_hosting_products/product name + + We welcome feedback, comments, and bug reports at support@rackspacecloud.com. +
+ Intended Audience + This guide is intended to individuals who want to develop standalone documentation + to use within an OpenStack deployment. Using this tool chain will give you the look and + feel of the mainline OpenStack documentation. + +
+
+ Document Change History + This version of the Maven Getting Started Guide replaces and obsoletes all previous versions. The + most recent changes are described in the table below: + + + + Revision Date + Summary of Changes + + + + + July. 14, 2011 + + + + Initial document creation. + + + + + + +
+
+ Additional Resources + + + + + Openstack - Cloud Software + + + + + + + Docbook Main Web Site + + + + + + + Docbook Quick Reference + + + + +
+ + + Concepts + + Need to put something here. + + + + How do I? + +
+ Notes and including images + So I want an note and an image in this section ... + + This is an example of a note. + + + Here's a sample figure in svg and png formats: +
+ Sample Image + + + + + + + + +
+
+
+ Multiple Related Documents + + What you need to do in order to have multiple documents fit within the + build structure. + +
+
+ Using multiple files for a document + + What you need to do in order to have a single document that is made up of multiple + files. + +
+
+ Who, What, Where, When and Why of pom.xml + + You will of noticed the pom.xml file at the root directory. + This file is used to set the project parameters for the documentation. Including + what type of documentation to produce and any post processing that needs to happen. + If you want to know more about + + pom.xml - need a link + + then follow the link. + + For the pom.xmlfile that was included in this distribution we will + parse the individual lines and explaine the meaning. + + + + +
+ <project> + + What is all of this stuff and why is it important? + +
+
+ <modelVersion> + + What goes in here and why? + +
+
+ <groupId> + + What goes in here and why? + +
+
+ <artifactId> + + What goes in here and why? + +
+
+ <version> + + What goes in here and why? + +
+
+ <packaging> + + What goes in here and why? + +
+
+ <name> + + Name of your document. + +
+
+ <build> + + Make some documents. + +
+ <plugin(s)> + + What does this do and why? + +
+ <groupId> + + What goes in here and why? + +
+
+ <artifactId> + + What goes in here and why? + +
+
+ <execution(s)> + + What goes in here and why? + +
+ <goal(s)> + + Different types of goals and why you use them. + +
+
+ <phase> + + What does this section do? What phases can you specify. + +
+
+
+ <configuration> + + What does this section do? + +
+ <xincludeSupported> + + What does this do and why? + +
+
+ <chunkSectionDepth> + + What does this do and why? + +
+
+ <postprocess> + + What does this section do? What are possible pieces? + +
+ <copy> + + What does this section do? What are possible pieces? + +
+ <fileset> + + What does this section do? What are possible pieces? + +
+ <include> + + What does this section do? What are possible pieces? + +
+
+
+
+
+
+
+
+
+ Who, What, Where, When and Why of build.xml + + You will of noticed the build.xml file at the root directory. + This file is used to set the project parameters for the documentation. Including + what type of documentation to produce and any post processing that needs to happen. + If you want to know more about + + pom.xml - need a link + + then follow the link. + +
+ + + Troubleshooting + Sometimes things go wrong... + + diff --git a/doc/source/docbkx/docbkx-example/src/docbkx/figures/example.sdx b/doc/source/docbkx/docbkx-example/src/docbkx/figures/example.sdx new file mode 100644 index 0000000000..3f2d863669 --- /dev/null +++ b/doc/source/docbkx/docbkx-example/src/docbkx/figures/example.sdx @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/source/docbkx/docbkx-example/src/docbkx/figures/example.svg b/doc/source/docbkx/docbkx-example/src/docbkx/figures/example.svg new file mode 100644 index 0000000000..58b98232d4 --- /dev/null +++ b/doc/source/docbkx/docbkx-example/src/docbkx/figures/example.svg @@ -0,0 +1,523 @@ + + + + +Creator: Quick Sequence Diagram Editor Producer: org.freehep.graphicsio.svg.SVGGraphics2D Revision: 12753 Source: Date: Monday, May 2, 2011 2:44:33 PM CDT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/source/docbkx/quantum-api-1.0/common.ent b/doc/source/docbkx/quantum-api-1.0/common.ent new file mode 100644 index 0000000000..19acc7e9f0 --- /dev/null +++ b/doc/source/docbkx/quantum-api-1.0/common.ent @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + '> + + + + + + '> + + + + + + '> + + + + + + '> + + + + + + '> + + + + + + + + +