Import original constants instead of generated

Haskell to Python constant generation introduced duplicated constants
in Haskell.  This patch eliminates the duplication and fixes Haskell
to import the correct constants, instead of the generated ones.
Signed-off-by: Jose A. Lopes <jabolopes@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

autotools/convert-constants

@@ -26,6 +26,7 @@ import re
 import types
 
 from ganeti import _autoconf
+from ganeti import _constants
 from ganeti import compat
 from ganeti import constants
 from ganeti import errors
@@ -287,7 +288,9 @@ def Convert(module, prefix):
   """
   lines = [""]
 
-  all_items = dict((name, getattr(module, name)) for name in dir(module))
+  all_items = dict((name, getattr(module, name))
+                   for name in dir(module)
+                   if name not in dir(_constants))
 
   for name in sorted(all_items.keys()):
     value = all_items[name]

src/Ganeti/Constants.hs

 {-| Ganeti constants.
 
-This module reexports the Haskell constants generated from Python.
+This module reexports the Haskell constants and those generated from
+Python.
 
 -}
 
@@ -25,6 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 -}
 
-module Ganeti.Constants (module Ganeti.PyConstants) where
+module Ganeti.Constants (module Ganeti.HsConstants,
+                         module Ganeti.PyConstants) where
 
+import Ganeti.HsConstants
 import Ganeti.PyConstants