From 89f28b76dda1c56334d0b1f6d3ef9c2054ea8dc3 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 21 Jan 2009 08:33:01 +0000
Subject: [PATCH] Update the objects.Disk formatting method
With the addition of minors, this needs to show them too.
Reviewed-by: ultrotter
---
lib/objects.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/objects.py b/lib/objects.py
index 1fc2db3b8..2efc59eb3 100644
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -472,6 +472,7 @@ class Disk(ConfigObject):
if self.dev_type == constants.LD_LV:
val = "<LogicalVolume(/dev/%s/%s" % self.logical_id
elif self.dev_type in constants.LDS_DRBD:
+ node_a, node_b, port, minor_a, minor_b = self.logical_id[:5]
val = "<DRBD8("
if self.physical_id is None:
phy = "unconfigured"
@@ -480,9 +481,8 @@ class Disk(ConfigObject):
(self.physical_id[0], self.physical_id[1],
self.physical_id[2], self.physical_id[3]))
- val += ("hosts=%s-%s, port=%s, %s, " %
- (self.logical_id[0], self.logical_id[1], self.logical_id[2],
- phy))
+ val += ("hosts=%s/%d-%s/%d, port=%s, %s, " %
+ (node_a, minor_a, node_b, minor_b, port, phy))
if self.children and self.children.count(None) == 0:
val += "backend=%s, metadev=%s" % (self.children[0], self.children[1])
else:
--
GitLab