Revision 52cc1370 htools/Ganeti/HTools/QC.hs
b/htools/Ganeti/HTools/QC.hs | ||
---|---|---|
754 | 754 |
|
755 | 755 |
prop_Text_Load_Instance name mem dsk vcpus status |
756 | 756 |
(NonEmpty pnode) snode |
757 |
(NonNegative pdx) (NonNegative sdx) autobal dt = |
|
757 |
(NonNegative pdx) (NonNegative sdx) autobal dt su =
|
|
758 | 758 |
pnode /= snode && pdx /= sdx ==> |
759 | 759 |
let vcpus_s = show vcpus |
760 | 760 |
dsk_s = show dsk |
761 | 761 |
mem_s = show mem |
762 |
su_s = show su |
|
762 | 763 |
status_s = Types.instanceStatusToRaw status |
763 | 764 |
ndx = if null snode |
764 | 765 |
then [(pnode, pdx)] |
... | ... | |
769 | 770 |
sdt = Types.diskTemplateToRaw dt |
770 | 771 |
inst = Text.loadInst nl |
771 | 772 |
[name, mem_s, dsk_s, vcpus_s, status_s, |
772 |
sbal, pnode, snode, sdt, tags] |
|
773 |
sbal, pnode, snode, sdt, tags, su_s]
|
|
773 | 774 |
fail1 = Text.loadInst nl |
774 | 775 |
[name, mem_s, dsk_s, vcpus_s, status_s, |
775 | 776 |
sbal, pnode, pnode, tags] |
... | ... | |
789 | 790 |
then Node.noSecondary |
790 | 791 |
else sdx) && |
791 | 792 |
Instance.autoBalance i == autobal && |
793 |
Instance.spindleUsage i == su && |
|
792 | 794 |
Types.isBad fail1 |
793 | 795 |
|
794 | 796 |
prop_Text_Load_InstanceFail ktn fields = |
795 |
length fields /= 10 ==> |
|
797 |
length fields /= 10 && length fields /= 11 ==>
|
|
796 | 798 |
case Text.loadInst nl fields of |
797 | 799 |
Types.Ok _ -> failTest "Managed to load instance from invalid data" |
798 | 800 |
Types.Bad msg -> printTestCase ("Unrecognised error message: " ++ msg) $ |
Also available in: Unified diff