Revision 8e4e0268 src/Ganeti/Confd/Types.hs

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

Also available in: Unified diff