From 6609f4556f465212c690478e7a4f9c8a8ecd77e3 Mon Sep 17 00:00:00 2001
From: Apollon Oikonomopoulos <apollon@noc.grnet.gr>
Date: Thu, 26 May 2011 14:52:03 +0300
Subject: [PATCH] RemoveInstance: handle IP default NIC link
Call cluster.SimpleFillNIC to get the default link when link is None.
Signed-off-by: Apollon Oikonomopoulos <apollon@noc.grnet.gr>
---
lib/config.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/config.py b/lib/config.py
index a1eb2dbb4..236f4c57d 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -1312,7 +1312,8 @@ class ConfigWriter:
instance = self._UnlockedGetInstanceInfo(instance_name)
for nic in instance.nics:
- link = nic.nicparams.get(constants.NIC_LINK, None)
+ nicparams = self._config_data.cluster.SimpleFillNIC(nic.nicparams)
+ link = nicparams[constants.NIC_LINK]
net_uuid = self._UnlockedGetNetworkFromNodeLink(instance.primary_node,
link)
if net_uuid:
--
GitLab