From c396af8374ed4c43288520ce1b05f41093616fb8 Mon Sep 17 00:00:00 2001
From: Christos Stavrakakis <cstavr@grnet.gr>
Date: Fri, 12 Apr 2013 12:40:25 +0300
Subject: [PATCH] Preserve device names during instance move
Fix 'move-instance' tool to preserve the instance disk and NIC names
when moving instances from one cluster to another. Also, fix value error
since an instance NIC is an 8-tuple, containing also name and UUID.
Signed-off-by: Christos Stavrakakis <cstavr@grnet.gr>
Reviewed-by: Helga Velroyen <helgav@google.com>
---
tools/move-instance | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/move-instance b/tools/move-instance
index 24bb49612..6e340b8a2 100755
--- a/tools/move-instance
+++ b/tools/move-instance
@@ -489,6 +489,7 @@ class MoveDestExecutor(object):
disks = [{
constants.IDISK_SIZE: i["size"],
constants.IDISK_MODE: i["mode"],
+ constants.IDISK_NAME: str(i.get("name")),
} for i in instance["disks"]]
nics = [{
@@ -496,8 +497,9 @@ class MoveDestExecutor(object):
constants.INIC_MAC: mac,
constants.INIC_MODE: mode,
constants.INIC_LINK: link,
- constants.INIC_NETWORK: network
- } for ip, mac, mode, link, network, _ in instance["nics"]]
+ constants.INIC_NETWORK: network,
+ constants.INIC_NAME: nic_name
+ } for nic_name, _, ip, mac, mode, link, network, _ in instance["nics"]]
if len(override_nics) > len(nics):
raise Error("Can not create new NICs")
--
GitLab