Revision 1d3d454f src/Ganeti/Query/Instance.hs

b/src/Ganeti/Query/Instance.hs
120 120
     FieldConfig getPrimaryNodeName, QffHostname)
121 121
  , (FieldDefinition "pnode.group" "PrimaryNodeGroup" QFTText
122 122
     "Primary node's group",
123
     FieldConfig getPrimaryNodeGroup, QffNormal)
123
     FieldConfig getPrimaryNodeGroupName, QffNormal)
124
  , (FieldDefinition "pnode.group.uuid" "PrimaryNodeGroupUUID" QFTText
125
     "Primary node's group UUID",
126
     FieldConfig getPrimaryNodeGroupUuid, QffNormal)
124 127
  , (FieldDefinition "snodes" "Secondary_Nodes" QFTOther
125 128
     "Secondary nodes; usually this will just be one node",
126 129
     FieldConfig (getSecondaryNodeAttribute nodeName), QffNormal)
......
151 154
  , (FieldDefinition "custom_osparams" "CustomOpSysParameters" QFTOther
152 155
     "Custom operating system parameters",
153 156
     FieldSimple (rsNormal . instOsparams), QffNormal)
157
  , (FieldDefinition "custom_nicparams" "CustomNicParameters" QFTOther
158
     "Custom network interface parameters",
159
     FieldSimple (rsNormal . map nicNicparams . instNics), QffNormal)
154 160
  ] ++
155 161

  
156 162
  -- Instance parameter fields, generated
......
289 295
  -- Simple live fields
290 296
  map instanceLiveFieldBuilder instanceLiveFieldsDefs ++
291 297

  
292
  -- Generated fields
298
  -- Common fields
299
  timeStampFields ++
293 300
  serialFields "Instance" ++
294 301
  uuidFields "Instance" ++
295 302
  tagsFields
......
449 456
getPrimaryNodeName cfg inst =
450 457
  rsErrorNoData $ nodeName <$> getPrimaryNode cfg inst
451 458

  
452
-- | Get primary node hostname
453
getPrimaryNodeGroup :: ConfigData -> Instance -> ResultEntry
454
getPrimaryNodeGroup cfg inst =
455
  rsErrorNoData $ (J.showJSON . groupName) <$>
456
    (getPrimaryNode cfg inst >>=
457
    maybeToError "Configuration missing" . getGroupOfNode cfg)
459
-- | Get primary node group
460
getPrimaryNodeGroup :: ConfigData -> Instance -> ErrorResult NodeGroup
461
getPrimaryNodeGroup cfg inst = do
462
  pNode <- getPrimaryNode cfg inst
463
  maybeToError "Configuration missing" $ getGroupOfNode cfg pNode
464

  
465
-- | Get primary node group name
466
getPrimaryNodeGroupName :: ConfigData -> Instance -> ResultEntry
467
getPrimaryNodeGroupName cfg inst =
468
  rsErrorNoData $ groupName <$> getPrimaryNodeGroup cfg inst
469

  
470
-- | Get primary node group uuid
471
getPrimaryNodeGroupUuid :: ConfigData -> Instance -> ResultEntry
472
getPrimaryNodeGroupUuid cfg inst =
473
  rsErrorNoData $ groupUuid <$> getPrimaryNodeGroup cfg inst
458 474

  
459 475
-- | Get secondary nodes - the configuration objects themselves
460 476
getSecondaryNodes :: ConfigData -> Instance -> ErrorResult [Node]

Also available in: Unified diff