Rename directory 'Block' to 'Storage'

This patch renames the 'Block' directory to 'Storage' in
the Haskell code base. The same rename was done in the
python code base earlier this quarter. We generalize the
name, because we needed a place for general storage
utility functions and storage code for other storage
types like for example file storage.

Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Thomas Thrainer <thomasth@google.com>

diff --git a/Makefile.am b/Makefile.am
index 8b88ad7..707cf3d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,9 +63,6 @@ myexeclibdir = $(pkglibdir)
 HS_DIRS = \
        src \
        src/Ganeti \
-       src/Ganeti/Block \
-       src/Ganeti/Block/Diskstats \
-       src/Ganeti/Block/Drbd \
        src/Ganeti/Confd \
        src/Ganeti/Curl \
        src/Ganeti/DataCollectors \
@@ -76,12 +73,15 @@ HS_DIRS = \
        src/Ganeti/Hypervisor/Xen \
        src/Ganeti/Monitoring \
        src/Ganeti/Query \
+       src/Ganeti/Storage \
+       src/Ganeti/Storage/Diskstats \
+       src/Ganeti/Storage/Drbd \
        test/hs \
        test/hs/Test \
        test/hs/Test/Ganeti \
-       test/hs/Test/Ganeti/Block \
-       test/hs/Test/Ganeti/Block/Diskstats \
-       test/hs/Test/Ganeti/Block/Drbd \
+       test/hs/Test/Ganeti/Storage \
+       test/hs/Test/Ganeti/Storage/Diskstats \
+       test/hs/Test/Ganeti/Storage/Drbd \
        test/hs/Test/Ganeti/Confd \
        test/hs/Test/Ganeti/HTools \
        test/hs/Test/Ganeti/HTools/Backend \
@@ -533,10 +533,6 @@ HPCEXCL = --exclude Main \
        $(patsubst src.%,--exclude Test.%,$(subst /,.,$(patsubst %.hs,%, $(HS_LIB_SRCS))))
 
 HS_LIB_SRCS = \
-       src/Ganeti/Block/Diskstats/Parser.hs \
-       src/Ganeti/Block/Diskstats/Types.hs \
-       src/Ganeti/Block/Drbd/Parser.hs \
-       src/Ganeti/Block/Drbd/Types.hs \
        src/Ganeti/BasicTypes.hs \
        src/Ganeti/Common.hs \
        src/Ganeti/Compat.hs \
@@ -611,6 +607,10 @@ HS_LIB_SRCS = \
        src/Ganeti/Rpc.hs \
        src/Ganeti/Runtime.hs \
        src/Ganeti/Ssconf.hs \
+       src/Ganeti/Storage/Diskstats/Parser.hs \
+       src/Ganeti/Storage/Diskstats/Types.hs \
+       src/Ganeti/Storage/Drbd/Parser.hs \
+       src/Ganeti/Storage/Drbd/Types.hs \
        src/Ganeti/THH.hs \
        src/Ganeti/Types.hs \
        src/Ganeti/Utils.hs
@@ -618,9 +618,6 @@ HS_LIB_SRCS = \
 HS_TEST_SRCS = \
        test/hs/Test/Ganeti/Attoparsec.hs \
        test/hs/Test/Ganeti/BasicTypes.hs \
-       test/hs/Test/Ganeti/Block/Diskstats/Parser.hs \
-       test/hs/Test/Ganeti/Block/Drbd/Parser.hs \
-       test/hs/Test/Ganeti/Block/Drbd/Types.hs \
        test/hs/Test/Ganeti/Common.hs \
        test/hs/Test/Ganeti/Confd/Types.hs \
        test/hs/Test/Ganeti/Confd/Utils.hs \
@@ -652,6 +649,9 @@ HS_TEST_SRCS = \
        test/hs/Test/Ganeti/Rpc.hs \
        test/hs/Test/Ganeti/Runtime.hs \
        test/hs/Test/Ganeti/Ssconf.hs \
+       test/hs/Test/Ganeti/Storage/Diskstats/Parser.hs \
+       test/hs/Test/Ganeti/Storage/Drbd/Parser.hs \
+       test/hs/Test/Ganeti/Storage/Drbd/Types.hs \
        test/hs/Test/Ganeti/THH.hs \
        test/hs/Test/Ganeti/TestCommon.hs \
        test/hs/Test/Ganeti/TestHTools.hs \

diff --git a/src/Ganeti/DataCollectors/Diskstats.hs b/src/Ganeti/DataCollectors/Diskstats.hs
index e0147a5..92d7ac3 100644 (file)
--- a/src/Ganeti/DataCollectors/Diskstats.hs
+++ b/src/Ganeti/DataCollectors/Diskstats.hs
@@ -45,7 +45,7 @@ import qualified Text.JSON as J
 
 import qualified Ganeti.BasicTypes as BT
 import qualified Ganeti.Constants as C
