From 073ca59e36b526a69cfed536315834e81651f574 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 1 Nov 2007 21:40:21 +0000
Subject: [PATCH] Fix printing of unconfigured DRBD devices
If the device is unconfigured (not yet did SetDiskID for it ever), it
might have a physical_id of None. This patch fixes that case.
Reviewed-by: ultrotter
---
lib/objects.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/objects.py b/lib/objects.py
index 54274185a..8f3bbf20a 100644
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -423,10 +423,16 @@ class Disk(ConfigObject):
val = "<DRBD7("
else:
val = "<DRBD8("
- val += ("hosts=%s-%s, port=%s, configured as %s:%s %s:%s, " %
- (self.logical_id[0], self.logical_id[1], self.logical_id[2],
+ if self.physical_id is None:
+ phy = "unconfigured"
+ else:
+ phy = ("configured as %s:%s %s:%s" %
self.physical_id[0], self.physical_id[1],
- self.physical_id[2], self.physical_id[3]))
+ 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))
if self.children and self.children.count(None) == 0:
val += "backend=%s, metadev=%s" % (self.children[0], self.children[1])
else:
--
GitLab