Revision 0fbedb7a

b/lib/objects.py
1350 1350

  
1351 1351
    self.diskparams = UpgradeDiskParams(self.diskparams)
1352 1352

  
1353
  @property
1354
  def primary_hypervisor(self):
1355
    """The first hypervisor is the primary.
1356

  
1357
    Useful, for example, for L{Node}'s hv/disk state.
1358

  
1359
    """
1360
    return self.enabled_hypervisors[0]
1361

  
1353 1362
  def ToDict(self):
1354 1363
    """Custom function for cluster.
1355 1364

  
b/test/ganeti.objects_unittest.py
195 195
    self.assertEqual(node_ndparams,
196 196
                     self.fake_cl.FillND(fake_node, fake_group))
197 197

  
198
  def testPrimaryHypervisor(self):
199
    assert self.fake_cl.enabled_hypervisors is None
200
    self.fake_cl.enabled_hypervisors = [constants.HT_XEN_HVM]
201
    self.assertEqual(self.fake_cl.primary_hypervisor, constants.HT_XEN_HVM)
202

  
203
    self.fake_cl.enabled_hypervisors = [constants.HT_XEN_PVM, constants.HT_KVM]
204
    self.assertEqual(self.fake_cl.primary_hypervisor, constants.HT_XEN_PVM)
205

  
206
    self.fake_cl.enabled_hypervisors = sorted(constants.HYPER_TYPES)
207
    self.assertEqual(self.fake_cl.primary_hypervisor, constants.HT_CHROOT)
208

  
198 209

  
199 210
class TestOS(unittest.TestCase):
200 211
  ALL_DATA = [

Also available in: Unified diff