From 38396ae2ac991135062796352027febbf912dd88 Mon Sep 17 00:00:00 2001
From: Thomas Thrainer <thomasth@google.com>
Date: Wed, 24 Apr 2013 16:59:04 +0200
Subject: [PATCH] Rename _MassageProcData to _JoinProcDataPerMinor
That's what the method actually does, so there is no reason why we
should use a funny but unreadable name.
Signed-off-by: Thomas Thrainer <thomasth@google.com>
Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>
---
lib/block/drbd.py | 6 +++---
test/py/ganeti.block.bdev_unittest.py | 11 ++++++-----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/lib/block/drbd.py b/lib/block/drbd.py
index 70d5f0c8c..d47675b3e 100644
--- a/lib/block/drbd.py
+++ b/lib/block/drbd.py
@@ -81,7 +81,7 @@ class BaseDRBD(base.BlockDev): # pylint: disable=W0223
return data
@classmethod
- def _MassageProcData(cls, data):
+ def _JoinProcDataPerMinor(cls, data):
"""Transform the output of _GetProdData into a nicer form.
@return: a dictionary of minor: joined lines from /proc/drbd
@@ -944,7 +944,7 @@ class DRBD8(BaseDRBD):
if self.minor is None:
base.ThrowError("drbd%d: GetStats() called while not attached",
self._aminor)
- proc_info = self._MassageProcData(self._GetProcData())
+ proc_info = self._JoinProcDataPerMinor(self._GetProcData())
if self.minor not in proc_info:
base.ThrowError("drbd%d: can't find myself in /proc", self.minor)
return DRBD8Status(proc_info[self.minor])
@@ -1319,7 +1319,7 @@ class DRBD8(BaseDRBD):
" exclusive_storage")
# check that the minor is unused
aminor = unique_id[4]
- proc_info = cls._MassageProcData(cls._GetProcData())
+ proc_info = cls._JoinProcDataPerMinor(cls._GetProcData())
if aminor in proc_info:
status = DRBD8Status(proc_info[aminor])
in_use = status.is_in_use
diff --git a/test/py/ganeti.block.bdev_unittest.py b/test/py/ganeti.block.bdev_unittest.py
index bc3326922..f95115796 100755
--- a/test/py/ganeti.block.bdev_unittest.py
+++ b/test/py/ganeti.block.bdev_unittest.py
@@ -250,12 +250,13 @@ class TestDRBD8Status(testutils.GanetiTestCase):
self.proc83_sync_data = drbd.DRBD8._GetProcData(filename=proc83_sync_data)
self.proc83_sync_krnl_data = \
drbd.DRBD8._GetProcData(filename=proc83_sync_krnl_data)
- self.mass_data = drbd.DRBD8._MassageProcData(self.proc_data)
- self.mass80e_data = drbd.DRBD8._MassageProcData(self.proc80e_data)
- self.mass83_data = drbd.DRBD8._MassageProcData(self.proc83_data)
- self.mass83_sync_data = drbd.DRBD8._MassageProcData(self.proc83_sync_data)
+ self.mass_data = drbd.DRBD8._JoinProcDataPerMinor(self.proc_data)
+ self.mass80e_data = drbd.DRBD8._JoinProcDataPerMinor(self.proc80e_data)
+ self.mass83_data = drbd.DRBD8._JoinProcDataPerMinor(self.proc83_data)
+ self.mass83_sync_data = \
+ drbd.DRBD8._JoinProcDataPerMinor(self.proc83_sync_data)
self.mass83_sync_krnl_data = \
- drbd.DRBD8._MassageProcData(self.proc83_sync_krnl_data)
+ drbd.DRBD8._JoinProcDataPerMinor(self.proc83_sync_krnl_data)
def testIOErrors(self):
"""Test handling of errors while reading the proc file."""
--
GitLab