From c95ac77734b2a1dbc477fa95d17abc683038b2e0 Mon Sep 17 00:00:00 2001
From: Apollon Oikonomopoulos <apollon@noc.grnet.gr>
Date: Thu, 26 May 2011 14:51:12 +0300
Subject: [PATCH] ConfigWriter.ReleaseIp: change semantics
Change the semantics of ReleaseIp, so that it can be called from outside
without knowing the exact network UUID, by passing only node and link.
Signed-off-by: Apollon Oikonomopoulos <apollon@noc.grnet.gr>
---
lib/config.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/config.py b/lib/config.py
index 16330e20f..a1eb2dbb4 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -297,12 +297,15 @@ class ConfigWriter:
pool.Release(address)
@locking.ssynchronized(_config_lock)
- def ReleaseIp(self, net_uuid, address):
+ def ReleaseIp(self, node_name, link, address):
"""Give a specified IP address back to an IP pool.
This is just a wrapper around _UnlockedReleaseIp.
"""
+ net_uuid = self._UnlockedGetNetworkFromNodeLink(node_name, link)
+ if not net_uuid:
+ return
self._UnlockedReleaseIp(net_uuid, address)
self._WriteConfig()
--
GitLab