From 4e4433e8989222fb4b0fbfa2baef727496dde5ca Mon Sep 17 00:00:00 2001
From: Christos Stavrakakis <cstavr@grnet.gr>
Date: Thu, 4 Apr 2013 11:51:15 +0300
Subject: [PATCH] Add name to INicParams and IDiskParams
This commits adds name to NIC and Disk modification definition.
Signed-off-by: Chris Stavrakakis <cstavr@grnet.gr>
Reviewed-by: Helga Velroyen <helgav@google.com>
---
src/Ganeti/OpParams.hs | 2 ++
test/hs/Test/Ganeti/OpCodes.hs | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/Ganeti/OpParams.hs b/src/Ganeti/OpParams.hs
index eb8f47c21..7001f83bf 100644
--- a/src/Ganeti/OpParams.hs
+++ b/src/Ganeti/OpParams.hs
@@ -403,6 +403,7 @@ $(buildObject "INicParams" "inic"
, optionalField $ simpleField C.inicIp [t| String |]
, optionalField $ simpleField C.inicMode [t| NonEmptyString |]
, optionalField $ simpleField C.inicLink [t| NonEmptyString |]
+ , optionalField $ simpleField C.inicName [t| NonEmptyString |]
])
-- | Disk modification definition. FIXME: disksize should be VTYPE_UNIT.
@@ -412,6 +413,7 @@ $(buildObject "IDiskParams" "idisk"
, optionalField $ simpleField C.idiskAdopt [t| NonEmptyString |]
, optionalField $ simpleField C.idiskVg [t| NonEmptyString |]
, optionalField $ simpleField C.idiskMetavg [t| NonEmptyString |]
+ , optionalField $ simpleField C.idiskName [t| NonEmptyString |]
])
-- | Disk changes type for OpInstanceRecreateDisks. This is a bit
diff --git a/test/hs/Test/Ganeti/OpCodes.hs b/test/hs/Test/Ganeti/OpCodes.hs
index 17c685077..a37517b93 100644
--- a/test/hs/Test/Ganeti/OpCodes.hs
+++ b/test/hs/Test/Ganeti/OpCodes.hs
@@ -76,12 +76,12 @@ instance Arbitrary OpCodes.DiskIndex where
instance Arbitrary INicParams where
arbitrary = INicParams <$> genMaybe genNameNE <*> genMaybe genName <*>
- genMaybe genNameNE <*> genMaybe genNameNE
+ genMaybe genNameNE <*> genMaybe genNameNE <*> genMaybe genNameNE
instance Arbitrary IDiskParams where
arbitrary = IDiskParams <$> arbitrary <*> arbitrary <*>
genMaybe genNameNE <*> genMaybe genNameNE <*>
- genMaybe genNameNE
+ genMaybe genNameNE <*> genMaybe genNameNE
instance Arbitrary RecreateDisksInfo where
arbitrary = oneof [ pure RecreateDisksAll
--
GitLab