Revision d953a965 htools/Ganeti/HTools/QC.hs

b/htools/Ganeti/HTools/QC.hs
116 116
                                       , Types.iSpecDiskSize   = 0
117 117
                                       , Types.iSpecDiskCount  = 0
118 118
                                       , Types.iSpecNicCount   = 0
119
                                       , Types.iSpecSpindleUse = 0
119 120
                                       }
120 121
  , Types.iPolicyMaxSpec = Types.ISpec { Types.iSpecMemorySize = maxBound
121 122
                                       , Types.iSpecCpuCount   = maxBound
122 123
                                       , Types.iSpecDiskSize   = maxBound
123 124
                                       , Types.iSpecDiskCount  = C.maxDisks
124 125
                                       , Types.iSpecNicCount   = C.maxNics
126
                                       , Types.iSpecSpindleUse = maxBound
125 127
                                       }
126 128
  , Types.iPolicyStdSpec = Types.ISpec { Types.iSpecMemorySize = Types.unitMem
127 129
                                       , Types.iSpecCpuCount   = Types.unitCpu
128 130
                                       , Types.iSpecDiskSize   = Types.unitDsk
129 131
                                       , Types.iSpecDiskCount  = 1
130 132
                                       , Types.iSpecNicCount   = 1
133
                                       , Types.iSpecSpindleUse = 1
131 134
                                       }
132 135
  , Types.iPolicyDiskTemplates = [Types.DTDrbd8, Types.DTPlain]
133 136
  , Types.iPolicyVcpuRatio = maxVcpuRatio -- somewhat random value, high
......
432 435
    dsk_s <- arbitrary::Gen (NonNegative Int)
433 436
    cpu_c <- arbitrary::Gen (NonNegative Int)
434 437
    nic_c <- arbitrary::Gen (NonNegative Int)
438
    su    <- arbitrary::Gen (NonNegative Int)
435 439
    return Types.ISpec { Types.iSpecMemorySize = fromIntegral mem_s
436 440
                       , Types.iSpecCpuCount   = fromIntegral cpu_c
437 441
                       , Types.iSpecDiskSize   = fromIntegral dsk_s
438 442
                       , Types.iSpecDiskCount  = fromIntegral dsk_c
439 443
                       , Types.iSpecNicCount   = fromIntegral nic_c
444
                       , Types.iSpecSpindleUse = fromIntegral su
440 445
                       }
441 446

  
442 447
-- | Generates an ispec bigger than the given one.
......
447 452
  dsk_s <- choose (Types.iSpecDiskSize imin, maxBound)
448 453
  cpu_c <- choose (Types.iSpecCpuCount imin, maxBound)
449 454
  nic_c <- choose (Types.iSpecNicCount imin, maxBound)
455
  su    <- choose (Types.iSpecSpindleUse imin, maxBound)
450 456
  return Types.ISpec { Types.iSpecMemorySize = fromIntegral mem_s
451 457
                     , Types.iSpecCpuCount   = fromIntegral cpu_c
452 458
                     , Types.iSpecDiskSize   = fromIntegral dsk_s
453 459
                     , Types.iSpecDiskCount  = fromIntegral dsk_c
454 460
                     , Types.iSpecNicCount   = fromIntegral nic_c
461
                     , Types.iSpecSpindleUse = fromIntegral su
455 462
                     }
456 463

  
457 464
instance Arbitrary Types.IPolicy where

Also available in: Unified diff