Commit f500d80b authored by Iustin Pop's avatar Iustin Pop
Browse files

Fix tools/move-instance after networks addition

Commits d4117a72 (“Modify LUInstanceCreate to support networks”) and
09a3d21f

 (“Pass detailed network info in hooks“) expanded the nic
information as computed by _NICToTuple, which means that the format of
the result value from LUInstanceQueryData has changed, and
move-instance has not been changed to deal with this.

A proper fix needs to support correctly importing from old clusters,
right now this is a temporary fix to ensure QA still passes.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parent 8df21834
......@@ -496,7 +496,8 @@ class MoveDestExecutor(object):
constants.INIC_MAC: mac,
constants.INIC_MODE: mode,
constants.INIC_LINK: link,
} for ip, mac, mode, link in instance["nics"]]
constants.INIC_NETWORK: network
} for ip, mac, mode, link, network, _ in instance["nics"]]
if len(override_nics) > len(nics):
raise Error("Can not create new NICs")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment