Revision 20faaa74 test/py/ganeti.rpc_unittest.py

b/test/py/ganeti.rpc_unittest.py
936 936
    KEY_VG1: VAL_VG1,
937 937
    KEY_VG2: VAL_VG2,
938 938
    KEY_HV: VAL_HV,
939
    KEY_SP1: VAL_SP1,
940
    KEY_SP2: VAL_SP2,
941 939
    }
942 940

  
943 941
  def testStandard(self):
944 942
    result = rpc.MakeLegacyNodeInfo(self.STD_LST)
945 943
    self.assertEqual(result, self.STD_DICT)
946 944

  
947
  def testReqVg(self):
945
  def testSpindlesRequired(self):
948 946
    my_lst = [self.VAL_BOOT, [], [self.DICT_HV]]
949
    self.assertRaises(errors.OpExecError, rpc.MakeLegacyNodeInfo, my_lst)
947
    self.assertRaises(errors.OpExecError, rpc.MakeLegacyNodeInfo, my_lst,
948
        require_spindles=True)
950 949

  
951
  def testNoReqVg(self):
950
  def testNoSpindlesRequired(self):
952 951
    my_lst = [self.VAL_BOOT, [], [self.DICT_HV]]
953
    result = rpc.MakeLegacyNodeInfo(my_lst, require_vg_info = False)
952
    result = rpc.MakeLegacyNodeInfo(my_lst, require_spindles = False)
954 953
    self.assertEqual(result, {self.KEY_BOOT: self.VAL_BOOT,
955 954
                              self.KEY_HV: self.VAL_HV})
956
    result = rpc.MakeLegacyNodeInfo(self.STD_LST, require_vg_info = False)
955
    result = rpc.MakeLegacyNodeInfo(self.STD_LST, require_spindles = False)
957 956
    self.assertEqual(result, self.STD_DICT)
958 957

  
959 958

  
......
964 963
    self.total_storage_file = 42
965 964
    self.free_storage_lvm = 69
966 965
    self.total_storage_lvm = 666
967
    self.node_info = [{"name": "mynode",
966
    self.node_info = [{"name": "myfile",
968 967
                       "type": constants.ST_FILE,
969 968
                       "storage_free": self.free_storage_file,
970 969
                       "storage_size": self.total_storage_file},
971
                      {"name": "mynode",
970
                      {"name": "myvg",
972 971
                       "type": constants.ST_LVM_VG,
973 972
                       "storage_free": self.free_storage_lvm,
974 973
                       "storage_size": self.total_storage_lvm},
975
                      {"name": "mynode",
974
                      {"name": "myspindle",
976 975
                       "type": constants.ST_LVM_PV,
977 976
                       "storage_free": 33,
978 977
                       "storage_size": 44}]
979 978

  
980 979
  def testAddDefaultStorageInfoToLegacyNodeInfo(self):
981 980
    result = {}
982
    has_lvm = False
983
    rpc._AddDefaultStorageInfoToLegacyNodeInfo(result, self.node_info, has_lvm)
981
    rpc._AddDefaultStorageInfoToLegacyNodeInfo(result, self.node_info)
984 982
    self.assertEqual(self.free_storage_file, result["storage_free"])
985 983
    self.assertEqual(self.total_storage_file, result["storage_size"])
986 984

  
987
  def testAddDefaultStorageInfoToLegacyNodeInfoOverrideDefault(self):
988
    result = {}
989
    has_lvm = True
990
    rpc._AddDefaultStorageInfoToLegacyNodeInfo(result, self.node_info, has_lvm)
991
    self.assertEqual(self.free_storage_lvm, result["storage_free"])
992
    self.assertEqual(self.total_storage_lvm, result["storage_size"])
993

  
994 985
  def testAddDefaultStorageInfoToLegacyNodeInfoNoDefaults(self):
995 986
    result = {}
996
    has_lvm = False
997
    rpc._AddDefaultStorageInfoToLegacyNodeInfo(result, self.node_info[-1:],
998
                                               has_lvm)
987
    rpc._AddDefaultStorageInfoToLegacyNodeInfo(result, self.node_info[-1:])
999 988
    self.assertFalse("storage_free" in result)
1000 989
    self.assertFalse("storage_size" in result)
1001 990

  
1002
  def testAddDefaultStorageInfoToLegacyNodeInfoNoLvm(self):
1003
    result = {}
1004
    has_lvm = True
1005
    self.assertRaises(errors.OpExecError,
1006
                      rpc._AddDefaultStorageInfoToLegacyNodeInfo,
1007
                      result, self.node_info[-1:], has_lvm)
1008

  
1009 991

  
1010 992
if __name__ == "__main__":
1011 993
  testutils.GanetiTestProgram()

Also available in: Unified diff