diff --git a/htest/Test/Ganeti/Objects.hs b/htest/Test/Ganeti/Objects.hs index 03da9e7df54041817310a3eef41262df552d5cb1..eccc5df603c64d4319addf36fb403e49160dcda9 100644 --- a/htest/Test/Ganeti/Objects.hs +++ b/htest/Test/Ganeti/Objects.hs @@ -131,6 +131,7 @@ $(genArbitrary ''PartialIPolicy) instance Arbitrary NodeGroup where arbitrary = NodeGroup <$> genFQDN <*> pure [] <*> arbitrary <*> arbitrary <*> arbitrary <*> pure (GenericContainer Map.empty) + <*> arbitrary -- ts <*> arbitrary <*> arbitrary -- uuid diff --git a/htools/Ganeti/Objects.hs b/htools/Ganeti/Objects.hs index e2deb9c1ba6e3bbf4fb010ee1abafea24e3b6ca6..2fea77c3a6eacf42181f57932211f52ab817c054 100644 --- a/htools/Ganeti/Objects.hs +++ b/htools/Ganeti/Objects.hs @@ -212,6 +212,7 @@ $(buildObject "PartialNic" "nic" [ simpleField "mac" [t| String |] , optionalField $ simpleField "ip" [t| String |] , simpleField "nicparams" [t| PartialNicParams |] + , optionalField $ simpleField "network" [t| Network |] ]) -- * Disk definitions @@ -502,11 +503,12 @@ type DiskParams = Container (Container JSValue) $(buildObject "NodeGroup" "group" $ [ simpleField "name" [t| String |] - , defaultField [| [] |] $ simpleField "members" [t| [String] |] + , defaultField [| [] |] $ simpleField "members" [t| [String] |] , simpleField "ndparams" [t| PartialNDParams |] , simpleField "alloc_policy" [t| AllocPolicy |] , simpleField "ipolicy" [t| PartialIPolicy |] , simpleField "diskparams" [t| DiskParams |] + , defaultField [| [] |] $ simpleField "networks" [t| [Network] |] ] ++ timeStampFields ++ uuidFields