-import Ganeti.Block.Diskstats.Parser(diskstatsParser)
+import Ganeti.Storage.Diskstats.Parser(diskstatsParser)
 import Ganeti.Common
 import Ganeti.DataCollectors.CLI
 import Ganeti.DataCollectors.Types

diff --git a/src/Ganeti/DataCollectors/Drbd.hs b/src/Ganeti/DataCollectors/Drbd.hs
index 0d74508..fd168da 100644 (file)
--- a/src/Ganeti/DataCollectors/Drbd.hs
+++ b/src/Ganeti/DataCollectors/Drbd.hs
@@ -47,8 +47,8 @@ import qualified Text.JSON as J
 
 import qualified Ganeti.BasicTypes as BT
 import qualified Ganeti.Constants as C
-import Ganeti.Block.Drbd.Parser(drbdStatusParser)
-import Ganeti.Block.Drbd.Types
+import Ganeti.Storage.Drbd.Parser(drbdStatusParser)
+import Ganeti.Storage.Drbd.Types
 import Ganeti.Common
 import Ganeti.Confd.Client
 import Ganeti.Confd.Types

diff --git a/src/Ganeti/Block/Diskstats/Parser.hs b/src/Ganeti/Storage/Diskstats/Parser.hs
similarity index 95%
rename from src/Ganeti/Block/Diskstats/Parser.hs
rename to src/Ganeti/Storage/Diskstats/Parser.hs
index a3492b3..1199f32 100644 (file)
--- a/src/Ganeti/Block/Diskstats/Parser.hs
+++ b/src/Ganeti/Storage/Diskstats/Parser.hs
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.
 
 -}
-module Ganeti.Block.Diskstats.Parser (diskstatsParser) where
+module Ganeti.Storage.Diskstats.Parser (diskstatsParser) where
 
 import Control.Applicative ((<*>), (*>), (<*), (<$>))
 import qualified Data.Attoparsec.Text as A
@@ -33,7 +33,7 @@ import qualified Data.Attoparsec.Combinator as AC
 import Data.Attoparsec.Text (Parser)
 import Data.Text (unpack)
 
-import Ganeti.Block.Diskstats.Types
+import Ganeti.Storage.Diskstats.Types
 
 -- * Utility functions
 

diff --git a/src/Ganeti/Block/Diskstats/Types.hs b/src/Ganeti/Storage/Diskstats/Types.hs
similarity index 97%
rename from src/Ganeti/Block/Diskstats/Types.hs
rename to src/Ganeti/Storage/Diskstats/Types.hs
index 407c0ad..97bc12e 100644 (file)
--- a/src/Ganeti/Block/Diskstats/Types.hs
+++ b/src/Ganeti/Storage/Diskstats/Types.hs
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.
 
 -}
-module Ganeti.Block.Diskstats.Types
+module Ganeti.Storage.Diskstats.Types
   ( Diskstats(..)
   ) where
 

diff --git a/src/Ganeti/Block/Drbd/Parser.hs b/src/Ganeti/Storage/Drbd/Parser.hs
similarity index 99%
rename from src/Ganeti/Block/Drbd/Parser.hs
rename to src/Ganeti/Storage/Drbd/Parser.hs
index 9d3e66c..952401e 100644 (file)
--- a/src/Ganeti/Block/Drbd/Parser.hs
+++ b/src/Ganeti/Storage/Drbd/Parser.hs
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.
 
 -}
-module Ganeti.Block.Drbd.Parser (drbdStatusParser, commaIntParser) where
+module Ganeti.Storage.Drbd.Parser (drbdStatusParser, commaIntParser) where
 
 import Control.Applicative ((<*>), (*>), (<*), (<$>), (<|>), pure)
 import qualified Data.Attoparsec.Text as A
@@ -35,7 +35,7 @@ import Data.List
 import Data.Maybe
 import Data.Text (Text, unpack)
 
-import Ganeti.Block.Drbd.Types
+import Ganeti.Storage.Drbd.Types
 
 -- | Our own space-skipping function, because A.skipSpace also skips
 -- newline characters. It skips ZERO or more spaces, so it does not

diff --git a/src/Ganeti/Block/Drbd/Types.hs b/src/Ganeti/Storage/Drbd/Types.hs
similarity index 99%
rename from src/Ganeti/Block/Drbd/Types.hs
rename to src/Ganeti/Storage/Drbd/Types.hs
index d81ad82..ec9befe 100644 (file)
--- a/src/Ganeti/Block/Drbd/Types.hs
+++ b/src/Ganeti/Storage/Drbd/Types.hs
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.
 
 -}
