Pylint cleanup

The previous commits introduced some pylint errors.

Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 9e7dc61..88c0a72 100644 (file)
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -287,10 +287,11 @@ def BatchCreate(opts, args):
 
     if unknown:
       # TODO: Suggest closest match for more user friendly experience
-      raise errors.OpPrereqError("Unknown fields: %s" %
-                                 utils.CommaJoin(unknown), errors.ECODE_INVAL)
+      raise errors.OpPrereqError("Unknown fields in definition %s: %s" %
+                                 (idx, utils.CommaJoin(unknown)),
+                                 errors.ECODE_INVAL)
 
-    op = opcodes.OpInstanceCreate(**inst)
+    op = opcodes.OpInstanceCreate(**inst) # pylint: disable=W0142
     op.Validate(False)
     instances.append(op)
 

diff --git a/lib/opcodes.py b/lib/opcodes.py
index b35cc78..dba9fd5 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1265,7 +1265,7 @@ class OpInstanceMultiAlloc(OpCode):
     """
     OpCode.Validate(self, set_defaults)
 
-    for inst in self.instances:
+    for inst in self.instances: # pylint: disable=E1101
       inst.Validate(set_defaults)