Revision da5f09ef lib/constants.py

b/lib/constants.py
1139 1139

  
1140 1140
ISPECS_PARAMETERS = frozenset(ISPECS_PARAMETER_TYPES.keys())
1141 1141

  
1142
ISPECS_MINMAX = "minmax"
1142 1143
ISPECS_MIN = "min"
1143 1144
ISPECS_MAX = "max"
1144 1145
ISPECS_STD = "std"
......
1146 1147
IPOLICY_VCPU_RATIO = "vcpu-ratio"
1147 1148
IPOLICY_SPINDLE_RATIO = "spindle-ratio"
1148 1149

  
1149
IPOLICY_ISPECS = compat.UniqueFrozenset([
1150
ISPECS_MINMAX_KEYS = compat.UniqueFrozenset([
1150 1151
  ISPECS_MIN,
1151 1152
  ISPECS_MAX,
1152
  ISPECS_STD,
1153 1153
  ])
1154 1154

  
1155 1155
IPOLICY_PARAMETERS = compat.UniqueFrozenset([
......
1157 1157
  IPOLICY_SPINDLE_RATIO,
1158 1158
  ])
1159 1159

  
1160
IPOLICY_ALL_KEYS = (IPOLICY_ISPECS |
1161
                    IPOLICY_PARAMETERS |
1162
                    frozenset([IPOLICY_DTS]))
1160
IPOLICY_ALL_KEYS = (IPOLICY_PARAMETERS |
1161
                    frozenset([ISPECS_MINMAX, ISPECS_STD, IPOLICY_DTS]))
1163 1162

  
1164 1163
# Node parameter names
1165 1164
ND_OOB_PROGRAM = "oob_program"
......
2182 2181

  
2183 2182
# All of the following values are quite arbitrarily - there are no
2184 2183
# "good" defaults, these must be customised per-site
2185
IPOLICY_DEFAULTS = {
2184
ISPECS_MINMAX_DEFAULTS = {
2186 2185
  ISPECS_MIN: {
2187 2186
    ISPEC_MEM_SIZE: 128,
2188 2187
    ISPEC_CPU_COUNT: 1,
......
2199 2198
    ISPEC_NIC_COUNT: MAX_NICS,
2200 2199
    ISPEC_SPINDLE_USE: 12,
2201 2200
    },
2201
  }
2202
IPOLICY_DEFAULTS = {
2203
  ISPECS_MINMAX: ISPECS_MINMAX_DEFAULTS,
2202 2204
  ISPECS_STD: {
2203 2205
    ISPEC_MEM_SIZE: 128,
2204 2206
    ISPEC_CPU_COUNT: 1,

Also available in: Unified diff