Commit bae67ab6 authored by Thibault VINCENT's avatar Thibault VINCENT
Browse files

new tag spec

parent e87147fc

ccnode/ccnodehandlers.py

+13 −10
Original line number Diff line number Diff line
@@ -26,16 +26,19 @@ TAG_NOT_FOUND_ERROR = 'Tag %s requested but unknown in node handler' 
HV_TAG_MAP = {

    'h' : 'get_name',

    'hv' : 'get_name',

    'htype' : 'get_hv_type',

    'hver' : 'get_hv_version',

    'hvtype' : 'get_hv_type',

    'hvver' : 'get_hv_version',

    'arch' : 'get_arch_type',

    'cpus' : 'get_nb_cpu',

    'cpu' : 'get_nb_cpu',

    'cpu_freq' : 'get_cpu_frequency',

    'status' : 'get_status',

    'cpu' : 'get_cpu_percent',

    'mem_used' : 'get_used_mem',

    'mem_avail' : 'get_free_mem',

    'mem_total': 'get_total_mem'

    'mem' : 'get_total_mem',

    'usedmem' : 'get_used_mem',

    'freemem' : 'get_free_mem',

    'sto' : 'get_storage_total_capacity',

    'freesto' : 'get_storage_total_free',

    'usedsto' : 'get_storage_total_used',

}



# Vm
@@ -45,11 +48,11 @@ VM_TAG_MAP = { 
    'vm' : 'get_name',

    'hv' : 'get_hv_name',

    'vcpus' : 'get_vcpu',

    'status' : 'get_status',

    'vmstatus' : 'get_status',

    'cpu' : 'get_cpu_percent',

    'vmem_used' : 'get_used_mem',

    'vmem_avail' : 'get_free_mem',

    'vmem_total' : 'get_total_mem'

    'mem' : 'get_total_mem',

    'usedmem' : 'get_used_mem',

    'freemem' : 'get_free_mem',

}

ccnode/libvirtwrapper.py

+13 −2
Original line number Diff line number Diff line
@@ -231,6 +231,8 @@ class LibvirtHypervisor(Hypervisor): 
                raise NotImplemented('or unknown hypervisor type')

        except libvirt.libvirtError as error:

            raise HypervisorError(error, 'libvirt cannot connect to hypervisor')

        #build storage objs

        self._storage = LibvirtHVStorage(self)

        #build vm objects

        self._build_vm_list()

        self.hv_info = {}
@@ -311,6 +313,15 @@ class LibvirtHypervisor(Hypervisor): 
    def get_cpu_percent(self):

        return '%2.0f' % psutil.cpu_percent()

        

    def get_storage_total_capacity(self):

        pass

    

    def get_storage_total_free(self):

        pass

    

    def get_storage_total_used(self):

        pass

    

    def get_status(self):

        raise NotImplementedError()
@@ -326,7 +337,7 @@ class LibvirtHVStorage(HVStorage): 
            self.hv_handle = hypervisor

            self._fetch_st_pools()

        else:

            raise TypeError('Excpected %s given %s' % (LibvirtHypervisor,

            raise TypeError('Expected %s given %s' % (LibvirtHypervisor,

                                                        hypervisor))



    def _fetch_st_pools(self):