Skip to content
This repository has been archived by the owner on Feb 19, 2019. It is now read-only.

Commit

Permalink
Version 3.0.0-a1
Browse files Browse the repository at this point in the history
  • Loading branch information
lukaszo committed Nov 10, 2011
1 parent f6f8d11 commit 6b3e6f3
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 19 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 2,7 @@
OCA - OpenNebula Cloud Api
##############################################

:Version: 0.2
:Version: 3.0.0-a1

About
-----
Expand All @@ -11,7 11,7 @@ Bindings for XMLRPC OpenNebula Cloud API

Documentation
-------------
see http://lukaszo.github.com/python-oca/index.html and http://www.opennebula.org/documentation:rel2.0:api
see http://lukaszo.github.com/python-oca/index.html and http://www.opennebula.org/documentation:rel3.0:api

All `allocate` functions are implemented as static methods.

Expand Down
7 changes: 4 additions & 3 deletions docs/api.rst
Original file line number Diff line number Diff line change
@@ -1,7 1,7 @@
API Documentation
=================

See http://www.opennebula.org/documentation:rel2.0:api
See http://www.opennebula.org/documentation:rel3.0:api

.. toctree::
:maxdepth: 2
Expand All @@ -10,7 10,8 @@ See http://www.opennebula.org/documentation:rel2.0:api
api/host
api/image
api/vn
api/vm
api/cluster
api/user
api/group
api/template
api/vm

8 changes: 0 additions & 8 deletions docs/api/cluster.rst

This file was deleted.

2 changes: 2 additions & 0 deletions docs/api/host.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 5,6 @@

.. autoclass:: oca.Host
.. autoclass:: oca.HostPool
:members: info
:no-inherited-members:

2 changes: 2 additions & 0 deletions docs/api/image.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 5,6 @@

.. autoclass:: oca.Image
.. autoclass:: oca.ImagePool
:members: info
:no-inherited-members:

2 changes: 2 additions & 0 deletions docs/api/user.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 5,6 @@

.. autoclass:: oca.User
.. autoclass:: oca.UserPool
:members: info
:no-inherited-members:

4 changes: 3 additions & 1 deletion docs/api/vm.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 4,7 @@
--------------------------------

.. autoclass:: oca.VirtualMachine
:members:
.. autoclass:: oca.VirtualMachinePool

:members: info
:no-inherited-members:
5 changes: 4 additions & 1 deletion docs/api/vn.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 4,8 @@
--------------------------------

.. autoclass:: oca.VirtualNetwork
.. autoclass:: oca.VirtualNetworkPool
:members:

.. autoclass:: oca.VirtualNetworkPool
:members: info
:no-inherited-members:
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 41,16 @@

# General information about the project.
project = u'oca'
copyright = u'2010, Łukasz Oleś'
copyright = u'2010-2011, Łukasz Oleś'

# 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.
#
# The short X.Y version.
version = '0.1'
version = '3.0.0'
# The full version, including alpha/beta/rc tags.
release = '0.1-alfa'
release = '3.0.0-alfa1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
1 change: 1 addition & 0 deletions docs/user_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 6,7 @@ Examples

Allocating new host::

import oca
client = oca.Client('user:password', 'http:12.12.12.12:2633/RPC2')
new_host_id = oca.Host.allocate(client, 'host_name', 'im_xen', 'vmm_xen', 'tm_nfs')
hostpool = oca.HostPool(client)
Expand Down
2 changes: 1 addition & 1 deletion oca/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 23,7 @@
class Client(object):
'''
The client class, represents the connection with the core and handles the
xml-rpc calls(see http://www.opennebula.org/documentation:rel2.0:api)
xml-rpc calls(see http://www.opennebula.org/documentation:rel3.0:api)
'''
DEFAULT_ONE_AUTH = "~/.one/one_auth"
ONE_AUTH_RE = re.compile('^(. ?):(. )$')
Expand Down

0 comments on commit 6b3e6f3

Please sign in to comment.