From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Fri, 7 Dec 2012 19:01:03 +0000 (+0100)
Subject: Bug fixing PlanetLab dependency
X-Git-Tag: nepi-3.0.0~137
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a18aaba21c2a78942b5427d20dee9fe517f055a2;p=nepi.git

Bug fixing PlanetLab dependency
---

diff --git a/examples/planetlab_fix_gpgkeys.py b/examples/planetlab_fix_gpgkeys.py
index efb45716..5bb2bf03 100644
--- a/examples/planetlab_fix_gpgkeys.py
+++ b/examples/planetlab_fix_gpgkeys.py
@@ -72,15 +72,17 @@ controller = ExperimentController(xml, root_dir)
 controller.start()
 
 stop = False
+
 while not stop:
+    time.sleep(0.5)
+
     stop = True
     for pl_app in set(apps):
         if not controller.is_finished(pl_app.guid):
-            apps.remove(pl_app)
             stop = False
             break
-
-    time.sleep(0.5)
+        else:
+            apps.remove(pl_app)
 
 controller.stop()
 controller.shutdown()
diff --git a/examples/planetlab_package_install.py b/examples/planetlab_package_install.py
index 73115772..650a5df7 100644
--- a/examples/planetlab_package_install.py
+++ b/examples/planetlab_package_install.py
@@ -74,9 +74,10 @@ while not stop:
     stop = True
     for pl_dep in set(deps):
         if not controller.is_finished(pl_dep.guid):
-            deps.remove(pl_dep)
             stop = False
             break
+        else:
+            deps.remove(pl_dep)
 
     time.sleep(0.5)
 
diff --git a/src/nepi/testbeds/planetlab/metadata.py b/src/nepi/testbeds/planetlab/metadata.py
index c6f79ba0..aae7a84f 100644
--- a/src/nepi/testbeds/planetlab/metadata.py
+++ b/src/nepi/testbeds/planetlab/metadata.py
@@ -446,8 +446,8 @@ def status_dependency(testbed_instance, guid):
     
     dep = testbed_instance.elements[guid]
     if dep.deployed():
-        return AS.STATUS_RUNNING
-    return AS.STATUS_FINISHED
+        return AS.STATUS_FINISHED
+    return AS.STATUS_RUNNING
 
 ### Configure functions ###