From 0ae4b3551221e980262dadae9735dd652ba9eb58 Mon Sep 17 00:00:00 2001
From: Helga Velroyen <helgav@google.com>
Date: Wed, 30 Jan 2013 16:56:20 +0000
Subject: [PATCH] Removes check for conflicts from NetworkDisconnect
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 <helgav@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
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 ec9a34f86..cd5466379 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 cf345d19b..cc45f663d 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" ->
--
GitLab