Revision 8e4e0268

b/src/Ganeti/Confd/Types.hs
52 52
import qualified Network.Socket as S
53 53

  
54 54
import qualified Ganeti.Constants as C
55
import qualified Ganeti.ConstantUtils as ConstantUtils
55 56
import Ganeti.Hash
56 57
import Ganeti.THH
57 58
import Ganeti.Utils (newUUID)
......
95 96

  
96 97
$(buildObject "ConfdReqQ" "confdReqQ"
97 98
  [ renameField "Ip" .
98
                optionalField $ simpleField C.confdReqqIp [t| String   |]
99
    optionalField $
100
    simpleField ConstantUtils.confdReqqIp [t| String |]
99 101
  , renameField "IpList" .
100
                defaultField [| [] |] $
101
                simpleField C.confdReqqIplist [t| [String] |]
102
  , renameField "Link" . optionalField $
103
                simpleField C.confdReqqLink [t| String   |]
104
  , renameField "Fields" . defaultField [| [] |] $
105
                simpleField C.confdReqqFields [t| [ConfdReqField] |]
102
    defaultField [| [] |] $
103
    simpleField ConstantUtils.confdReqqIplist [t| [String] |]
104
  , renameField "Link" .
105
    optionalField $
106
    simpleField ConstantUtils.confdReqqLink [t| String |]
107
  , renameField "Fields" .
108
    defaultField [| [] |] $
109
    simpleField ConstantUtils.confdReqqFields [t| [ConfdReqField] |]
106 110
  ])
107 111

  
108 112
-- | Confd query type. This is complex enough that we can't
b/src/Ganeti/ConstantUtils.hs
66 66

  
67 67
-- | Failure exit code
68 68
--
69
-- This is defined here and not in 'Ganeti.HsConstants' together with
69
-- These are defined here and not in 'Ganeti.HsConstants' together with
70 70
-- the other exit codes in order to avoid a circular dependency
71 71
-- between 'Ganeti.HsConstants' and 'Ganeti.Runtime'
72 72
exitFailure :: Int
......
88 88
randomUuidFile :: String
89 89
randomUuidFile = "/proc/sys/kernel/random/uuid"
90 90

  
91
-- | Priority levels
91
-- * Priority levels
92 92
--
93
-- This is defined here and not in 'Ganeti.Types' order to avoid a GHC
94
-- stage restriction and because there is no suitable 'declareADT'
93
-- This is defined here and not in 'Ganeti.Types' in order to avoid a
94
-- GHC stage restriction and because there is no suitable 'declareADT'
95 95
-- variant that handles integer values directly.
96

  
96 97
priorityLow :: Int
97 98
priorityLow = 10
98 99

  
......
107 108
buildVersion :: Int -> Int -> Int -> Int
108 109
buildVersion major minor revision =
109 110
  1000000 * major + 10000 * minor + 1 * revision
111

  
112
-- * Confd request query fields.
113
--
114
-- These are defined here and not in 'Ganeti.Types' due to GHC stage
115
-- restrictions concerning Template Haskell.  They are also not
116
-- defined in 'Ganeti.HsConstants' in order to avoid a circular
117
-- dependency between that module and 'Ganeti.Types'.
118

  
119
confdReqqLink :: String
120
confdReqqLink = "0"
121

  
122
confdReqqIp :: String
123
confdReqqIp = "1"
124

  
125
confdReqqIplist :: String
126
confdReqqIplist = "2"
127

  
128
confdReqqFields :: String
129
confdReqqFields = "3"

Also available in: Unified diff