Revision 99ccf8b9 test/ganeti.cmdlib_unittest.py

b/test/ganeti.cmdlib_unittest.py
29 29
import shutil
30 30
import operator
31 31
import itertools
32
import copy
32 33

  
33 34
from ganeti import constants
34 35
from ganeti import mcpu
......
974 975
  def GenerateDRBDSecret(self, ec_id):
975 976
    return "ec%s-secret%s" % (ec_id, self._secret.next())
976 977

  
978
  def GetInstanceInfo(self, _):
979
    return "foobar"
980

  
977 981

  
978 982
class _FakeProcForGenDiskTemplate:
979 983
  def GetECId(self):
......
991 995
    self.lu = _FakeLU(cfg=cfg, proc=proc)
992 996
    self.nodegroup = nodegroup
993 997

  
998
  @staticmethod
999
  def GetDiskParams():
1000
    return copy.deepcopy(constants.DISK_DT_DEFAULTS)
1001

  
994 1002
  def testWrongDiskTemplate(self):
995 1003
    gdt = cmdlib._GenerateDiskTemplate
996 1004
    disk_template = "##unknown##"
......
1000 1008
    self.assertRaises(errors.ProgrammerError, gdt, self.lu, disk_template,
1001 1009
                      "inst26831.example.com", "node30113.example.com", [], [],
1002 1010
                      NotImplemented, NotImplemented, 0, self.lu.LogInfo,
1003
                      self.nodegroup.diskparams)
1011
                      self.GetDiskParams())
1004 1012

  
1005 1013
  def testDiskless(self):
1006 1014
    gdt = cmdlib._GenerateDiskTemplate
......
1008 1016
    result = gdt(self.lu, constants.DT_DISKLESS, "inst27734.example.com",
1009 1017
                 "node30113.example.com", [], [],
1010 1018
                 NotImplemented, NotImplemented, 0, self.lu.LogInfo,
1011
                 self.nodegroup.diskparams)
1019
                 self.GetDiskParams())
1012 1020
    self.assertEqual(result, [])
1013 1021

  
1014 1022
  def _TestTrivialDisk(self, template, disk_info, base_index, exp_dev_type,
......
1027 1035
                      template, "inst25088.example.com",
1028 1036
                      "node185.example.com", ["node323.example.com"], [],
1029 1037
                      NotImplemented, NotImplemented, base_index,
1030
                      self.lu.LogInfo, self.nodegroup.diskparams,
1038
                      self.lu.LogInfo, self.GetDiskParams(),
1031 1039
                      _req_file_storage=req_file_storage,
1032 1040
                      _req_shr_file_storage=req_shr_file_storage)
1033 1041

  
1034 1042
    result = gdt(self.lu, template, "inst21662.example.com",
1035 1043
                 "node21741.example.com", [],
1036 1044
                 disk_info, file_storage_dir, file_driver, base_index,
1037
                 self.lu.LogInfo, self.nodegroup.diskparams,
1045
                 self.lu.LogInfo, self.GetDiskParams(),
1038 1046
                 _req_file_storage=req_file_storage,
1039 1047
                 _req_shr_file_storage=req_shr_file_storage)
1040 1048

  
......
1184 1192
    self.assertRaises(errors.ProgrammerError, gdt, self.lu, constants.DT_DRBD8,
1185 1193
                      "inst827.example.com", "node1334.example.com", [],
1186 1194
                      disk_info, NotImplemented, NotImplemented, 0,
1187
                      self.lu.LogInfo, self.nodegroup.diskparams)
1195
                      self.lu.LogInfo, self.GetDiskParams())
1188 1196

  
1189 1197
    result = gdt(self.lu, constants.DT_DRBD8, "inst827.example.com",
1190 1198
                 "node1334.example.com", ["node12272.example.com"],
1191 1199
                 disk_info, NotImplemented, NotImplemented, 0, self.lu.LogInfo,
1192
                 self.nodegroup.diskparams)
1200
                 self.GetDiskParams())
1193 1201

  
1194 1202
    for (idx, disk) in enumerate(result):
1195 1203
      self.assertTrue(isinstance(disk, objects.Disk))

Also available in: Unified diff