-module Ganeti.Block.Drbd.Types
+module Ganeti.Storage.Drbd.Types
   ( DRBDStatus(..)
   , VersionInfo(..)
   , DeviceInfo(..)

diff --git a/test/hs/Test/Ganeti/Block/Diskstats/Parser.hs b/test/hs/Test/Ganeti/Storage/Diskstats/Parser.hs
similarity index 96%
rename from test/hs/Test/Ganeti/Block/Diskstats/Parser.hs
rename to test/hs/Test/Ganeti/Storage/Diskstats/Parser.hs
index df9645f..38430ec 100644 (file)
--- a/test/hs/Test/Ganeti/Block/Diskstats/Parser.hs
+++ b/test/hs/Test/Ganeti/Storage/Diskstats/Parser.hs
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 -}
 
-module Test.Ganeti.Block.Diskstats.Parser (testBlock_Diskstats_Parser) where
+module Test.Ganeti.Storage.Diskstats.Parser (testBlock_Diskstats_Parser) where
 
 import Test.QuickCheck as QuickCheck hiding (Result)
 import Test.HUnit
@@ -37,8 +37,8 @@ import qualified Data.Attoparsec.Text as A
 import Data.Text (pack)
 import Text.Printf
 
-import Ganeti.Block.Diskstats.Parser (diskstatsParser)
-import Ganeti.Block.Diskstats.Types
+import Ganeti.Storage.Diskstats.Parser (diskstatsParser)
+import Ganeti.Storage.Diskstats.Types
 
 {-# ANN module "HLint: ignore Use camelCase" #-}
 

diff --git a/test/hs/Test/Ganeti/Block/Drbd/Parser.hs b/test/hs/Test/Ganeti/Storage/Drbd/Parser.hs
similarity index 99%
rename from test/hs/Test/Ganeti/Block/Drbd/Parser.hs
rename to test/hs/Test/Ganeti/Storage/Drbd/Parser.hs
index f63fb83..3796442 100644 (file)
--- a/test/hs/Test/Ganeti/Block/Drbd/Parser.hs
+++ b/test/hs/Test/Ganeti/Storage/Drbd/Parser.hs
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 -}
 
-module Test.Ganeti.Block.Drbd.Parser (testBlock_Drbd_Parser) where
+module Test.Ganeti.Storage.Drbd.Parser (testBlock_Drbd_Parser) where
 
 import Test.QuickCheck as QuickCheck hiding (Result)
 import Test.HUnit
@@ -35,8 +35,8 @@ import qualified Data.Attoparsec.Text as A
 import Data.List (intercalate)
 import Data.Text (pack)
 
-import Ganeti.Block.Drbd.Parser (drbdStatusParser, commaIntParser)
-import Ganeti.Block.Drbd.Types
+import Ganeti.Storage.Drbd.Parser (drbdStatusParser, commaIntParser)
+import Ganeti.Storage.Drbd.Types
 
 {-# ANN module "HLint: ignore Use camelCase" #-}
 

diff --git a/test/hs/Test/Ganeti/Block/Drbd/Types.hs b/test/hs/Test/Ganeti/Storage/Drbd/Types.hs
similarity index 98%
rename from test/hs/Test/Ganeti/Block/Drbd/Types.hs
rename to test/hs/Test/Ganeti/Storage/Drbd/Types.hs
index 6130d05..42e3c50 100644 (file)
--- a/test/hs/Test/Ganeti/Block/Drbd/Types.hs
+++ b/test/hs/Test/Ganeti/Storage/Drbd/Types.hs
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 -}
 
-module Test.Ganeti.Block.Drbd.Types (testBlock_Drbd_Types) where
+module Test.Ganeti.Storage.Drbd.Types (testBlock_Drbd_Types) where
 
 import Test.QuickCheck
 
@@ -36,7 +36,7 @@ import Text.Printf
 
 import Ganeti.JSON
 
-import Ganeti.Block.Drbd.Types
+import Ganeti.Storage.Drbd.Types
 
 {-# ANN module "HLint: ignore Use camelCase" #-}
 {-# ANN module "HLint: ignore Use string literal" #-}

diff --git a/test/hs/htest.hs b/test/hs/htest.hs
index 1d72571..72d536d 100644 (file)
--- a/test/hs/htest.hs
+++ b/test/hs/htest.hs
@@ -33,9 +33,9 @@ import System.Log.Logger
 import Test.Ganeti.TestImports ()
 import Test.Ganeti.Attoparsec
 import Test.Ganeti.BasicTypes
-import Test.Ganeti.Block.Diskstats.Parser
-import Test.Ganeti.Block.Drbd.Parser
-import Test.Ganeti.Block.Drbd.Types
+import Test.Ganeti.Storage.Diskstats.Parser
+import Test.Ganeti.Storage.Drbd.Parser
+import Test.Ganeti.Storage.Drbd.Types
 import Test.Ganeti.Common
 import Test.Ganeti.Confd.Utils
 import Test.Ganeti.Confd.Types