Make node groups' networks field a dict of nicparams

The networks field of the node groups class is a dictionary
of nic params and not a list of networks. This should fix
the broken QA.

Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --git a/htest/Test/Ganeti/Objects.hs b/htest/Test/Ganeti/Objects.hs
index 79443dd..9f64482 100644 (file)
--- a/htest/Test/Ganeti/Objects.hs
+++ b/htest/Test/Ganeti/Objects.hs
@@ -364,7 +364,10 @@ genNodeGroup = do
   ipolicy <- arbitrary
   diskparams <- pure (GenericContainer Map.empty)
   num_networks <- choose (0, 3)
-  networks <- vectorOf num_networks genValidNetwork
+  net_uuid_list <- vectorOf num_networks (arbitrary::Gen String)
+  nic_param_list <- vectorOf num_networks (arbitrary::Gen PartialNic)
+  net_map <- pure (GenericContainer . Map.fromList $
+    zip net_uuid_list nic_param_list)
   -- timestamp fields
   ctime <- arbitrary
   mtime <- arbitrary
@@ -372,7 +375,7 @@ genNodeGroup = do
   serial <- arbitrary
   tags <- Set.fromList <$> genTags
   let group = NodeGroup name members ndparams alloc_policy ipolicy diskparams
-              networks ctime mtime uuid serial tags
+              net_map ctime mtime uuid serial tags
   return group
 
 instance Arbitrary NodeGroup where

diff --git a/htools/Ganeti/Objects.hs b/htools/Ganeti/Objects.hs
index 2fea77c..d4da6e4 100644 (file)
--- a/htools/Ganeti/Objects.hs
+++ b/htools/Ganeti/Objects.hs
@@ -501,6 +501,9 @@ instance TagsObject Node where
 -- | The disk parameters type.
 type DiskParams = Container (Container JSValue)
 
+-- | A mapping from network UUIDs to nic params of the networks.
+type Networks = Container PartialNic
+
 $(buildObject "NodeGroup" "group" $
   [ simpleField "name"         [t| String |]
   , defaultField [| [] |] $ simpleField "members" [t| [String] |]
@@ -508,7 +511,7 @@ $(buildObject "NodeGroup" "group" $
   , simpleField "alloc_policy" [t| AllocPolicy     |]
   , simpleField "ipolicy"      [t| PartialIPolicy  |]
   , simpleField "diskparams"   [t| DiskParams      |]
-  , defaultField [| [] |] $ simpleField "networks" [t| [Network] |]
+  , simpleField "networks"     [t| Networks        |]
   ]
   ++ timeStampFields
   ++ uuidFields