Revision c8c071cb src/Ganeti/HTools/Node.hs

b/src/Ganeti/HTools/Node.hs
111 111
  , tDsk     :: Double    -- ^ Total disk space (MiB)
112 112
  , fDsk     :: Int       -- ^ Free disk space (MiB)
113 113
  , tCpu     :: Double    -- ^ Total CPU count
114
  , nCpu     :: Int       -- ^ VCPUs used by the node OS
114 115
  , uCpu     :: Int       -- ^ Used VCPU count
115 116
  , tSpindles :: Int      -- ^ Node spindles (spindle_count node parameter,
116 117
                          -- or actual spindles, see note below)
......
234 235
--
235 236
-- The index and the peers maps are empty, and will be need to be
236 237
-- update later via the 'setIdx' and 'buildPeers' functions.
237
create :: String -> Double -> Int -> Int -> Double
238
       -> Int -> Double -> Bool -> Int -> Int -> T.Gdx -> Bool -> Node
238
create :: String -> Double -> Int -> Int
239
       -> Double -> Int -> Double -> Int -> Bool
240
       -> Int -> Int -> T.Gdx -> Bool
241
       -> Node
239 242
create name_init mem_t_init mem_n_init mem_f_init
240
       dsk_t_init dsk_f_init cpu_t_init offline_init spindles_t_init
241
       spindles_f_init group_init excl_stor =
243
       dsk_t_init dsk_f_init cpu_t_init cpu_n_init offline_init
244
       spindles_t_init spindles_f_init group_init excl_stor =
242 245
  Node { name = name_init
243 246
       , alias = name_init
244 247
       , tMem = mem_t_init
......
247 250
       , tDsk = dsk_t_init
248 251
       , fDsk = dsk_f_init
249 252
       , tCpu = cpu_t_init
253
       , nCpu = cpu_n_init
254
       , uCpu = cpu_n_init
250 255
       , tSpindles = spindles_t_init
251 256
       , fSpindles = spindles_f_init
252
       , uCpu = 0
253 257
       , pList = []
254 258
       , sList = []
255 259
       , failN1 = True
......
261 265
                then computePDsk spindles_f_init $ fromIntegral spindles_t_init
262 266
                else computePDsk dsk_f_init dsk_t_init
263 267
       , pRem = 0
264
       , pCpu = 0
268
       , pCpu = fromIntegral cpu_n_init / cpu_t_init
265 269
       , offline = offline_init
266 270
       , isMaster = False
267 271
       , nTags = []

Also available in: Unified diff