Now that 'all_nodes' and 'secondary_nodes' of an instance are computed from the 'config' module, move the corresponding tests from 'objects_unittest' to 'config_unittest'.
Signed-off-by: Ilias Tsitsimpis <[email protected]> --- test/py/ganeti.config_unittest.py | 87 ++++++++++++++++++++++++++++++++++++++ test/py/ganeti.objects_unittest.py | 50 +--------------------- 2 files changed, 88 insertions(+), 49 deletions(-) diff --git a/test/py/ganeti.config_unittest.py b/test/py/ganeti.config_unittest.py index f70bc31..a231185 100755 --- a/test/py/ganeti.config_unittest.py +++ b/test/py/ganeti.config_unittest.py @@ -125,6 +125,93 @@ class TestConfigRunner(unittest.TestCase): self.failUnlessEqual(1, len(cfg.GetNodeList())) self.failUnlessEqual(0, len(cfg.GetInstanceList())) + def _GenericNodesCheck(self, inst, all_nodes, secondary_nodes): + for i in [all_nodes, secondary_nodes]: + self.assertTrue(isinstance(i, (list, tuple)), + msg="Data type doesn't guarantee order") + + self.assertTrue(inst.primary_node not in secondary_nodes) + self.assertEqual(all_nodes[0], inst.primary_node, + msg="Primary node not first node in list") + + def testInstNodesNoDisks(self): + """Test all_nodes/secondary_nodes when there are no disks""" + # construct instance + cfg = self._get_object() + inst = self._create_instance(cfg) + cfg.AddInstance(inst, "my-job") + + # No disks + all_nodes = cfg.GetInstanceNodes(inst) + secondary_nodes = cfg.GetInstanceSecondaryNodes(inst) + self._GenericNodesCheck(inst, all_nodes, secondary_nodes) + self.assertEqual(len(secondary_nodes), 0) + self.assertEqual(set(all_nodes), set([inst.primary_node])) + self.assertEqual(cfg.GetInstanceLVsByNode(inst), { + inst.primary_node: [], + }) + + def testInstNodesPlainDisks(self): + # construct instance + cfg = self._get_object() + inst = self._create_instance(cfg) + disks = [ + objects.Disk(dev_type=constants.DT_PLAIN, size=128, + logical_id=("myxenvg", "disk25494")), + objects.Disk(dev_type=constants.DT_PLAIN, size=512, + logical_id=("myxenvg", "disk29071")), + ] + inst.disks = disks + cfg.AddInstance(inst, "my-job") + + # Plain disks + all_nodes = cfg.GetInstanceNodes(inst) + secondary_nodes = cfg.GetInstanceSecondaryNodes(inst) + self._GenericNodesCheck(inst, all_nodes, secondary_nodes) + self.assertEqual(len(secondary_nodes), 0) + self.assertEqual(set(all_nodes), set([inst.primary_node])) + self.assertEqual(cfg.GetInstanceLVsByNode(inst), { + inst.primary_node: ["myxenvg/disk25494", "myxenvg/disk29071"], + }) + + def testInstNodesDrbdDisks(self): + # construct a second node + cfg = self._get_object() + node_group = cfg.LookupNodeGroup(None) + master_uuid = cfg.GetMasterNode() + node2 = objects.Node(name="node2.example.com", group=node_group, + ndparams={}, uuid="node2-uuid") + cfg.AddNode(node2, "my-job") + + # construct instance + inst = self._create_instance(cfg) + disks = [ + objects.Disk(dev_type=constants.DT_DRBD8, size=786432, + logical_id=(master_uuid, node2.uuid, + 12300, 0, 0, "secret"), + children=[ + objects.Disk(dev_type=constants.DT_PLAIN, size=786432, + logical_id=("myxenvg", "disk0")), + objects.Disk(dev_type=constants.DT_PLAIN, size=128, + logical_id=("myxenvg", "meta0")) + ], + iv_name="disk/0") + ] + inst.disks = disks + cfg.AddInstance(inst, "my-job") + + # Drbd Disks + all_nodes = cfg.GetInstanceNodes(inst) + secondary_nodes = cfg.GetInstanceSecondaryNodes(inst) + self._GenericNodesCheck(inst, all_nodes, secondary_nodes) + self.assertEqual(set(secondary_nodes), set([node2.uuid])) + self.assertEqual(set(all_nodes), + set([inst.primary_node, node2.uuid])) + self.assertEqual(cfg.GetInstanceLVsByNode(inst), { + master_uuid: ["myxenvg/disk0", "myxenvg/meta0"], + node2.uuid: ["myxenvg/disk0", "myxenvg/meta0"], + }) + def testUpdateCluster(self): """Test updates on the cluster object""" cfg = self._get_object() diff --git a/test/py/ganeti.objects_unittest.py b/test/py/ganeti.objects_unittest.py index 74ec4b7..9725823 100755 --- a/test/py/ganeti.objects_unittest.py +++ b/test/py/ganeti.objects_unittest.py @@ -321,46 +321,7 @@ class TestOS(unittest.TestCase): class TestInstance(unittest.TestCase): - def _GenericCheck(self, inst): - for i in [inst.all_nodes, inst.secondary_nodes]: - self.assertTrue(isinstance(inst.all_nodes, (list, tuple)), - msg="Data type doesn't guarantee order") - - self.assertTrue(inst.primary_node not in inst.secondary_nodes) - self.assertEqual(inst.all_nodes[0], inst.primary_node, - msg="Primary node not first node in list") - - def testNodesNoDisks(self): - inst = objects.Instance(name="fakeinst.example.com", - primary_node="pnode.example.com", - disks=[ - ]) - - self._GenericCheck(inst) - self.assertEqual(len(inst.secondary_nodes), 0) - self.assertEqual(set(inst.all_nodes), set([inst.primary_node])) - self.assertEqual(inst.MapLVsByNode(), { - inst.primary_node: [], - }) - - def testNodesPlainDisks(self): - inst = objects.Instance(name="fakeinstplain.example.com", - primary_node="node3.example.com", - disks=[ - objects.Disk(dev_type=constants.DT_PLAIN, size=128, - logical_id=("myxenvg", "disk25494")), - objects.Disk(dev_type=constants.DT_PLAIN, size=512, - logical_id=("myxenvg", "disk29071")), - ]) - - self._GenericCheck(inst) - self.assertEqual(len(inst.secondary_nodes), 0) - self.assertEqual(set(inst.all_nodes), set([inst.primary_node])) - self.assertEqual(inst.MapLVsByNode(), { - inst.primary_node: ["myxenvg/disk25494", "myxenvg/disk29071"], - }) - - def testNodesDrbdDisks(self): + def testFindDisk(self): inst = objects.Instance(name="fakeinstdrbd.example.com", primary_node="node20.example.com", disks=[ @@ -376,15 +337,6 @@ class TestInstance(unittest.TestCase): iv_name="disk/0") ]) - self._GenericCheck(inst) - self.assertEqual(set(inst.secondary_nodes), set(["node15.example.com"])) - self.assertEqual(set(inst.all_nodes), - set([inst.primary_node, "node15.example.com"])) - self.assertEqual(inst.MapLVsByNode(), { - inst.primary_node: ["myxenvg/disk0", "myxenvg/meta0"], - "node15.example.com": ["myxenvg/disk0", "myxenvg/meta0"], - }) - self.assertEqual(inst.FindDisk(0), inst.disks[0]) self.assertRaises(errors.OpPrereqError, inst.FindDisk, "hello") self.assertRaises(errors.OpPrereqError, inst.FindDisk, 100) -- 1.9.1
