diff --git a/src/Ganeti/Objects.hs b/src/Ganeti/Objects.hs index f86b54d350d5a7a883958c235f71df34f08c76d2..26ccea6b560e57813c98a9d88edcf95c52933b64 100644 --- a/src/Ganeti/Objects.hs +++ b/src/Ganeti/Objects.hs @@ -192,6 +192,7 @@ $(buildObject "Network" "network" $ , optionalField $ simpleField "ext_reservations" [t| String |] ] + ++ uuidFields ++ serialFields ++ tagsFields) @@ -201,6 +202,9 @@ instance SerialNoObject Network where instance TagsObject Network where tagsOf = networkTags +instance UuidObject Network where + uuidOf = networkUuid + -- * NIC definitions $(buildParam "Nic" "nicp" @@ -639,6 +643,7 @@ $(buildObject "ConfigData" "config" $ , simpleField "nodes" [t| Container Node |] , simpleField "nodegroups" [t| Container NodeGroup |] , simpleField "instances" [t| Container Instance |] + , simpleField "networks" [t| Container Network |] ] ++ serialFields) diff --git a/test/hs/Test/Ganeti/Objects.hs b/test/hs/Test/Ganeti/Objects.hs index 7b05f9e094ae500b209dcc28c68a031d7f284766..818227993157321071e5f21d8d5517b1c95b0630 100644 --- a/test/hs/Test/Ganeti/Objects.hs +++ b/test/hs/Test/Ganeti/Objects.hs @@ -179,8 +179,9 @@ genValidNetwork = do size <- genMaybe genJSValue res <- liftM Just (genBitString $ netmask2NumHosts netmask) ext_res <- liftM Just (genBitString $ netmask2NumHosts netmask) + uuid <- arbitrary let n = Network name network_type mac_prefix net_family net net6 gateway - gateway6 size res ext_res 0 Set.empty + gateway6 size res ext_res uuid 0 Set.empty return n -- | Generates an arbitrary network type. @@ -215,11 +216,13 @@ genEmptyCluster ncount = do show (map fst nodes')) else GenericContainer nodemap continsts = GenericContainer Map.empty + networks = GenericContainer Map.empty grp <- arbitrary let contgroups = GenericContainer $ Map.singleton guuid grp serial <- arbitrary cluster <- resize 8 arbitrary - let c = ConfigData version cluster contnodes contgroups continsts serial + let c = ConfigData version cluster contnodes contgroups continsts networks + serial return c -- * Test properties