diff --git a/Makefile.am b/Makefile.am
index 998b7f460457a723bb65466931726abae1301be5..25b31cdf2e22dc7a1546bfb5f0041c6d4f4b8cd1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1127,6 +1127,7 @@ python_tests = \
test/py/ganeti.backend_unittest-runasroot.py \
test/py/ganeti.backend_unittest.py \
test/py/ganeti.block.bdev_unittest.py \
+ test/py/ganeti.block.drbd_unittest.py \
test/py/ganeti.cli_unittest.py \
test/py/ganeti.client.gnt_cluster_unittest.py \
test/py/ganeti.client.gnt_instance_unittest.py \
diff --git a/test/py/ganeti.block.bdev_unittest.py b/test/py/ganeti.block.bdev_unittest.py
index 6a47b7ec90ee83d7ac75d13a87732c0431988c2b..c6c18dea8ce768d62af935f3f40397b0c9e5e789 100755
--- a/test/py/ganeti.block.bdev_unittest.py
+++ b/test/py/ganeti.block.bdev_unittest.py
@@ -32,355 +32,10 @@ from ganeti import errors
from ganeti import objects
from ganeti import utils
from ganeti.block import bdev
-from ganeti.block import drbd
-from ganeti.block import drbd_info
-from ganeti.block import drbd_cmdgen
import testutils
-class TestDRBD8(testutils.GanetiTestCase):
- def testGetVersion(self):
- data = [
- ["version: 8.0.12 (api:76/proto:86-91)"],
- ["version: 8.2.7 (api:88/proto:0-100)"],
- ["version: 8.3.7.49 (api:188/proto:13-191)"],
- ]
- result = [
- {
- "k_major": 8,
- "k_minor": 0,
- "k_point": 12,
- "api": 76,
- "proto": 86,
- "proto2": "91",
- },
- {
- "k_major": 8,
- "k_minor": 2,
- "k_point": 7,
- "api": 88,
- "proto": 0,
- "proto2": "100",
- },
- {
- "k_major": 8,
- "k_minor": 3,
- "k_point": 7,
- "api": 188,
- "proto": 13,
- "proto2": "191",
- }
- ]
- for d,r in zip(data, result):
- info = drbd.DRBD8Info.CreateFromLines(d)
- self.assertEqual(info.GetVersion(), r)
-
-
-class TestDRBD8Runner(testutils.GanetiTestCase):
- """Testing case for drbd.DRBD8"""
-
- @staticmethod
- def _has_disk(data, dname, mname):
- """Check local disk corectness"""
- retval = (
- "local_dev" in data and
- data["local_dev"] == dname and
- "meta_dev" in data and
- data["meta_dev"] == mname and
- "meta_index" in data and
- data["meta_index"] == 0
- )
- return retval
-
- @staticmethod
- def _has_net(data, local, remote):
- """Check network connection parameters"""
- retval = (
- "local_addr" in data and
- data["local_addr"] == local and
- "remote_addr" in data and
- data["remote_addr"] == remote
- )
- return retval
-
- def testParser83Creation(self):
- """Test drbdsetup show parser creation"""
- drbd_info.DRBD83ShowInfo._GetShowParser()
-
- def testParser84Creation(self):
- """Test drbdsetup show parser creation"""
- drbd_info.DRBD84ShowInfo._GetShowParser()
-
- def testParser80(self):
- """Test drbdsetup show parser for disk and network version 8.0"""
- data = testutils.ReadTestData("bdev-drbd-8.0.txt")
- result = drbd_info.DRBD83ShowInfo.GetDevInfo(data)
- self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
- "/dev/xenvg/test.meta"),
- "Wrong local disk info")
- self.failUnless(self._has_net(result, ("192.0.2.1", 11000),
- ("192.0.2.2", 11000)),
- "Wrong network info (8.0.x)")
-
- def testParser83(self):
- """Test drbdsetup show parser for disk and network version 8.3"""
- data = testutils.ReadTestData("bdev-drbd-8.3.txt")
- result = drbd_info.DRBD83ShowInfo.GetDevInfo(data)
- self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
- "/dev/xenvg/test.meta"),
- "Wrong local disk info")
- self.failUnless(self._has_net(result, ("192.0.2.1", 11000),
- ("192.0.2.2", 11000)),
- "Wrong network info (8.3.x)")
-
- def testParser84(self):
- """Test drbdsetup show parser for disk and network version 8.4"""
- data = testutils.ReadTestData("bdev-drbd-8.4.txt")
- result = drbd_info.DRBD84ShowInfo.GetDevInfo(data)
- self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
- "/dev/xenvg/test.meta"),
- "Wrong local disk info")
- self.failUnless(self._has_net(result, ("192.0.2.1", 11000),
- ("192.0.2.2", 11000)),
- "Wrong network info (8.4.x)")
-
- def testParserNetIP4(self):
- """Test drbdsetup show parser for IPv4 network"""
- data = testutils.ReadTestData("bdev-drbd-net-ip4.txt")
- result = drbd_info.DRBD83ShowInfo.GetDevInfo(data)
- self.failUnless(("local_dev" not in result and
- "meta_dev" not in result and
- "meta_index" not in result),
- "Should not find local disk info")
- self.failUnless(self._has_net(result, ("192.0.2.1", 11002),
- ("192.0.2.2", 11002)),
- "Wrong network info (IPv4)")
-
- def testParserNetIP6(self):
- """Test drbdsetup show parser for IPv6 network"""
- data = testutils.ReadTestData("bdev-drbd-net-ip6.txt")
- result = drbd_info.DRBD83ShowInfo.GetDevInfo(data)
- self.failUnless(("local_dev" not in result and
- "meta_dev" not in result and
- "meta_index" not in result),
- "Should not find local disk info")
- self.failUnless(self._has_net(result, ("2001:db8:65::1", 11048),
- ("2001:db8:66::1", 11048)),
- "Wrong network info (IPv6)")
-
- def testParserDisk(self):
- """Test drbdsetup show parser for disk"""
- data = testutils.ReadTestData("bdev-drbd-disk.txt")
- result = drbd_info.DRBD83ShowInfo.GetDevInfo(data)
- self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
- "/dev/xenvg/test.meta"),
- "Wrong local disk info")
- self.failUnless(("local_addr" not in result and
- "remote_addr" not in result),
- "Should not find network info")
-
- def testBarriersOptions(self):
- """Test class method that generates drbdsetup options for disk barriers"""
- # Tests that should fail because of wrong version/options combinations
- should_fail = [
- (8, 0, 12, "bfd", True),
- (8, 0, 12, "fd", False),
- (8, 0, 12, "b", True),
- (8, 2, 7, "bfd", True),
- (8, 2, 7, "b", True)
- ]
-
- for vmaj, vmin, vrel, opts, meta in should_fail:
- self.assertRaises(errors.BlockDeviceError,
- drbd_cmdgen.DRBD83CmdGenerator._ComputeDiskBarrierArgs,
- vmaj, vmin, vrel, opts, meta)
-
- # get the valid options from the frozenset(frozenset()) in constants.
- valid_options = [list(x)[0] for x in constants.DRBD_VALID_BARRIER_OPT]
-
- # Versions that do not support anything
- for vmaj, vmin, vrel in ((8, 0, 0), (8, 0, 11), (8, 2, 6)):
- for opts in valid_options:
- self.assertRaises(
- errors.BlockDeviceError,
- drbd_cmdgen.DRBD83CmdGenerator._ComputeDiskBarrierArgs,
- vmaj, vmin, vrel, opts, True)
-
- # Versions with partial support (testing only options that are supported)
- tests = [
- (8, 0, 12, "n", False, []),
- (8, 0, 12, "n", True, ["--no-md-flushes"]),
- (8, 2, 7, "n", False, []),
- (8, 2, 7, "fd", False, ["--no-disk-flushes", "--no-disk-drain"]),
- (8, 0, 12, "n", True, ["--no-md-flushes"]),
- ]
-
- # Versions that support everything
- for vmaj, vmin, vrel in ((8, 3, 0), (8, 3, 12)):
- tests.append((vmaj, vmin, vrel, "bfd", True,
- ["--no-disk-barrier", "--no-disk-drain",
- "--no-disk-flushes", "--no-md-flushes"]))
- tests.append((vmaj, vmin, vrel, "n", False, []))
- tests.append((vmaj, vmin, vrel, "b", True,
- ["--no-disk-barrier", "--no-md-flushes"]))
- tests.append((vmaj, vmin, vrel, "fd", False,
- ["--no-disk-flushes", "--no-disk-drain"]))
- tests.append((vmaj, vmin, vrel, "n", True, ["--no-md-flushes"]))
-
- # Test execution
- for test in tests:
- vmaj, vmin, vrel, disabled_barriers, disable_meta_flush, expected = test
- args = \
- drbd_cmdgen.DRBD83CmdGenerator._ComputeDiskBarrierArgs(
- vmaj, vmin, vrel,
- disabled_barriers,
- disable_meta_flush)
- self.failUnless(set(args) == set(expected),
- "For test %s, got wrong results %s" % (test, args))
-
- # Unsupported or invalid versions
- for vmaj, vmin, vrel in ((0, 7, 25), (9, 0, 0), (7, 0, 0), (8, 4, 0)):
- self.assertRaises(errors.BlockDeviceError,
- drbd_cmdgen.DRBD83CmdGenerator._ComputeDiskBarrierArgs,
- vmaj, vmin, vrel, "n", True)
-
- # Invalid options
- for option in ("", "c", "whatever", "nbdfc", "nf"):
- self.assertRaises(errors.BlockDeviceError,
- drbd_cmdgen.DRBD83CmdGenerator._ComputeDiskBarrierArgs,
- 8, 3, 11, option, True)
-
-
-class TestDRBD8Status(testutils.GanetiTestCase):
- """Testing case for DRBD8 /proc status"""
-
- def setUp(self):
- """Read in txt data"""
- testutils.GanetiTestCase.setUp(self)
- proc_data = testutils.TestDataFilename("proc_drbd8.txt")
- proc80e_data = testutils.TestDataFilename("proc_drbd80-emptyline.txt")
- proc83_data = testutils.TestDataFilename("proc_drbd83.txt")
- proc83_sync_data = testutils.TestDataFilename("proc_drbd83_sync.txt")
- proc83_sync_krnl_data = \
- testutils.TestDataFilename("proc_drbd83_sync_krnl2.6.39.txt")
- proc84_data = testutils.TestDataFilename("proc_drbd84.txt")
- proc84_sync_data = testutils.TestDataFilename("proc_drbd84_sync.txt")
-
- self.proc80ev_data = \
- testutils.TestDataFilename("proc_drbd80-emptyversion.txt")
-
- self.drbd_info = drbd.DRBD8Info.CreateFromFile(filename=proc_data)
- self.drbd_info80e = drbd.DRBD8Info.CreateFromFile(filename=proc80e_data)
- self.drbd_info83 = drbd.DRBD8Info.CreateFromFile(filename=proc83_data)
- self.drbd_info83_sync = \
- drbd.DRBD8Info.CreateFromFile(filename=proc83_sync_data)
- self.drbd_info83_sync_krnl = \
- drbd.DRBD8Info.CreateFromFile(filename=proc83_sync_krnl_data)
- self.drbd_info84 = drbd.DRBD8Info.CreateFromFile(filename=proc84_data)
- self.drbd_info84_sync = \
- drbd.DRBD8Info.CreateFromFile(filename=proc84_sync_data)
-
- def testIOErrors(self):
- """Test handling of errors while reading the proc file."""
- temp_file = self._CreateTempFile()
- os.unlink(temp_file)
- self.failUnlessRaises(errors.BlockDeviceError,
- drbd.DRBD8Info.CreateFromFile, filename=temp_file)
-
- def testHelper(self):
- """Test reading usermode_helper in /sys."""
- sys_drbd_helper = testutils.TestDataFilename("sys_drbd_usermode_helper.txt")
- drbd_helper = drbd.DRBD8.GetUsermodeHelper(filename=sys_drbd_helper)
- self.failUnlessEqual(drbd_helper, "/bin/true")
-
- def testHelperIOErrors(self):
- """Test handling of errors while reading usermode_helper in /sys."""
- temp_file = self._CreateTempFile()
- os.unlink(temp_file)
- self.failUnlessRaises(errors.BlockDeviceError,
- drbd.DRBD8.GetUsermodeHelper, filename=temp_file)
-
- def testMinorNotFound(self):
- """Test not-found-minor in /proc"""
- self.failUnless(not self.drbd_info.HasMinorStatus(9))
- self.failUnless(not self.drbd_info83.HasMinorStatus(9))
- self.failUnless(not self.drbd_info80e.HasMinorStatus(3))
-
- def testLineNotMatch(self):
- """Test wrong line passed to drbd_info.DRBD8Status"""
- self.assertRaises(errors.BlockDeviceError, drbd_info.DRBD8Status, "foo")
-
- def testMinor0(self):
- """Test connected, primary device"""
- for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
- stats = info.GetMinorStatus(0)
- self.failUnless(stats.is_in_use)
- self.failUnless(stats.is_connected and stats.is_primary and
- stats.peer_secondary and stats.is_disk_uptodate)
-
- def testMinor1(self):
- """Test connected, secondary device"""
- for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
- stats = info.GetMinorStatus(1)
- self.failUnless(stats.is_in_use)
- self.failUnless(stats.is_connected and stats.is_secondary and
- stats.peer_primary and stats.is_disk_uptodate)
-
- def testMinor2(self):
- """Test unconfigured device"""
- for info in [self.drbd_info, self.drbd_info83,
- self.drbd_info80e, self.drbd_info84]:
- stats = info.GetMinorStatus(2)
- self.failIf(stats.is_in_use)
-
- def testMinor4(self):
- """Test WFconn device"""
- for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
- stats = info.GetMinorStatus(4)
- self.failUnless(stats.is_in_use)
- self.failUnless(stats.is_wfconn and stats.is_primary and
- stats.rrole == "Unknown" and
- stats.is_disk_uptodate)
-
- def testMinor6(self):
- """Test diskless device"""
- for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
- stats = info.GetMinorStatus(6)
- self.failUnless(stats.is_in_use)
- self.failUnless(stats.is_connected and stats.is_secondary and
- stats.peer_primary and stats.is_diskless)
-
- def testMinor8(self):
- """Test standalone device"""
- for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
- stats = info.GetMinorStatus(8)
- self.failUnless(stats.is_in_use)
- self.failUnless(stats.is_standalone and
- stats.rrole == "Unknown" and
- stats.is_disk_uptodate)
-
- def testDRBD83SyncFine(self):
- stats = self.drbd_info83_sync.GetMinorStatus(3)
- self.failUnless(stats.is_in_resync)
- self.failUnless(stats.sync_percent is not None)
-
- def testDRBD83SyncBroken(self):
- stats = self.drbd_info83_sync_krnl.GetMinorStatus(3)
- self.failUnless(stats.is_in_resync)
- self.failUnless(stats.sync_percent is not None)
-
- def testDRBD84Sync(self):
- stats = self.drbd_info84_sync.GetMinorStatus(5)
- self.failUnless(stats.is_in_resync)
- self.failUnless(stats.sync_percent is not None)
-
- def testDRBDEmptyVersion(self):
- self.assertRaises(errors.BlockDeviceError,
- drbd.DRBD8Info.CreateFromFile,
- filename=self.proc80ev_data)
-
-
class TestRADOSBlockDevice(testutils.GanetiTestCase):
def setUp(self):
"""Set up input data"""
diff --git a/test/py/ganeti.block.drbd_unittest.py b/test/py/ganeti.block.drbd_unittest.py
new file mode 100755
index 0000000000000000000000000000000000000000..cc30a09c6d14d93dcbaf6d3d5bd69af72eb987ec
--- /dev/null
+++ b/test/py/ganeti.block.drbd_unittest.py
@@ -0,0 +1,379 @@
+#!/usr/bin/python
+#
+
+# Copyright (C) 2006, 2007, 2010, 2012, 2013 Google Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+
+"""Script for unittesting the drbd module"""
+
+
+import os
+
+from ganeti import constants
+from ganeti import errors
+from ganeti.block import drbd
+from ganeti.block import drbd_info
+from ganeti.block import drbd_cmdgen
+
+import testutils
+
+
+class TestDRBD8(testutils.GanetiTestCase):
+ def testGetVersion(self):
+ data = [
+ ["version: 8.0.12 (api:76/proto:86-91)"],
+ ["version: 8.2.7 (api:88/proto:0-100)"],
+ ["version: 8.3.7.49 (api:188/proto:13-191)"],
+ ]
+ result = [
+ {
+ "k_major": 8,
+ "k_minor": 0,
+ "k_point": 12,
+ "api": 76,
+ "proto": 86,
+ "proto2": "91",
+ },
+ {
+ "k_major": 8,
+ "k_minor": 2,
+ "k_point": 7,
+ "api": 88,
+ "proto": 0,
+ "proto2": "100",
+ },
+ {
+ "k_major": 8,
+ "k_minor": 3,
+ "k_point": 7,
+ "api": 188,
+ "proto": 13,
+ "proto2": "191",
+ }
+ ]
+ for d, r in zip(data, result):
+ info = drbd.DRBD8Info.CreateFromLines(d)
+ self.assertEqual(info.GetVersion(), r)
+
+
+class TestDRBD8Runner(testutils.GanetiTestCase):
+ """Testing case for drbd.DRBD8"""
+
+ @staticmethod
+ def _has_disk(data, dname, mname):
+ """Check local disk corectness"""
+ retval = (
+ "local_dev" in data and
+ data["local_dev"] == dname and
+ "meta_dev" in data and
+ data["meta_dev"] == mname and
+ "meta_index" in data and
+ data["meta_index"] == 0
+ )
+ return retval
+
+ @staticmethod
+ def _has_net(data, local, remote):
+ """Check network connection parameters"""
+ retval = (
+ "local_addr" in data and
+ data["local_addr"] == local and
+ "remote_addr" in data and
+ data["remote_addr"] == remote
+ )
+ return retval
+
+ def testParser83Creation(self):
+ """Test drbdsetup show parser creation"""
+ drbd_info.DRBD83ShowInfo._GetShowParser()
+
+ def testParser84Creation(self):
+ """Test drbdsetup show parser creation"""
+ drbd_info.DRBD84ShowInfo._GetShowParser()
+
+ def testParser80(self):
+ """Test drbdsetup show parser for disk and network version 8.0"""
+ data = testutils.ReadTestData("bdev-drbd-8.0.txt")
+ result = drbd_info.DRBD83ShowInfo.GetDevInfo(data)
+ self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
+ "/dev/xenvg/test.meta"),
+ "Wrong local disk info")
+ self.failUnless(self._has_net(result, ("192.0.2.1", 11000),
+ ("192.0.2.2", 11000)),
+ "Wrong network info (8.0.x)")
+
+ def testParser83(self):
+ """Test drbdsetup show parser for disk and network version 8.3"""
+ data = testutils.ReadTestData("bdev-drbd-8.3.txt")
+ result = drbd_info.DRBD83ShowInfo.GetDevInfo(data)
+ self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
+ "/dev/xenvg/test.meta"),
+ "Wrong local disk info")
+ self.failUnless(self._has_net(result, ("192.0.2.1", 11000),
+ ("192.0.2.2", 11000)),
+ "Wrong network info (8.3.x)")
+
+ def testParser84(self):
+ """Test drbdsetup show parser for disk and network version 8.4"""
+ data = testutils.ReadTestData("bdev-drbd-8.4.txt")
+ result = drbd_info.DRBD84ShowInfo.GetDevInfo(data)
+ self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
+ "/dev/xenvg/test.meta"),
+ "Wrong local disk info")
+ self.failUnless(self._has_net(result, ("192.0.2.1", 11000),
+ ("192.0.2.2", 11000)),
+ "Wrong network info (8.4.x)")
+
+ def testParserNetIP4(self):
+ """Test drbdsetup show parser for IPv4 network"""
+ data = testutils.ReadTestData("bdev-drbd-net-ip4.txt")
+ result = drbd_info.DRBD83ShowInfo.GetDevInfo(data)
+ self.failUnless(("local_dev" not in result and
+ "meta_dev" not in result and
+ "meta_index" not in result),
+ "Should not find local disk info")
+ self.failUnless(self._has_net(result, ("192.0.2.1", 11002),
+ ("192.0.2.2", 11002)),
+ "Wrong network info (IPv4)")
+
+ def testParserNetIP6(self):
+ """Test drbdsetup show parser for IPv6 network"""
+ data = testutils.ReadTestData("bdev-drbd-net-ip6.txt")
+ result = drbd_info.DRBD83ShowInfo.GetDevInfo(data)
+ self.failUnless(("local_dev" not in result and
+ "meta_dev" not in result and
+ "meta_index" not in result),
+ "Should not find local disk info")
+ self.failUnless(self._has_net(result, ("2001:db8:65::1", 11048),
+ ("2001:db8:66::1", 11048)),
+ "Wrong network info (IPv6)")
+
+ def testParserDisk(self):
+ """Test drbdsetup show parser for disk"""
+ data = testutils.ReadTestData("bdev-drbd-disk.txt")
+ result = drbd_info.DRBD83ShowInfo.GetDevInfo(data)
+ self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
+ "/dev/xenvg/test.meta"),
+ "Wrong local disk info")
+ self.failUnless(("local_addr" not in result and
+ "remote_addr" not in result),
+ "Should not find network info")
+
+ def testBarriersOptions(self):
+ """Test class method that generates drbdsetup options for disk barriers"""
+ # Tests that should fail because of wrong version/options combinations
+ should_fail = [
+ (8, 0, 12, "bfd", True),
+ (8, 0, 12, "fd", False),
+ (8, 0, 12, "b", True),
+ (8, 2, 7, "bfd", True),
+ (8, 2, 7, "b", True)
+ ]
+
+ for vmaj, vmin, vrel, opts, meta in should_fail:
+ self.assertRaises(errors.BlockDeviceError,
+ drbd_cmdgen.DRBD83CmdGenerator._ComputeDiskBarrierArgs,
+ vmaj, vmin, vrel, opts, meta)
+
+ # get the valid options from the frozenset(frozenset()) in constants.
+ valid_options = [list(x)[0] for x in constants.DRBD_VALID_BARRIER_OPT]
+
+ # Versions that do not support anything
+ for vmaj, vmin, vrel in ((8, 0, 0), (8, 0, 11), (8, 2, 6)):
+ for opts in valid_options:
+ self.assertRaises(
+ errors.BlockDeviceError,
+ drbd_cmdgen.DRBD83CmdGenerator._ComputeDiskBarrierArgs,
+ vmaj, vmin, vrel, opts, True)
+
+ # Versions with partial support (testing only options that are supported)
+ tests = [
+ (8, 0, 12, "n", False, []),
+ (8, 0, 12, "n", True, ["--no-md-flushes"]),
+ (8, 2, 7, "n", False, []),
+ (8, 2, 7, "fd", False, ["--no-disk-flushes", "--no-disk-drain"]),
+ (8, 0, 12, "n", True, ["--no-md-flushes"]),
+ ]
+
+ # Versions that support everything
+ for vmaj, vmin, vrel in ((8, 3, 0), (8, 3, 12)):
+ tests.append((vmaj, vmin, vrel, "bfd", True,
+ ["--no-disk-barrier", "--no-disk-drain",
+ "--no-disk-flushes", "--no-md-flushes"]))
+ tests.append((vmaj, vmin, vrel, "n", False, []))
+ tests.append((vmaj, vmin, vrel, "b", True,
+ ["--no-disk-barrier", "--no-md-flushes"]))
+ tests.append((vmaj, vmin, vrel, "fd", False,
+ ["--no-disk-flushes", "--no-disk-drain"]))
+ tests.append((vmaj, vmin, vrel, "n", True, ["--no-md-flushes"]))
+
+ # Test execution
+ for test in tests:
+ vmaj, vmin, vrel, disabled_barriers, disable_meta_flush, expected = test
+ args = \
+ drbd_cmdgen.DRBD83CmdGenerator._ComputeDiskBarrierArgs(
+ vmaj, vmin, vrel,
+ disabled_barriers,
+ disable_meta_flush)
+ self.failUnless(set(args) == set(expected),
+ "For test %s, got wrong results %s" % (test, args))
+
+ # Unsupported or invalid versions
+ for vmaj, vmin, vrel in ((0, 7, 25), (9, 0, 0), (7, 0, 0), (8, 4, 0)):
+ self.assertRaises(errors.BlockDeviceError,
+ drbd_cmdgen.DRBD83CmdGenerator._ComputeDiskBarrierArgs,
+ vmaj, vmin, vrel, "n", True)
+
+ # Invalid options
+ for option in ("", "c", "whatever", "nbdfc", "nf"):
+ self.assertRaises(errors.BlockDeviceError,
+ drbd_cmdgen.DRBD83CmdGenerator._ComputeDiskBarrierArgs,
+ 8, 3, 11, option, True)
+
+
+class TestDRBD8Status(testutils.GanetiTestCase):
+ """Testing case for DRBD8 /proc status"""
+
+ def setUp(self):
+ """Read in txt data"""
+ testutils.GanetiTestCase.setUp(self)
+ proc_data = testutils.TestDataFilename("proc_drbd8.txt")
+ proc80e_data = testutils.TestDataFilename("proc_drbd80-emptyline.txt")
+ proc83_data = testutils.TestDataFilename("proc_drbd83.txt")
+ proc83_sync_data = testutils.TestDataFilename("proc_drbd83_sync.txt")
+ proc83_sync_krnl_data = \
+ testutils.TestDataFilename("proc_drbd83_sync_krnl2.6.39.txt")
+ proc84_data = testutils.TestDataFilename("proc_drbd84.txt")
+ proc84_sync_data = testutils.TestDataFilename("proc_drbd84_sync.txt")
+
+ self.proc80ev_data = \
+ testutils.TestDataFilename("proc_drbd80-emptyversion.txt")
+
+ self.drbd_info = drbd.DRBD8Info.CreateFromFile(filename=proc_data)
+ self.drbd_info80e = drbd.DRBD8Info.CreateFromFile(filename=proc80e_data)
+ self.drbd_info83 = drbd.DRBD8Info.CreateFromFile(filename=proc83_data)
+ self.drbd_info83_sync = \
+ drbd.DRBD8Info.CreateFromFile(filename=proc83_sync_data)
+ self.drbd_info83_sync_krnl = \
+ drbd.DRBD8Info.CreateFromFile(filename=proc83_sync_krnl_data)
+ self.drbd_info84 = drbd.DRBD8Info.CreateFromFile(filename=proc84_data)
+ self.drbd_info84_sync = \
+ drbd.DRBD8Info.CreateFromFile(filename=proc84_sync_data)
+
+ def testIOErrors(self):
+ """Test handling of errors while reading the proc file."""
+ temp_file = self._CreateTempFile()
+ os.unlink(temp_file)
+ self.failUnlessRaises(errors.BlockDeviceError,
+ drbd.DRBD8Info.CreateFromFile, filename=temp_file)
+
+ def testHelper(self):
+ """Test reading usermode_helper in /sys."""
+ sys_drbd_helper = testutils.TestDataFilename("sys_drbd_usermode_helper.txt")
+ drbd_helper = drbd.DRBD8.GetUsermodeHelper(filename=sys_drbd_helper)
+ self.failUnlessEqual(drbd_helper, "/bin/true")
+
+ def testHelperIOErrors(self):
+ """Test handling of errors while reading usermode_helper in /sys."""
+ temp_file = self._CreateTempFile()
+ os.unlink(temp_file)
+ self.failUnlessRaises(errors.BlockDeviceError,
+ drbd.DRBD8.GetUsermodeHelper, filename=temp_file)
+
+ def testMinorNotFound(self):
+ """Test not-found-minor in /proc"""
+ self.failUnless(not self.drbd_info.HasMinorStatus(9))
+ self.failUnless(not self.drbd_info83.HasMinorStatus(9))
+ self.failUnless(not self.drbd_info80e.HasMinorStatus(3))
+
+ def testLineNotMatch(self):
+ """Test wrong line passed to drbd_info.DRBD8Status"""
+ self.assertRaises(errors.BlockDeviceError, drbd_info.DRBD8Status, "foo")
+
+ def testMinor0(self):
+ """Test connected, primary device"""
+ for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
+ stats = info.GetMinorStatus(0)
+ self.failUnless(stats.is_in_use)
+ self.failUnless(stats.is_connected and stats.is_primary and
+ stats.peer_secondary and stats.is_disk_uptodate)
+
+ def testMinor1(self):
+ """Test connected, secondary device"""
+ for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
+ stats = info.GetMinorStatus(1)
+ self.failUnless(stats.is_in_use)
+ self.failUnless(stats.is_connected and stats.is_secondary and
+ stats.peer_primary and stats.is_disk_uptodate)
+
+ def testMinor2(self):
+ """Test unconfigured device"""
+ for info in [self.drbd_info, self.drbd_info83,
+ self.drbd_info80e, self.drbd_info84]:
+ stats = info.GetMinorStatus(2)
+ self.failIf(stats.is_in_use)
+
+ def testMinor4(self):
+ """Test WFconn device"""
+ for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
+ stats = info.GetMinorStatus(4)
+ self.failUnless(stats.is_in_use)
+ self.failUnless(stats.is_wfconn and stats.is_primary and
+ stats.rrole == "Unknown" and
+ stats.is_disk_uptodate)
+
+ def testMinor6(self):
+ """Test diskless device"""
+ for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
+ stats = info.GetMinorStatus(6)
+ self.failUnless(stats.is_in_use)
+ self.failUnless(stats.is_connected and stats.is_secondary and
+ stats.peer_primary and stats.is_diskless)
+
+ def testMinor8(self):
+ """Test standalone device"""
+ for info in [self.drbd_info, self.drbd_info83, self.drbd_info84]:
+ stats = info.GetMinorStatus(8)
+ self.failUnless(stats.is_in_use)
+ self.failUnless(stats.is_standalone and
+ stats.rrole == "Unknown" and
+ stats.is_disk_uptodate)
+
+ def testDRBD83SyncFine(self):
+ stats = self.drbd_info83_sync.GetMinorStatus(3)
+ self.failUnless(stats.is_in_resync)
+ self.assertAlmostEqual(stats.sync_percent, 34.9)
+
+ def testDRBD83SyncBroken(self):
+ stats = self.drbd_info83_sync_krnl.GetMinorStatus(3)
+ self.failUnless(stats.is_in_resync)
+ self.assertAlmostEqual(stats.sync_percent, 2.4)
+
+ def testDRBD84Sync(self):
+ stats = self.drbd_info84_sync.GetMinorStatus(5)
+ self.failUnless(stats.is_in_resync)
+ self.assertAlmostEqual(stats.sync_percent, 68.5)
+
+ def testDRBDEmptyVersion(self):
+ self.assertRaises(errors.BlockDeviceError,
+ drbd.DRBD8Info.CreateFromFile,
+ filename=self.proc80ev_data)
+
+
+if __name__ == "__main__":
+ testutils.GanetiTestProgram()