New version of pylint, new bugs found!
---
lib/cmdlib.py | 3 ++-
lib/hypervisor/hv_fake.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index ed87967..8c0ec5f 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5218,7 +5218,8 @@ class LUReplaceDisks(LogicalUnit):
if len(ial.nodes) != ial.required_nodes:
raise errors.OpPrereqError("iallocator '%s' returned invalid number"
" of nodes (%s), required %s" %
- (len(ial.nodes), ial.required_nodes))
+ (self.op.iallocator,
+ len(ial.nodes), ial.required_nodes))
self.op.remote_node = ial.nodes[0]
self.LogInfo("Selected new secondary for the instance: %s",
self.op.remote_node)
diff --git a/lib/hypervisor/hv_fake.py b/lib/hypervisor/hv_fake.py
index 73ed60e..4454336 100644
--- a/lib/hypervisor/hv_fake.py
+++ b/lib/hypervisor/hv_fake.py
@@ -68,7 +68,7 @@ class FakeHypervisor(hv_base.BaseHypervisor):
try:
inst_id = fh.readline().strip()
memory = utils.TryConvert(int, fh.readline().strip())
- vcpus = utils.TryConvert(fh.readline().strip())
+ vcpus = utils.TryConvert(int, fh.readline().strip())
stat = "---b-"
times = "0"
return (instance_name, inst_id, memory, vcpus, stat, times)
--
1.6.5.7
