This removes the check for conflicts from the Haskell version of the OpCode NetworkDisconnect. This alignes the Haskell code with the patch "Force conflicts check in LUNetworkDisconnect" (which is currently under review). I will submit these patches together then.
Signed-off-by: Helga Velroyen <[email protected]> --- src/Ganeti/OpCodes.hs | 1 - test/hs/Test/Ganeti/OpCodes.hs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Ganeti/OpCodes.hs b/src/Ganeti/OpCodes.hs index ec9a34f..cd54663 100644 --- a/src/Ganeti/OpCodes.hs +++ b/src/Ganeti/OpCodes.hs @@ -535,7 +535,6 @@ $(genOpCode "OpCode" , ("OpNetworkDisconnect", [ pGroupName , pNetworkName - , pIpConflictsCheck ]) , ("OpNetworkQuery", dOldQuery) , ("OpRestrictedCommand", diff --git a/test/hs/Test/Ganeti/OpCodes.hs b/test/hs/Test/Ganeti/OpCodes.hs index cf345d1..cc45f66 100644 --- a/test/hs/Test/Ganeti/OpCodes.hs +++ b/test/hs/Test/Ganeti/OpCodes.hs @@ -333,7 +333,7 @@ instance Arbitrary OpCodes.OpCode where OpCodes.OpNetworkConnect <$> genNameNE <*> genNameNE <*> arbitrary <*> genNameNE <*> arbitrary "OP_NETWORK_DISCONNECT" -> - OpCodes.OpNetworkDisconnect <$> genNameNE <*> genNameNE <*> arbitrary + OpCodes.OpNetworkDisconnect <$> genNameNE <*> genNameNE "OP_NETWORK_QUERY" -> OpCodes.OpNetworkQuery <$> genFieldsNE <*> genNamesNE <*> arbitrary "OP_RESTRICTED_COMMAND" -> -- 1.7.10.4
