From b0b8337a8fa9cecbee1829149d5b698127557ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dato=20Sim=C3=B3?= <dato@google.com>
Date: Wed, 10 Oct 2012 22:05:03 +0100
Subject: [PATCH] Text.hs: update field lists in parseData comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The comments in parseData had become out of date with the implementations
of load{Group,Node,Inst}. This commit updates the field list in comments to
match the implementations.
Signed-off-by: Dato SimΓ³ <dato@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
htools/Ganeti/HTools/Text.hs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/htools/Ganeti/HTools/Text.hs b/htools/Ganeti/HTools/Text.hs
index 3b4bece07..4febe9ce4 100644
--- a/htools/Ganeti/HTools/Text.hs
+++ b/htools/Ganeti/HTools/Text.hs
@@ -319,11 +319,13 @@ parseData fdata = do
[a, b, c, d] -> Ok (a, b, c, d, [])
xs -> Bad $ printf "Invalid format of the input file: %d sections\
\ instead of 4 or 5" (length xs)
- {- group file: name uuid -}
+ {- group file: name uuid alloc_policy -}
(ktg, gl) <- loadTabular glines loadGroup
- {- node file: name t_mem n_mem f_mem t_disk f_disk -}
+ {- node file: name t_mem n_mem f_mem t_disk f_disk t_cpu offline grp_uuid
+ spindles -}
(ktn, nl) <- loadTabular nlines (loadNode ktg)
- {- instance file: name mem disk status pnode snode -}
+ {- instance file: name mem disk vcpus status auto_bal pnode snode
+ disk_template tags spindle_use -}
(_, il) <- loadTabular ilines (loadInst ktn)
{- the tags are simply line-based, no processing needed -}
{- process policies -}
--
GitLab