Revision 4d1429e4

b/test/py/ganeti.rpc_unittest.py
907 907

  
908 908
class TestLegacyNodeInfo(unittest.TestCase):
909 909
  KEY_BOOT = "bootid"
910
  KEY_VG0 = "name"
911
  KEY_VG1 = "storage_free"
912
  KEY_VG2 = "storage_size"
913
  KEY_HV = "cpu_count"
914
  KEY_SP1 = "spindles_free"
915
  KEY_SP2 = "spindles_total"
916
  KEY_ST = "type" # key for storage type
910
  KEY_NAME = "name"
911
  KEY_STORAGE_FREE = "storage_free"
912
  KEY_STORAGE_TOTAL = "storage_size"
913
  KEY_CPU_COUNT = "cpu_count"
914
  KEY_SPINDLES_FREE = "spindles_free"
915
  KEY_SPINDLES_TOTAL = "spindles_total"
916
  KEY_STORAGE_TYPE = "type" # key for storage type
917 917
  VAL_BOOT = 0
918
  VAL_VG0 = "xy"
919
  VAL_VG1 = 11
920
  VAL_VG2 = 12
921
  VAL_VG3 = "lvm-vg"
922
  VAL_HV = 2
923
  VAL_SP0 = "ab"
924
  VAL_SP1 = 31
925
  VAL_SP2 = 32
926
  VAL_SP3 = "lvm-pv"
918
  VAL_VG_NAME = "xy"
919
  VAL_VG_FREE = 11
920
  VAL_VG_TOTAL = 12
921
  VAL_VG_TYPE = "lvm-vg"
922
  VAL_CPU_COUNT = 2
923
  VAL_PV_NAME = "ab"
924
  VAL_PV_FREE = 31
925
  VAL_PV_TOTAL = 32
926
  VAL_PV_TYPE = "lvm-pv"
927 927
  DICT_VG = {
928
    KEY_VG0: VAL_VG0,
929
    KEY_VG1: VAL_VG1,
930
    KEY_VG2: VAL_VG2,
931
    KEY_ST: VAL_VG3,
928
    KEY_NAME: VAL_VG_NAME,
929
    KEY_STORAGE_FREE: VAL_VG_FREE,
930
    KEY_STORAGE_TOTAL: VAL_VG_TOTAL,
931
    KEY_STORAGE_TYPE: VAL_VG_TYPE,
932 932
    }
933
  DICT_HV = {KEY_HV: VAL_HV}
933
  DICT_HV = {KEY_CPU_COUNT: VAL_CPU_COUNT}
934 934
  DICT_SP = {
935
    KEY_ST: VAL_SP3,
936
    KEY_VG0: VAL_SP0,
937
    KEY_VG1: VAL_SP1,
938
    KEY_VG2: VAL_SP2,
935
    KEY_STORAGE_TYPE: VAL_PV_TYPE,
936
    KEY_NAME: VAL_PV_NAME,
937
    KEY_STORAGE_FREE: VAL_PV_FREE,
938
    KEY_STORAGE_TOTAL: VAL_PV_TOTAL,
939 939
    }
940 940
  STD_LST = [VAL_BOOT, [DICT_VG, DICT_SP], [DICT_HV]]
941 941
  STD_DICT = {
942 942
    KEY_BOOT: VAL_BOOT,
943
    KEY_VG0: VAL_VG0,
944
    KEY_VG1: VAL_VG1,
945
    KEY_VG2: VAL_VG2,
946
    KEY_HV: VAL_HV,
943
    KEY_NAME: VAL_VG_NAME,
944
    KEY_STORAGE_FREE: VAL_VG_FREE,
945
    KEY_STORAGE_TOTAL: VAL_VG_TOTAL,
946
    KEY_CPU_COUNT: VAL_CPU_COUNT,
947 947
    }
948 948

  
949 949
  def testStandard(self):
......
959 959
    my_lst = [self.VAL_BOOT, [], [self.DICT_HV]]
960 960
    result = rpc.MakeLegacyNodeInfo(my_lst, require_spindles = False)
961 961
    self.assertEqual(result, {self.KEY_BOOT: self.VAL_BOOT,
962
                              self.KEY_HV: self.VAL_HV})
962
                              self.KEY_CPU_COUNT: self.VAL_CPU_COUNT})
963 963
    result = rpc.MakeLegacyNodeInfo(self.STD_LST, require_spindles = False)
964 964
    self.assertEqual(result, self.STD_DICT)
965 965

  

Also available in: Unified diff