Revision daa49d6f

b/lib/hypervisor/hv_kvm.py
77 77
  constants.HV_KVM_SPICE_ZLIB_GLZ_IMG_COMPR,
78 78
  constants.HV_KVM_SPICE_STREAMING_VIDEO_DETECTION,
79 79
  constants.HV_KVM_SPICE_USE_TLS,
80
  constants.HV_KVM_SPICE_AUDIO_COMPR,
81
  constants.HV_KVM_SPICE_TLS_CIPHERS,
82
  constants.HV_KVM_SPICE_USE_VDAGENT,
83 80
  ])
84 81

  
85 82

  
b/test/ganeti.hypervisor.hv_kvm_unittest.py
260 260

  
261 261
class TestSpiceParameterList(unittest.TestCase):
262 262
  def test(self):
263
    defaults = constants.HVC_DEFAULTS[constants.HT_KVM]
264

  
263 265
    params = \
264 266
      compat.UniqueFrozenset(getattr(constants, name)
265 267
                             for name in dir(constants)
266 268
                             if name.startswith("HV_KVM_SPICE_"))
267 269

  
270
    # Parameters whose default value evaluates to True and don't need to be set
271
    defaults_true = frozenset(filter(defaults.__getitem__, params))
272

  
273
    self.assertEqual(defaults_true, frozenset([
274
      constants.HV_KVM_SPICE_AUDIO_COMPR,
275
      constants.HV_KVM_SPICE_USE_VDAGENT,
276
      constants.HV_KVM_SPICE_TLS_CIPHERS,
277
      ]))
278

  
279
    # HV_KVM_SPICE_BIND decides whether the other parameters must be set if
280
    # their default evaluates to False
281
    assert constants.HV_KVM_SPICE_BIND in params
282
    assert constants.HV_KVM_SPICE_BIND not in defaults_true
283

  
268 284
    # Exclude some parameters
269
    params -= frozenset([
285
    params -= defaults_true | frozenset([
270 286
      constants.HV_KVM_SPICE_BIND,
271 287
      ])
272 288

  

Also available in: Unified diff