Commit a726abb9 authored by Benziane Chakib's avatar Benziane Chakib
Browse files

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

parents 6d3f5d36 abe9bb18

bin/cc-node

+1 −1
Original line number Diff line number Diff line
@@ -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'

ccnode/ccnodehandlers.py

+3 −3
Original line number Diff line number Diff line
@@ -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

ccnode/interface.py

+3 −3
Original line number Diff line number Diff line
@@ -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

ccnode/kvm.py

+1 −1
Original line number Diff line number Diff line
@@ -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

ccnode/libvirtwrapper.py

+3 −3
Original line number Diff line number Diff line
@@ -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