Commit a726abb9 authored by Benziane Chakib's avatar Benziane Chakib

Merge branch 'master' of ssh://git/srv/git/cc-node

parents 6d3f5d36 abe9bb18
......@@ -19,7 +19,7 @@ try:
except ImportError:
DAEMONIZE = False
__VERSION__ = 1
__VERSION__ = 3
DEFAULT_CONFIG_FILE = '/etc/cc-node.conf'
DEFAULT_PID_FILE = '/var/run/cc-node.pid'
......
......@@ -241,13 +241,13 @@ class NodeHandler(RpcHandler):
@pure
def execute_command(self, command):
'''
Excecutes the given command on the local hypervisor
Executes the given command on the local hypervisor
:param command: the command to excecute as it would be typed on a shell
:param command: the command to execute as it would be typed on a shell
prompt
:type command: :class:`str`
'''
result = self.hv_handle.local_excecute(command)
result = self.hv_handle.local_execute(command)
return result
......
......@@ -252,7 +252,7 @@ class HVStorage(object):
:type pool: libvirt.`virStoragePool`
'''
def get_pool_total_space(self, pool):
def get_pool_space_total(self, pool):
'''
Returns the storage capacity of this pool in bytes
......@@ -261,7 +261,7 @@ class HVStorage(object):
:return: :class:`int` of capacity in bytes
'''
def get_pool_available_space(self, pool):
def get_pool_space_available(self, pool):
'''
Returns available space of this storage pool in bytes
......@@ -270,7 +270,7 @@ class HVStorage(object):
:return: :class:`int` of available free space in bytes
'''
def get_pool_used_space(self, pool):
def get_pool_space_used(self, pool):
'''
Returns current storage pool usage in bytes
......
......@@ -92,7 +92,7 @@ class KvmHypervisor(LibvirtHypervisor):
raise VMError('Virtual machine %s not found: ' % name)
def local_excecute(self, command):
def local_execute(self, command):
'''
Excecutes the command given in command on the local host
Returns a tuple with (stdout, stderr) from the process that has
......
......@@ -450,7 +450,7 @@ class LibvirtHVStorage(HVStorage):
except libvirt.libvirtError as e:
raise StorageError("Can't get pool state (%s)" % e)
def get_pool_total_space(self, pool):
def get_pool_space_total(self, pool):
'''
Returns the storage capacity of this pool in bytes
......@@ -463,7 +463,7 @@ class LibvirtHVStorage(HVStorage):
except libvirt.libvirtError as e:
raise StorageError("Can't get pool informations (%s)" % e)
def get_pool_available_space(self, pool):
def get_pool_space_available(self, pool):
'''
Returns available space of this storage pool in bytes
......@@ -476,7 +476,7 @@ class LibvirtHVStorage(HVStorage):
except libvirt.libvirtError as e:
raise StorageError("Can't get pool informations (%s)" % e)
def get_pool_used_space(self, pool):
def get_pool_space_used(self, pool):
'''
Returns current storage pool usage in bytes
......
cc-node (3-1) unstable; urgency=low
* Added $HOSTNAME variable on login field of config file.
* Fixed bugs
-- Antoine Millet <antoine.millet@smartjog.com> Wed, 22 Dec 2010 16:47:14 +0100
cc-node (2-1) unstable; urgency=low
* New configuration in configuration file
* Changed name cc-hypervisor to cc-node
* Tags handled in list_vm
-- Antoine Millet <antoine.millet@smartjog.com> Fri, 17 Dec 2010 11:43:42 +0100
cc-node (1-1) unstable; urgency=low
* Initial release.
......
......@@ -8,7 +8,7 @@ Standards-Version: 3.9.1
Package: cc-node
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-sjrpc, python-psutil
Depends: ${misc:Depends}, ${python:Depends}, python-sjrpc, python-psutil, python-libvirt
XB-Python-Version: ${python:Versions}
Description: CloudControl node
This package provides node of CloudControl.
......@@ -5,7 +5,7 @@ ldesc = open(os.path.join(os.path.dirname(__file__), 'README')).read()
setup(
name='cc-node',
version='1',
version='3',
description='Cloud Control Node',
long_description=ldesc,
author='Chakib Benziane',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment