From f3baf5ef16be742f432e5eb0336d5865c76f647c Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 30 Aug 2012 00:45:15 +0200
Subject: [PATCH] Move JSON.hs and Compat.hs out from under HTools/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
These two files are not htools-specific, so let's move them out of the
HTools subdirectory/module hierarchy and directly under Ganeti.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
Makefile.am | 4 ++--
htest/Test/Ganeti/HTools/Utils.hs | 2 +-
htools/Ganeti/{HTools => }/Compat.hs | 4 ++--
htools/Ganeti/Confd.hs | 2 +-
htools/Ganeti/Confd/Server.hs | 2 +-
htools/Ganeti/Confd/Utils.hs | 2 +-
htools/Ganeti/Config.hs | 2 +-
htools/Ganeti/HTools/Cluster.hs | 2 +-
htools/Ganeti/HTools/IAlloc.hs | 2 +-
htools/Ganeti/HTools/Luxi.hs | 2 +-
htools/Ganeti/HTools/QC.hs | 2 +-
htools/Ganeti/HTools/Rapi.hs | 2 +-
htools/Ganeti/HTools/Types.hs | 2 +-
htools/Ganeti/{HTools => }/JSON.hs | 2 +-
htools/Ganeti/Luxi.hs | 2 +-
htools/Ganeti/Objects.hs | 2 +-
htools/Ganeti/OpCodes.hs | 2 +-
htools/Ganeti/Query/Filter.hs | 2 +-
htools/Ganeti/Query/Language.hs | 2 +-
htools/Ganeti/Query/Query.hs | 2 +-
htools/Ganeti/Rpc.hs | 4 ++--
21 files changed, 24 insertions(+), 24 deletions(-)
rename htools/Ganeti/{HTools => }/Compat.hs (95%)
rename htools/Ganeti/{HTools => }/JSON.hs (99%)
diff --git a/Makefile.am b/Makefile.am
index 6ec06b0ed..efdbd07d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -387,13 +387,11 @@ HPCEXCL = --exclude Main \
HS_LIB_SRCS = \
htools/Ganeti/HTools/CLI.hs \
htools/Ganeti/HTools/Cluster.hs \
- htools/Ganeti/HTools/Compat.hs \
htools/Ganeti/HTools/Container.hs \
htools/Ganeti/HTools/ExtLoader.hs \
htools/Ganeti/HTools/Group.hs \
htools/Ganeti/HTools/IAlloc.hs \
htools/Ganeti/HTools/Instance.hs \
- htools/Ganeti/HTools/JSON.hs \
htools/Ganeti/HTools/Loader.hs \
htools/Ganeti/HTools/Luxi.hs \
htools/Ganeti/HTools/Node.hs \
@@ -412,6 +410,7 @@ HS_LIB_SRCS = \
htools/Ganeti/HTools/Program/Hscan.hs \
htools/Ganeti/HTools/Program/Hspace.hs \
htools/Ganeti/BasicTypes.hs \
+ htools/Ganeti/Compat.hs \
htools/Ganeti/Confd.hs \
htools/Ganeti/Confd/Server.hs \
htools/Ganeti/Confd/Utils.hs \
@@ -419,6 +418,7 @@ HS_LIB_SRCS = \
htools/Ganeti/Daemon.hs \
htools/Ganeti/Hash.hs \
htools/Ganeti/Jobs.hs \
+ htools/Ganeti/JSON.hs \
htools/Ganeti/Logging.hs \
htools/Ganeti/Luxi.hs \
htools/Ganeti/Objects.hs \
diff --git a/htest/Test/Ganeti/HTools/Utils.hs b/htest/Test/Ganeti/HTools/Utils.hs
index ec70be2a4..538d8263a 100644
--- a/htest/Test/Ganeti/HTools/Utils.hs
+++ b/htest/Test/Ganeti/HTools/Utils.hs
@@ -35,7 +35,7 @@ import qualified Text.JSON as J
import Test.Ganeti.TestHelper
import Test.Ganeti.TestCommon
-import qualified Ganeti.HTools.JSON as JSON
+import qualified Ganeti.JSON as JSON
import qualified Ganeti.HTools.Types as Types
import qualified Ganeti.HTools.Utils as Utils
diff --git a/htools/Ganeti/HTools/Compat.hs b/htools/Ganeti/Compat.hs
similarity index 95%
rename from htools/Ganeti/HTools/Compat.hs
rename to htools/Ganeti/Compat.hs
index 3f1cebbda..1ba2f2489 100644
--- a/htools/Ganeti/HTools/Compat.hs
+++ b/htools/Ganeti/Compat.hs
@@ -9,7 +9,7 @@ library versions or transitions between versions.
{-
-Copyright (C) 2011 Google Inc.
+Copyright (C) 2011, 2012 Google Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-}
-module Ganeti.HTools.Compat
+module Ganeti.Compat
( rwhnf
, Control.Parallel.Strategies.parMap
) where
diff --git a/htools/Ganeti/Confd.hs b/htools/Ganeti/Confd.hs
index ceb4c8f24..37ad52113 100644
--- a/htools/Ganeti/Confd.hs
+++ b/htools/Ganeti/Confd.hs
@@ -50,7 +50,7 @@ import Text.JSON
import qualified Ganeti.Constants as C
import Ganeti.THH
-import Ganeti.HTools.JSON
+import Ganeti.JSON
{-
Note that we re-export as is from Constants the following simple items:
diff --git a/htools/Ganeti/Confd/Server.hs b/htools/Ganeti/Confd/Server.hs
index e7ec48399..f0999b374 100644
--- a/htools/Ganeti/Confd/Server.hs
+++ b/htools/Ganeti/Confd/Server.hs
@@ -45,7 +45,7 @@ import qualified Text.JSON as J
import System.INotify
import Ganeti.Daemon
-import Ganeti.HTools.JSON
+import Ganeti.JSON
import Ganeti.HTools.Types
import Ganeti.HTools.Utils
import Ganeti.Objects
diff --git a/htools/Ganeti/Confd/Utils.hs b/htools/Ganeti/Confd/Utils.hs
index 707957dee..b121f0ae8 100644
--- a/htools/Ganeti/Confd/Utils.hs
+++ b/htools/Ganeti/Confd/Utils.hs
@@ -40,7 +40,7 @@ import Ganeti.BasicTypes
import Ganeti.Confd
import Ganeti.Hash
import qualified Ganeti.Constants as C
-import Ganeti.HTools.JSON
+import Ganeti.JSON
import Ganeti.HTools.Utils
-- | Returns the HMAC key.
diff --git a/htools/Ganeti/Config.hs b/htools/Ganeti/Config.hs
index 4c75a2255..54b9f465d 100644
--- a/htools/Ganeti/Config.hs
+++ b/htools/Ganeti/Config.hs
@@ -49,7 +49,7 @@ import qualified Data.Map as M
import qualified Data.Set as S
import qualified Text.JSON as J
-import Ganeti.HTools.JSON
+import Ganeti.JSON
import Ganeti.BasicTypes
import qualified Ganeti.Constants as C
diff --git a/htools/Ganeti/HTools/Cluster.hs b/htools/Ganeti/HTools/Cluster.hs
index 6edf854bf..821cd474f 100644
--- a/htools/Ganeti/HTools/Cluster.hs
+++ b/htools/Ganeti/HTools/Cluster.hs
@@ -87,7 +87,7 @@ import qualified Ganeti.HTools.Node as Node
import qualified Ganeti.HTools.Group as Group
import Ganeti.HTools.Types
import Ganeti.HTools.Utils
-import Ganeti.HTools.Compat
+import Ganeti.Compat
import qualified Ganeti.OpCodes as OpCodes
-- * Types
diff --git a/htools/Ganeti/HTools/IAlloc.hs b/htools/Ganeti/HTools/IAlloc.hs
index 1575387eb..e923a0328 100644
--- a/htools/Ganeti/HTools/IAlloc.hs
+++ b/htools/Ganeti/HTools/IAlloc.hs
@@ -47,8 +47,8 @@ import qualified Ganeti.HTools.Instance as Instance
import qualified Ganeti.Constants as C
import Ganeti.HTools.CLI
import Ganeti.HTools.Loader
-import Ganeti.HTools.JSON
import Ganeti.HTools.Types
+import Ganeti.JSON
{-# ANN module "HLint: ignore Eta reduce" #-}
diff --git a/htools/Ganeti/HTools/Luxi.hs b/htools/Ganeti/HTools/Luxi.hs
index 73512d39e..ae46e4e14 100644
--- a/htools/Ganeti/HTools/Luxi.hs
+++ b/htools/Ganeti/HTools/Luxi.hs
@@ -39,7 +39,7 @@ import Ganeti.HTools.Types
import qualified Ganeti.HTools.Group as Group
import qualified Ganeti.HTools.Node as Node
import qualified Ganeti.HTools.Instance as Instance
-import Ganeti.HTools.JSON
+import Ganeti.JSON
{-# ANN module "HLint: ignore Eta reduce" #-}
diff --git a/htools/Ganeti/HTools/QC.hs b/htools/Ganeti/HTools/QC.hs
index 7dfba3a1f..8cfb1b3e5 100644
--- a/htools/Ganeti/HTools/QC.hs
+++ b/htools/Ganeti/HTools/QC.hs
@@ -79,7 +79,7 @@ import qualified Ganeti.HTools.ExtLoader
import qualified Ganeti.HTools.Group as Group
import qualified Ganeti.HTools.IAlloc as IAlloc
import qualified Ganeti.HTools.Instance as Instance
-import qualified Ganeti.HTools.JSON as JSON
+import qualified Ganeti.JSON as JSON
import qualified Ganeti.HTools.Loader as Loader
import qualified Ganeti.HTools.Luxi as HTools.Luxi
import qualified Ganeti.HTools.Node as Node
diff --git a/htools/Ganeti/HTools/Rapi.hs b/htools/Ganeti/HTools/Rapi.hs
index 87265e12a..3b8f6a57f 100644
--- a/htools/Ganeti/HTools/Rapi.hs
+++ b/htools/Ganeti/HTools/Rapi.hs
@@ -46,7 +46,7 @@ import System.FilePath
import Ganeti.HTools.Loader
import Ganeti.HTools.Types
-import Ganeti.HTools.JSON
+import Ganeti.JSON
import qualified Ganeti.HTools.Group as Group
import qualified Ganeti.HTools.Node as Node
import qualified Ganeti.HTools.Instance as Instance
diff --git a/htools/Ganeti/HTools/Types.hs b/htools/Ganeti/HTools/Types.hs
index b6e92b739..31b3d704c 100644
--- a/htools/Ganeti/HTools/Types.hs
+++ b/htools/Ganeti/HTools/Types.hs
@@ -87,7 +87,7 @@ import Text.JSON (makeObj, readJSON, showJSON)
import qualified Ganeti.Constants as C
import qualified Ganeti.THH as THH
import Ganeti.BasicTypes
-import Ganeti.HTools.JSON
+import Ganeti.JSON
-- | The instance index type.
type Idx = Int
diff --git a/htools/Ganeti/HTools/JSON.hs b/htools/Ganeti/JSON.hs
similarity index 99%
rename from htools/Ganeti/HTools/JSON.hs
rename to htools/Ganeti/JSON.hs
index 3e2b0dc9b..132c0b223 100644
--- a/htools/Ganeti/HTools/JSON.hs
+++ b/htools/Ganeti/JSON.hs
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-}
-module Ganeti.HTools.JSON
+module Ganeti.JSON
( fromJResult
, readEitherString
, JSRecord
diff --git a/htools/Ganeti/Luxi.hs b/htools/Ganeti/Luxi.hs
index 3f6a54cff..c9713e9b1 100644
--- a/htools/Ganeti/Luxi.hs
+++ b/htools/Ganeti/Luxi.hs
@@ -67,7 +67,7 @@ import System.IO.Error (isEOFError)
import System.Timeout
import qualified Network.Socket as S
-import Ganeti.HTools.JSON
+import Ganeti.JSON
import Ganeti.HTools.Types
import Ganeti.HTools.Utils
diff --git a/htools/Ganeti/Objects.hs b/htools/Ganeti/Objects.hs
index 29ddf817a..08198c2f9 100644
--- a/htools/Ganeti/Objects.hs
+++ b/htools/Ganeti/Objects.hs
@@ -96,7 +96,7 @@ import Text.JSON (makeObj, showJSON, readJSON, JSON, JSValue(..))
import qualified Text.JSON as J
import qualified Ganeti.Constants as C
-import Ganeti.HTools.JSON
+import Ganeti.JSON
import Ganeti.THH
diff --git a/htools/Ganeti/OpCodes.hs b/htools/Ganeti/OpCodes.hs
index 6c6e45e36..566c5dbec 100644
--- a/htools/Ganeti/OpCodes.hs
+++ b/htools/Ganeti/OpCodes.hs
@@ -40,7 +40,7 @@ import Text.JSON (readJSON, showJSON, makeObj, JSON)
import qualified Ganeti.Constants as C
import Ganeti.THH
-import Ganeti.HTools.JSON
+import Ganeti.JSON
-- | Replace disks type.
$(declareSADT "ReplaceDisksMode"
diff --git a/htools/Ganeti/Query/Filter.hs b/htools/Ganeti/Query/Filter.hs
index de2a1d476..56e6a6af0 100644
--- a/htools/Ganeti/Query/Filter.hs
+++ b/htools/Ganeti/Query/Filter.hs
@@ -60,7 +60,7 @@ import Ganeti.BasicTypes
import Ganeti.Objects
import Ganeti.Query.Language
import Ganeti.Query.Types
-import Ganeti.HTools.JSON
+import Ganeti.JSON
-- | Compiles a filter based on field names to one based on getters.
compileFilter :: FieldMap a b
diff --git a/htools/Ganeti/Query/Language.hs b/htools/Ganeti/Query/Language.hs
index 2d0e55ed3..20dc3948c 100644
--- a/htools/Ganeti/Query/Language.hs
+++ b/htools/Ganeti/Query/Language.hs
@@ -61,7 +61,7 @@ import qualified Text.Regex.PCRE as PCRE
import qualified Ganeti.Constants as C
import Ganeti.THH
-import Ganeti.HTools.JSON
+import Ganeti.JSON
-- * THH declarations, that require ordering.
diff --git a/htools/Ganeti/Query/Query.hs b/htools/Ganeti/Query/Query.hs
index b721b0bcd..5b09c6393 100644
--- a/htools/Ganeti/Query/Query.hs
+++ b/htools/Ganeti/Query/Query.hs
@@ -55,7 +55,7 @@ import Data.Maybe (fromMaybe)
import qualified Data.Map as Map
import Ganeti.BasicTypes
-import Ganeti.HTools.JSON
+import Ganeti.JSON
import Ganeti.Query.Language
import Ganeti.Query.Common
import Ganeti.Query.Filter
diff --git a/htools/Ganeti/Rpc.hs b/htools/Ganeti/Rpc.hs
index 48c6d2b58..fdd9c6644 100644
--- a/htools/Ganeti/Rpc.hs
+++ b/htools/Ganeti/Rpc.hs
@@ -65,8 +65,8 @@ import Network.Curl
import qualified Ganeti.Constants as C
import Ganeti.Objects
import Ganeti.THH
-import Ganeti.HTools.Compat
-import Ganeti.HTools.JSON
+import Ganeti.Compat
+import Ganeti.JSON
#ifndef NO_CURL
-- | The curl options used for RPC.
--
GitLab