diff --git a/bin/cc-node b/bin/cc-node index 39c49ca6a9c9a17ca6ff9585830a6b671b12d69f..d8e43a70be8775793cd635f9ac3e57e3f9c50b85 100755 --- a/bin/cc-node +++ b/bin/cc-node @@ -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' diff --git a/ccnode/ccnodehandlers.py b/ccnode/ccnodehandlers.py index f8b39d50402a70ebb4629c2ca9a528142e37ef3a..87b272d44fc1e61aef833f79a3d40565dc6f9418 100644 --- a/ccnode/ccnodehandlers.py +++ b/ccnode/ccnodehandlers.py @@ -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 diff --git a/ccnode/interface.py b/ccnode/interface.py index f783e0f89a1c53650c0f6be1c021cf211b854fb4..6f8f1b9a8e74ed441017bcb341e766e96f28a80e 100644 --- a/ccnode/interface.py +++ b/ccnode/interface.py @@ -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 diff --git a/ccnode/kvm.py b/ccnode/kvm.py index 5cb04722e3bbfe16555e550364263b97e91a2952..99c269dc55abd7a1143e08d5559b8a598c16ab56 100644 --- a/ccnode/kvm.py +++ b/ccnode/kvm.py @@ -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 diff --git a/ccnode/libvirtwrapper.py b/ccnode/libvirtwrapper.py index fa4d15190d4643ae90433b38a2c88d0d9bab7364..826c1838438b15044bdf8ca29d73a63957ed89eb 100644 --- a/ccnode/libvirtwrapper.py +++ b/ccnode/libvirtwrapper.py @@ -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 diff --git a/debian/changelog b/debian/changelog index bffe0fce3be52cc2879632ef72f33b32eeda21d6..f0ce7c888b1e25aa9bea007519272493756e0762 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +cc-node (3-1) unstable; urgency=low + + * Added $HOSTNAME variable on login field of config file. + * Fixed bugs + + -- Antoine Millet 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 Fri, 17 Dec 2010 11:43:42 +0100 + cc-node (1-1) unstable; urgency=low * Initial release. diff --git a/debian/control b/debian/control index 5433e145570f2fdb0e23d4f23ffddb4be0298bea..6b8614fc1d174a31faaab456a7d74353cb2b6de5 100644 --- a/debian/control +++ b/debian/control @@ -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. diff --git a/setup.py b/setup.py index fad346b81a1ba739b8ebed8d7afd6a1aee8bcd67..ca3c76a45631e3b23a83dfe0701a0da45992306f 100644 --- a/setup.py +++ b/setup.py @@ -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',