Commit 4e4433e8 authored by Christos Stavrakakis's avatar Christos Stavrakakis Committed by Helga Velroyen
Browse files

Add name to INicParams and IDiskParams



This commits adds name to NIC and Disk modification definition.
Signed-off-by: default avatarChris Stavrakakis <cstavr@grnet.gr>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parent 3c1a8730
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment