Revision afc1be3a test/hs/Test/Ganeti/Objects.hs

b/test/hs/Test/Ganeti/Objects.hs
102 102
instance Arbitrary Disk where
103 103
  arbitrary = Disk <$> arbitrary <*> pure [] <*> arbitrary
104 104
                   <*> arbitrary <*> arbitrary <*> arbitrary
105
                   <*> arbitrary <*> arbitrary
105
                   <*> arbitrary <*> arbitrary <*> arbitrary
106 106

  
107 107
-- FIXME: we should generate proper values, >=0, etc., but this is
108 108
-- hard for partial ones, where all must be wrapped in a 'Maybe'
......
191 191
  mode <- arbitrary
192 192
  name <- genMaybe genName
193 193
  spindles <- arbitrary
194
  params <- arbitrary
194 195
  uuid <- genName
195
  let disk = Disk logicalid children ivname size mode name spindles uuid
196
  let disk = Disk logicalid children ivname size mode name spindles params uuid
196 197
  return disk
197 198

  
198 199
genDisk :: Gen Disk
......
214 215
$(genArbitrary ''FilledNicParams)
215 216
$(genArbitrary ''FilledBeParams)
216 217

  
218
instance Arbitrary DiskParams where
219
  arbitrary = return $ GenericContainer Map.empty
220

  
217 221
-- | No real arbitrary instance for 'ClusterHvParams' yet.
218 222
instance Arbitrary ClusterHvParams where
219 223
  arbitrary = return $ GenericContainer Map.empty
......
548 552
      lv_name = "1234sdf-qwef-2134-asff-asd2-23145d.data" :: String
549 553
      d =
550 554
        Disk (LIDPlain vg_name lv_name) [] "diskname" 1000 DiskRdWr
551
          Nothing Nothing "asdfgr-1234-5123-daf3-sdfw-134f43"
555
          Nothing Nothing Nothing "asdfgr-1234-5123-daf3-sdfw-134f43"
552 556
  in
553 557
    HUnit.assertBool "Unable to detect that plain Disk includes logical ID" $
554 558
      includesLogicalId vg_name lv_name d
......
562 566
        Disk
563 567
          (LIDDrbd8 "node1.example.com" "node2.example.com" 2000 1 5 "secret")
564 568
          [ Disk (LIDPlain "onevg" "onelv") [] "disk1" 1000 DiskRdWr Nothing
565
              Nothing "145145-asdf-sdf2-2134-asfd-534g2x"
569
              Nothing Nothing "145145-asdf-sdf2-2134-asfd-534g2x"
566 570
          , Disk (LIDPlain vg_name lv_name) [] "disk2" 1000 DiskRdWr Nothing
567
              Nothing "6gd3sd-423f-ag2j-563b-dg34-gj3fse"
568
          ] "diskname" 1000 DiskRdWr Nothing Nothing
571
              Nothing Nothing "6gd3sd-423f-ag2j-563b-dg34-gj3fse"
572
          ] "diskname" 1000 DiskRdWr Nothing Nothing Nothing
569 573
          "asdfgr-1234-5123-daf3-sdfw-134f43"
570 574
  in
571 575
    HUnit.assertBool "Unable to detect that plain Disk includes logical ID" $
......
578 582
      lv_name = "1234sdf-qwef-2134-asff-asd2-23145d.data" :: String
579 583
      d =
580 584
        Disk (LIDPlain "othervg" "otherlv") [] "diskname" 1000 DiskRdWr
581
          Nothing Nothing "asdfgr-1234-5123-daf3-sdfw-134f43"
585
          Nothing Nothing Nothing "asdfgr-1234-5123-daf3-sdfw-134f43"
582 586
  in
583 587
    HUnit.assertBool "Unable to detect that plain Disk includes logical ID" $
584 588
      not (includesLogicalId vg_name lv_name d)

Also available in: Unified diff