Commit 18c8e784 authored by Anael Beutot's avatar Anael Beutot
Browse files

Updated TTL.

parent 3f0160bd

ccnode/host/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class Handler(DefaultHandler): 


        # disk related tags

        for d in self.tags['disk'].value.split():

            t = Tag('disk%s_size' % d, disk_tag_value(d), 3600)

            t = Tag('disk%s_size' % d, disk_tag_value(d), 60)

            self.tags[t.name] = t



    def execute_command(self, command):

ccnode/host/tags.py

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ def cpu(): 
def cpuuse():

    """CPU usage in percentage."""

    return u'%.1f' % psutil.cpu_percent()

cpuuse.ttl = 5

cpuuse.ttl = 10





# memory related tags
@@ -54,13 +54,13 @@ mem.ttl = -1 # FIXME validate ttl 
def memfree():

    """Available physical memory on system."""

    return unicode(psutil.avail_phymem())

memfree.ttl = 60

memfree.ttl = 5





def memused():

    """Used physical memory on system."""

    return unicode(psutil.used_phymem())

memused.ttl = 60

memused.ttl = 5





# disks related tags

ccnode/hypervisor/domains/__init__.py

+7 −7
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ class VirtualMachine(object): 
        i = 0

        for v in self.iter_disks():

            for t in (

                Tag('disk%s_size' % i, v.capacity),

                Tag('disk%s_path' % i, v.path),

                Tag('disk%s_pool' % i, v.storage),  # FIXME: change

                Tag('disk%s_vol' % i, v.name),

                Tag('disk%s_size' % i, v.capacity, 10),

                Tag('disk%s_path' % i, v.path, 10),

                Tag('disk%s_pool' % i, v.storage, 10),  # FIXME: change

                Tag('disk%s_vol' % i, v.name, 10),

            ):

                self.tags[t.name] = t
@@ -46,9 +46,9 @@ class VirtualMachine(object): 
        i = 0

        for nic in self.iter_nics():

            for t in (

                Tag('nic%s_mac' % i, nic.mac),

                Tag('nic%s_source' % i, nic.source),

                Tag('nic%s_model' %i, nic.model),

                Tag('nic%s_mac' % i, nic.mac, 10),

                Tag('nic%s_source' % i, nic.source, 10),

                Tag('nic%s_model' %i, nic.model, 10),

            ):

                self.tags[t.name] = t

ccnode/hypervisor/domains/vm_tags.py

+4 −5
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ def uuid(dom): 


def status(dom):

    return dom.state

status.ttl = 5





def hv(dom):
@@ -40,6 +41,7 @@ def cpu(dom): 


def cpuuse():

    pass

cpuuse.ttl = 10





def mem(dom):
@@ -62,16 +64,13 @@ def vncport(dom): 
        logger.exception('VNCPort')





def status(dom):

    return dom.state

status.ttl = 1





def disk(dom):

    """Get backend disks."""

    return u' '.join(map(str, xrange(len(dom.disks)))) or None

disk.ttl = 10





def nic(dom):

    """VM network interfaces."""

    return u' '.join(map(str, xrange(len(dom.nics)))) or None

disk.nic = 10