Revision 32389d91 test/py/ganeti.rpc_unittest.py

b/test/py/ganeti.rpc_unittest.py
900 900
class TestLegacyNodeInfo(unittest.TestCase):
901 901
  KEY_BOOT = "bootid"
902 902
  KEY_VG0 = "name"
903
  KEY_VG1 = "vg_free"
904
  KEY_VG2 = "vg_size"
903
  KEY_VG1 = "storage_free"
904
  KEY_VG2 = "storage_size"
905 905
  KEY_HV = "cpu_count"
906 906
  KEY_SP1 = "spindles_free"
907 907
  KEY_SP2 = "spindles_total"
908
  KEY_ST = "type" # key for storage type
908 909
  VAL_BOOT = 0
909 910
  VAL_VG0 = "xy"
910 911
  VAL_VG1 = 11
911 912
  VAL_VG2 = 12
913
  VAL_VG3 = "lvm-vg"
912 914
  VAL_HV = 2
913 915
  VAL_SP0 = "ab"
914 916
  VAL_SP1 = 31
915 917
  VAL_SP2 = 32
918
  VAL_SP3 = "lvm-pv"
916 919
  DICT_VG = {
917 920
    KEY_VG0: VAL_VG0,
918 921
    KEY_VG1: VAL_VG1,
919 922
    KEY_VG2: VAL_VG2,
923
    KEY_ST: VAL_VG3,
920 924
    }
921 925
  DICT_HV = {KEY_HV: VAL_HV}
922 926
  DICT_SP = {
927
    KEY_ST: VAL_SP3,
923 928
    KEY_VG0: VAL_SP0,
924 929
    KEY_VG1: VAL_SP1,
925 930
    KEY_VG2: VAL_SP2,
......
941 946

  
942 947
  def testReqVg(self):
943 948
    my_lst = [self.VAL_BOOT, [], [self.DICT_HV]]
944
    self.assertRaises(ValueError, rpc.MakeLegacyNodeInfo, my_lst)
949
    self.assertRaises(errors.OpExecError, rpc.MakeLegacyNodeInfo, my_lst)
945 950

  
946 951
  def testNoReqVg(self):
947 952
    my_lst = [self.VAL_BOOT, [], [self.DICT_HV]]

Also available in: Unified diff