Revision a6c7e2a2

b/lib/constants.py
849 849

  
850 850
HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys())
851 851

  
852
HVS_PARAMETER_TITLES = {
853
  HV_ACPI: "ACPI",
854
  HV_BOOT_ORDER: "Boot_order",
855
  HV_CDROM_IMAGE_PATH: "CDROM_image_path",
856
  HV_DISK_TYPE: "Disk_type",
857
  HV_INITRD_PATH: "Initrd_path",
858
  HV_KERNEL_PATH: "Kernel_path",
859
  HV_NIC_TYPE: "NIC_type",
860
  HV_PAE: "PAE",
861
  HV_VNC_BIND_ADDRESS: "VNC_bind_address",
862
  HV_PASSTHROUGH: "pci_pass",
863
  HV_CPU_TYPE: "cpu_type",
864
  }
865

  
852 866
# Migration statuses
853 867
HV_MIGRATION_COMPLETED = "completed"
854 868
HV_MIGRATION_ACTIVE = "active"
......
936 950
  BE_SPINDLE_USE: VTYPE_INT,
937 951
  }
938 952

  
953
BES_PARAMETER_TITLES = {
954
  BE_AUTO_BALANCE: "Auto_balance",
955
  BE_MAXMEM: "ConfigMaxMem",
956
  BE_MINMEM: "ConfigMinMem",
957
  BE_VCPUS: "ConfigVCPUs",
958
  }
959

  
939 960
BES_PARAMETER_COMPAT = {
940 961
  BE_MEMORY: VTYPE_SIZE,
941 962
  }
......
995 1016

  
996 1017
NDS_PARAMETERS = frozenset(NDS_PARAMETER_TYPES.keys())
997 1018

  
1019
NDS_PARAMETER_TITLES = {
1020
  ND_OOB_PROGRAM: "OutOfBandProgram",
1021
  ND_SPINDLE_COUNT: "SpindleCount",
1022
  }
1023

  
998 1024
# Logical Disks parameters
999 1025
LDP_RESYNC_RATE = "resync-rate"
1000 1026
LDP_STRIPES = "stripes"
b/lib/query.py
145 145

  
146 146
_SERIAL_NO_DOC = "%s object serial number, incremented on each modification"
147 147

  
148
# TODO: Consider moving titles closer to constants
149
NDP_TITLE = {
150
  constants.ND_OOB_PROGRAM: "OutOfBandProgram",
151
  constants.ND_SPINDLE_COUNT: "SpindleCount",
152
  }
153

  
154 148

  
155 149
def _GetUnknownField(ctx, item): # pylint: disable=W0613
156 150
  """Gets the contents of an unknown field.
......
987 981
    field_kind = GQ_CONFIG
988 982
  else:
989 983
    field_kind = NQ_GROUP
990
  return [(_MakeField("ndp/%s" % name, NDP_TITLE.get(name, "ndp/%s" % name),
984
  return [(_MakeField("ndp/%s" % name,
985
                      constants.NDS_PARAMETER_TITLES.get(name,
986
                                                         "ndp/%s" % name),
991 987
                      _VTToQFT[kind], "The \"%s\" node parameter" % name),
992 988
           field_kind, 0, _GetNDParam(name))
993 989
          for name, kind in constants.NDS_PARAMETER_TYPES.items()]
......
1755 1751
  @return: List of field definitions used as input for L{_PrepareFieldList}
1756 1752

  
1757 1753
  """
1758
  # TODO: Consider moving titles closer to constants
1759
  be_title = {
1760
    constants.BE_AUTO_BALANCE: "Auto_balance",
1761
    constants.BE_MAXMEM: "ConfigMaxMem",
1762
    constants.BE_MINMEM: "ConfigMinMem",
1763
    constants.BE_VCPUS: "ConfigVCPUs",
1764
    }
1765

  
1766
  hv_title = {
1767
    constants.HV_ACPI: "ACPI",
1768
    constants.HV_BOOT_ORDER: "Boot_order",
1769
    constants.HV_CDROM_IMAGE_PATH: "CDROM_image_path",
1770
    constants.HV_DISK_TYPE: "Disk_type",
1771
    constants.HV_INITRD_PATH: "Initrd_path",
1772
    constants.HV_KERNEL_PATH: "Kernel_path",
1773
    constants.HV_NIC_TYPE: "NIC_type",
1774
    constants.HV_PAE: "PAE",
1775
    constants.HV_VNC_BIND_ADDRESS: "VNC_bind_address",
1776
    constants.HV_PASSTHROUGH: "pci_pass",
1777
    constants.HV_CPU_TYPE: "cpu_type",
1778
    }
1779

  
1780 1754
  fields = [
1781 1755
    # Filled parameters
1782 1756
    (_MakeField("hvparams", "HypervisorParameters", QFT_OTHER,
......
1809 1783
    return lambda ctx, _: ctx.inst_hvparams.get(name, _FS_UNAVAIL)
1810 1784

  
1811 1785
  fields.extend([
1812
    (_MakeField("hv/%s" % name, hv_title.get(name, "hv/%s" % name),
1786
    (_MakeField("hv/%s" % name,
1787
                constants.HVS_PARAMETER_TITLES.get(name, "hv/%s" % name),
1813 1788
                _VTToQFT[kind], "The \"%s\" hypervisor parameter" % name),
1814 1789
     IQ_CONFIG, 0, _GetInstHvParam(name))
1815 1790
    for name, kind in constants.HVS_PARAMETER_TYPES.items()
......
1821 1796
    return lambda ctx, _: ctx.inst_beparams.get(name, None)
1822 1797

  
1823 1798
  fields.extend([
1824
    (_MakeField("be/%s" % name, be_title.get(name, "be/%s" % name),
1799
    (_MakeField("be/%s" % name,
1800
                constants.BES_PARAMETER_TITLES.get(name, "be/%s" % name),
1825 1801
                _VTToQFT[kind], "The \"%s\" backend parameter" % name),
1826 1802
     IQ_CONFIG, 0, _GetInstBeParam(name))
1827 1803
    for name, kind in constants.BES_PARAMETER_TYPES.items()

Also available in: Unified diff