From 5b49ed09b6801466abdd52440b0c94a636c62f8c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ren=C3=A9=20Nussbaumer?= Date: Thu, 3 Nov 2011 13:52:51 +0100 Subject: [PATCH] Adding basic elements for the new node params MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch adds the new fields to the objects.py as well as defines the constants used in the dicts and their type. Signed-off-by: René Nussbaumer Reviewed-by: Iustin Pop --- lib/constants.py | 30 ++++++++++++++++++++++++++++++ lib/objects.py | 2 ++ 2 files changed, 32 insertions(+) diff --git a/lib/constants.py b/lib/constants.py index 0b0ad4f..aad5970 100644 --- a/lib/constants.py +++ b/lib/constants.py @@ -822,6 +822,36 @@ HV_KVM_MIGRATION_VALID_STATUSES = HV_MIGRATION_VALID_STATUSES # Node info keys HV_NODEINFO_KEY_VERSION = "hv_version" +# Hypervisor state +HVST_MEMORY_TOTAL = "mem_total" +HVST_MEMORY_NODE = "mem_node" +HVST_MEMORY_HV = "mem_hv" +HVST_CPU_TOTAL = "cpu_total" +HVST_CPU_NODE = "cpu_node" + +HVSTS_PARAMETER_TYPES = { + HVST_MEMORY_TOTAL: VTYPE_INT, + HVST_MEMORY_NODE: VTYPE_INT, + HVST_MEMORY_HV: VTYPE_INT, + HVST_CPU_TOTAL: VTYPE_INT, + HVST_CPU_NODE: VTYPE_INT, + } + +HVSTS_PARAMETERS = frozenset(HVSTS_PARAMETER_TYPES.keys()) + +# Disk state +DS_DISK_TOTAL = "disk_total" +DS_DISK_RESERVED = "disk_reserved" +DS_DISK_OVERHEAD = "disk_overhead" + +DSS_PARAMETER_TYPES = { + DS_DISK_TOTAL: VTYPE_INT, + DS_DISK_RESERVED: VTYPE_INT, + DS_DISK_OVERHEAD: VTYPE_INT, + } + +DSS_PARAMETERS = frozenset(DSS_PARAMETER_TYPES.keys()) + # Backend parameter names BE_MEMORY = "memory" BE_VCPUS = "vcpus" diff --git a/lib/objects.py b/lib/objects.py index 0c56620..9201305 100644 --- a/lib/objects.py +++ b/lib/objects.py @@ -982,6 +982,8 @@ class Node(TaggableObject): "vm_capable", "ndparams", "powered", + "hv_state", + "disk_state", ] + _TIMESTAMPS + _UUID def UpgradeConfig(self): -- 1.7.10.4