summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2010-11-01 21:47:16 -0400
committerTodd Willey <todd@ansolabs.com>2010-11-01 21:47:16 -0400
commite0f889443f5c0732db28871f350c45e7c8e8d031 (patch)
treebf1e0246031f0a0d9fd089cfbf3e7887deb9b0fa
parentff588ab5baf400c243daeff82e7ca2fd27d87143 (diff)
Add ec2 api docs.
-rw-r--r--doc/source/api.rst51
-rw-r--r--nova/api/ec2/__init__.py4
2 files changed, 54 insertions, 1 deletions
diff --git a/doc/source/api.rst b/doc/source/api.rst
index 03ec6195d..75905d8b3 100644
--- a/doc/source/api.rst
+++ b/doc/source/api.rst
@@ -110,3 +110,54 @@ The :mod:`sharedipgroups` Module
:members:
:undoc-members:
:show-inheritance:
+
+EC2 API
+-------
+
+The :mod:`nova.api.ec2` Module
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: nova.api.ec2
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+The :mod:`admin` Module
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: nova.api.ec2.admin
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+The :mod:`apirequest` Module
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: nova.api.ec2.apirequest
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+The :mod:`cloud` Module
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: nova.api.ec2.cloud
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+The :mod:`images` Module
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: nova.api.ec2.images
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+The :mod:`metadatarequesthandler` Module
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: nova.api.ec2.metadatarequesthandler
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index 0df4d3710..816314901 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -15,8 +15,10 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
+"""
+Starting point for routing EC2 requests.
-"""Starting point for routing EC2 requests"""
+"""
import logging
import routes