X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fplanetlab%2Fplcapi.py;h=6adfdc9133e5446f57838e977979c69a02f2ad08;hb=c98a137a49a4bffd571b24f4c08d89e90def5771;hp=4f4bf5cd519efdbbe914094c5d6a297a04a12095;hpb=2e80f0fafa0c2ef6a5f536efd4c868c91468f962;p=nepi.git

diff --git a/src/nepi/resources/planetlab/plcapi.py b/src/nepi/resources/planetlab/plcapi.py
index 4f4bf5cd..6adfdc91 100644
--- a/src/nepi/resources/planetlab/plcapi.py
+++ b/src/nepi/resources/planetlab/plcapi.py
@@ -177,7 +177,7 @@ class PLCAPI(object):
         self.threadlocal = threading.local()
 
         # Load blacklist from file
-        if self._ecobj.get_global('PlanetlabNode', 'persist_blacklist'):
+        if self._ecobj.get_global('planetlab::Node', 'persist_blacklist'):
             self._set_blacklist()
 
     @property
@@ -493,19 +493,24 @@ class PLCAPI(object):
 
     def release(self):
         self.count -= 1
-        if self._ecobj.get_global('PlanetlabNode', 'persist_blacklist') and self.count == 0:
-            if self._blacklist:
-                to_blacklist = list()
-                hostnames = self.get_nodes(list(self._blacklist), ['hostname'])
-                for hostname in hostnames:
-                    to_blacklist.append(hostname['hostname'])
-
-                nepi_home = os.path.join(os.path.expanduser("~"), ".nepi")
-                plblacklist_file = os.path.join(nepi_home, "plblacklist.txt")
-
-                with open(plblacklist_file, 'w') as f:
-                    for host in to_blacklist:
-                        f.write("%s\n" % host)
+        if self.count == 0:
+            blacklist = self._blacklist
+            self._blacklist = set()
+            self._reserved = set()
+            if self._ecobj.get_global('PlanetlabNode', 'persist_blacklist'):
+                if blacklist:
+                    to_blacklist = list()
+                    hostnames = self.get_nodes(list(blacklist), ['hostname'])
+                    for hostname in hostnames:
+                        to_blacklist.append(hostname['hostname'])
+    
+                    nepi_home = os.path.join(os.path.expanduser("~"), ".nepi")
+                    plblacklist_file = os.path.join(nepi_home, "plblacklist.txt")
+    
+                    with open(plblacklist_file, 'w') as f:
+                        for host in to_blacklist:
+                            f.write("%s\n" % host)
+    
 
 class PLCAPIFactory(object):
     """