Revision 60a67263

b/src/Ganeti/Query/Network.hs
52 52

  
53 53
networkFields :: FieldList Network Runtime
54 54
networkFields =
55
  [ (FieldDefinition "name" "Name" QFTText "Network name",
55
  [ (FieldDefinition "name" "Network" QFTText "Name",
56 56
     FieldSimple (rsNormal . networkName), QffNormal)
57 57
  , (FieldDefinition "network" "Subnet" QFTText "IPv4 subnet",
58 58
     FieldSimple (rsNormal . networkNetwork), QffNormal)
......
64 64
     FieldSimple (rsMaybeUnavail . networkGateway6), QffNormal)
65 65
  , (FieldDefinition "mac_prefix" "MacPrefix" QFTOther "MAC address prefix",
66 66
     FieldSimple (rsMaybeUnavail . networkMacPrefix), QffNormal)
67
  , (FieldDefinition "free_count" "FreeCount" QFTOther "Number of free IPs",
67
  , (FieldDefinition "free_count" "FreeCount" QFTNumber "Number of available\
68
                                                       \ addresses",
68 69
     FieldSimple (rsMaybeNoData . fmap getFreeCount . createAddressPool),
69 70
     QffNormal)
70
  , (FieldDefinition "map" "Map" QFTText "Map of the network's reserved IPs",
71
  , (FieldDefinition "map" "Map" QFTText "Actual mapping",
71 72
     FieldSimple (rsMaybeNoData . fmap getMap . createAddressPool),
72 73
     QffNormal)
73
  , (FieldDefinition "reserved_count" "ReservedCount" QFTOther
74
       "Number of reserved IPs",
74
  , (FieldDefinition "reserved_count" "ReservedCount" QFTNumber
75
       "Number of reserved addresses",
75 76
     FieldSimple (rsMaybeNoData . fmap getReservedCount . createAddressPool),
76 77
     QffNormal)
77
  , (FieldDefinition "group_list" "GroupList" QFTOther "List of node groups",
78
  , (FieldDefinition "group_list" "GroupList" QFTOther
79
       "List of nodegroups (group name, NIC mode, NIC link)",
78 80
     FieldConfig (\cfg -> rsNormal . getGroupConnections cfg . networkUuid),
79 81
     QffNormal)
80
  , (FieldDefinition "group_cnt" "GroupCount" QFTOther "Number of node groups",
82
  , (FieldDefinition "group_cnt" "NodeGroups" QFTNumber "Number of nodegroups",
81 83
     FieldConfig (\cfg -> rsNormal . length . getGroupConnections cfg
82 84
       . networkUuid), QffNormal)
83 85
  , (FieldDefinition "inst_list" "InstanceList" QFTOther "List of instances",
84 86
     FieldConfig (\cfg -> rsNormal . getInstances cfg . networkUuid),
85 87
     QffNormal)
86
  , (FieldDefinition "inst_cnt" "InstanceCount" QFTOther "Number of instances",
88
  , (FieldDefinition "inst_cnt" "Instances" QFTNumber "Number of instances",
87 89
     FieldConfig (\cfg -> rsNormal . length . getInstances cfg
88 90
       . networkUuid), QffNormal)
89 91
  ] ++

Also available in: Unified diff