Fix RPC result handling in _AssembleInstanceDisks
authorIustin Pop <iustin@google.com>
Thu, 12 Feb 2009 07:34:21 +0000 (07:34 +0000)
committerIustin Pop <iustin@google.com>
Thu, 12 Feb 2009 07:34:21 +0000 (07:34 +0000)
For (status, data)-style RPC calls, the result data is in the ‘payload’
attribute. This was missed in the conversion patch, with the only side
effect that gnt-instance activate-disks didn't show a nice output
anymore.

Reviewed-by: ultrotter

lib/cmdlib.py

index a06decb..13480c6 100644 (file)
@@ -2526,7 +2526,8 @@ def _AssembleInstanceDisks(lu, instance, ignore_secondaries=False):
                            " (is_primary=True, pass=2): %s",
                            inst_disk.iv_name, node, msg)
         disks_ok = False
-    device_info.append((instance.primary_node, inst_disk.iv_name, result.data))
+    device_info.append((instance.primary_node, inst_disk.iv_name,
+                        result.payload))
 
   # leave the disks configured for the primary node
   # this is a workaround that would be fixed better by