From 367c42413bca26d6e3d031a9212a9901bd882743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dato=20Sim=C3=B3?= <dato@google.com>
Date: Wed, 7 Nov 2012 19:49:12 +0000
Subject: [PATCH] htools: move TagObject from Luxi.hs to OpCodes.hs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
In addition to ReqQueryTags in Luxi.hs, the TagObject ADT is also
required for the "kind" attribute of OpTagsSet and OpTagsDel, which
are coming to OpCodes.hs next. Hence, we move TagObject there, and
adjust imports accordingly.
Signed-off-by: Dato SimΓ³ <dato@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
htest/Test/Ganeti/Luxi.hs | 2 --
htest/Test/Ganeti/OpCodes.hs | 2 ++
htools/Ganeti/Luxi.hs | 12 +-----------
htools/Ganeti/OpCodes.hs | 10 ++++++++++
htools/Ganeti/Query/Server.hs | 1 +
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/htest/Test/Ganeti/Luxi.hs b/htest/Test/Ganeti/Luxi.hs
index 81698b08d..8e01bcc9f 100644
--- a/htest/Test/Ganeti/Luxi.hs
+++ b/htest/Test/Ganeti/Luxi.hs
@@ -50,8 +50,6 @@ import qualified Ganeti.Luxi as Luxi
-- * Luxi tests
-$(genArbitrary ''Luxi.TagObject)
-
$(genArbitrary ''Luxi.LuxiReq)
instance Arbitrary Luxi.LuxiOp where
diff --git a/htest/Test/Ganeti/OpCodes.hs b/htest/Test/Ganeti/OpCodes.hs
index 43a0e0ec7..daebf4d5d 100644
--- a/htest/Test/Ganeti/OpCodes.hs
+++ b/htest/Test/Ganeti/OpCodes.hs
@@ -48,6 +48,8 @@ import qualified Ganeti.OpCodes as OpCodes
-- * Arbitrary instances
+$(genArbitrary ''OpCodes.TagObject)
+
$(genArbitrary ''OpCodes.ReplaceDisksMode)
instance Arbitrary OpCodes.DiskIndex where
diff --git a/htools/Ganeti/Luxi.hs b/htools/Ganeti/Luxi.hs
index 7531d7cad..b933eb5c3 100644
--- a/htools/Ganeti/Luxi.hs
+++ b/htools/Ganeti/Luxi.hs
@@ -31,7 +31,6 @@ module Ganeti.Luxi
, Client
, JobId
, RecvResult(..)
- , TagObject(..)
, strOfOp
, getClient
, getServer
@@ -73,7 +72,7 @@ import Ganeti.Constants
import Ganeti.Errors
import Ganeti.JSON
import Ganeti.Jobs (JobStatus)
-import Ganeti.OpCodes (OpCode)
+import Ganeti.OpCodes
import Ganeti.Utils
import qualified Ganeti.Query.Language as Qlang
import Ganeti.THH
@@ -99,15 +98,6 @@ data RecvResult = RecvConnClosed -- ^ Connection closed
-- | The Ganeti job type.
type JobId = Int
--- | Data type representing what items do the tag operations apply to.
-$(declareSADT "TagObject"
- [ ("TagInstance", 'tagInstance)
- , ("TagNode", 'tagNode)
- , ("TagGroup", 'tagNodegroup)
- , ("TagCluster", 'tagCluster)
- ])
-$(makeJSONInstance ''TagObject)
-
-- | Currently supported Luxi operations and JSON serialization.
$(genLuxiOp "LuxiOp"
[ (luxiReqQuery,
diff --git a/htools/Ganeti/OpCodes.hs b/htools/Ganeti/OpCodes.hs
index 566c5dbec..6daa6e690 100644
--- a/htools/Ganeti/OpCodes.hs
+++ b/htools/Ganeti/OpCodes.hs
@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
module Ganeti.OpCodes
( OpCode(..)
+ , TagObject(..)
, ReplaceDisksMode(..)
, DiskIndex
, mkDiskIndex
@@ -42,6 +43,15 @@ import Ganeti.THH
import Ganeti.JSON
+-- | Data type representing what items do the tag operations apply to.
+$(declareSADT "TagObject"
+ [ ("TagInstance", 'C.tagInstance)
+ , ("TagNode", 'C.tagNode)
+ , ("TagGroup", 'C.tagNodegroup)
+ , ("TagCluster", 'C.tagCluster)
+ ])
+$(makeJSONInstance ''TagObject)
+
-- | Replace disks type.
$(declareSADT "ReplaceDisksMode"
[ ("ReplaceOnPrimary", 'C.replaceDiskPri)
diff --git a/htools/Ganeti/Query/Server.hs b/htools/Ganeti/Query/Server.hs
index 06243dddd..91aa745ca 100644
--- a/htools/Ganeti/Query/Server.hs
+++ b/htools/Ganeti/Query/Server.hs
@@ -50,6 +50,7 @@ import qualified Ganeti.Config as Config
import Ganeti.BasicTypes
import Ganeti.Logging
import Ganeti.Luxi
+import Ganeti.OpCodes (TagObject(..))
import qualified Ganeti.Query.Language as Qlang
import Ganeti.Query.Query
import Ganeti.Query.Filter (makeSimpleFilter)
--
GitLab