From 7118a0df242f01b944d3a7f175602685c0b95bab Mon Sep 17 00:00:00 2001 From: Iustin Pop Date: Wed, 23 Sep 2009 19:11:32 +0200 Subject: [PATCH] Export the uuid in RAPI This also simplifies a little the field declaration in RAPI. Signed-off-by: Iustin Pop Reviewed-by: Michael Hanselmann --- lib/rapi/rlib2.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py index 345d693..1cc2822 100644 --- a/lib/rapi/rlib2.py +++ b/lib/rapi/rlib2.py @@ -31,6 +31,7 @@ from ganeti import rapi from ganeti.rapi import baserlib +_COMMON_FIELDS = ["ctime", "mtime", "uuid", "serial_no", "tags"] I_FIELDS = ["name", "admin_state", "os", "pnode", "snodes", "disk_template", @@ -39,16 +40,16 @@ I_FIELDS = ["name", "admin_state", "os", "disk.sizes", "disk_usage", "beparams", "hvparams", "oper_state", "oper_ram", "status", - "tags"] + ] + _COMMON_FIELDS N_FIELDS = ["name", "offline", "master_candidate", "drained", "dtotal", "dfree", "mtotal", "mnode", "mfree", - "pinst_cnt", "sinst_cnt", "tags", + "pinst_cnt", "sinst_cnt", "ctotal", "cnodes", "csockets", - "pip", "sip", "serial_no", "role", + "pip", "sip", "role", "pinst_list", "sinst_list", - ] + ] + _COMMON_FIELDS _NR_DRAINED = "drained" _NR_MASTER_CANDIATE = "master-candidate" -- 1.7.10.4