From 2f3a3365e19bf571664ded3e9c768699c77cc52c Mon Sep 17 00:00:00 2001
From: Helga Velroyen <helgav@google.com>
Date: Thu, 10 Jan 2013 18:26:53 +0100
Subject: [PATCH] Replace nodegroups' PartialNic by PartialNicParams
This fixes a bug that corrups the config when one adds a
network to a node group. I wil soon extend QA by some commands
that would have detected this.
Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
src/Ganeti/Objects.hs | 2 +-
test/hs/Test/Ganeti/Objects.hs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Ganeti/Objects.hs b/src/Ganeti/Objects.hs
index 7d13c4c13..f86b54d35 100644
--- a/src/Ganeti/Objects.hs
+++ b/src/Ganeti/Objects.hs
@@ -514,7 +514,7 @@ instance TagsObject Node where
type DiskParams = Container (Container JSValue)
-- | A mapping from network UUIDs to nic params of the networks.
-type Networks = Container PartialNic
+type Networks = Container PartialNicParams
$(buildObject "NodeGroup" "group" $
[ simpleField "name" [t| String |]
diff --git a/test/hs/Test/Ganeti/Objects.hs b/test/hs/Test/Ganeti/Objects.hs
index 3526902d3..7b05f9e09 100644
--- a/test/hs/Test/Ganeti/Objects.hs
+++ b/test/hs/Test/Ganeti/Objects.hs
@@ -365,7 +365,7 @@ genNodeGroup = do
diskparams <- pure (GenericContainer Map.empty)
num_networks <- choose (0, 3)
net_uuid_list <- vectorOf num_networks (arbitrary::Gen String)
- nic_param_list <- vectorOf num_networks (arbitrary::Gen PartialNic)
+ nic_param_list <- vectorOf num_networks (arbitrary::Gen PartialNicParams)
net_map <- pure (GenericContainer . Map.fromList $
zip net_uuid_list nic_param_list)
-- timestamp fields
--
GitLab