The '.get' method of dicionaries takes the default value as positional argument and not as key word argument. Fixing this as it was accidentally added in my last patches.
Signed-off-by: Helga Velroyen <[email protected]> --- tools/move-instance | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/move-instance b/tools/move-instance index d40ca01..c914dec 100755 --- a/tools/move-instance +++ b/tools/move-instance @@ -637,7 +637,7 @@ class MoveDestExecutor(object): disks = MoveDestExecutor._GetDisks(instance) nics = MoveDestExecutor._GetNics(instance, override_nics) - os_type = instance.get("os", default=None) + os_type = instance.get("os", None) # TODO: Should this be the actual up/down status? (run_state) start = (instance["config_state"] == "up") @@ -645,9 +645,9 @@ class MoveDestExecutor(object): assert len(disks) == len(instance["disks"]) assert len(nics) == len(instance["nics"]) - inst_beparams = instance.get("be_instance", default={}) - inst_hvparams = instance.get("hv_instance", default={}) - inst_osparams = instance.get("os_instance", default={}) + inst_beparams = instance.get("be_instance", {}) + inst_hvparams = instance.get("hv_instance", {}) + inst_osparams = instance.get("os_instance", {}) return cl.CreateInstance(constants.INSTANCE_REMOTE_IMPORT, name, disk_template, disks, nics, -- 1.9.1.423.g4596e3a
