Removed version number from testbed file names. Only 1 version permitted at the time.

[nepi.git] / test / testbeds / planetlab / execute.py

diff --git a/test/testbeds/planetlab/execute.py b/test/testbeds/planetlab/execute.py
index ecff9e6..07f1512 100755 (executable)
--- a/test/testbeds/planetlab/execute.py
+++ b/test/testbeds/planetlab/execute.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import getpass
-from nepi.util.constants import STATUS_FINISHED
+from nepi.util.constants import ApplicationStatus as AS
 from nepi.testbeds import planetlab
 import os
 import shutil
@@ -15,7 +15,6 @@ import sys
 
 class PlanetLabExecuteTestCase(unittest.TestCase):
     testbed_id = "planetlab"
-    testbed_version = "01"
     slicename = "inria_nepi"
     plchost = "nepiplc.pl.sophia.inria.fr"
     
@@ -35,11 +34,10 @@ class PlanetLabExecuteTestCase(unittest.TestCase):
 
     def make_instance(self):
         testbed_id = self.testbed_id
-        testbed_version = self.testbed_version
         slicename = self.slicename
         plchost = self.plchost
         
-        instance = planetlab.TestbedController(testbed_version)
+        instance = planetlab.TestbedController()
         pl_ssh_key = os.environ.get(
             "PL_SSH_KEY",
             "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'],) )
@@ -99,7 +97,7 @@ class PlanetLabExecuteTestCase(unittest.TestCase):
             
             instance.do_prestart()
             instance.start()
-            while instance.status(7) != STATUS_FINISHED:
+            while instance.status(7) != AS.STATUS_FINISHED:
                 time.sleep(0.5)
             ping_result = instance.trace(7, "stdout") or ""
             instance.stop()
@@ -137,7 +135,7 @@ class PlanetLabExecuteTestCase(unittest.TestCase):
             
             instance.do_prestart()
             instance.start()
-            while instance.status(5) != STATUS_FINISHED:
+            while instance.status(5) != AS.STATUS_FINISHED:
                 time.sleep(0.5)
             ping_result = instance.trace(5, "stdout") or ""
             comp_result = r".*GNU Fortran \(GCC\).*"
@@ -195,7 +193,7 @@ FIONREAD = 0x[0-9a-fA-F]{8}.*
             
             instance.do_prestart()
             instance.start()
-            while instance.status(10) != STATUS_FINISHED:
+            while instance.status(10) != AS.STATUS_FINISHED:
                 time.sleep(0.5)
             ping_result = instance.trace(10, "stdout") or ""
             instance.stop()
@@ -244,7 +242,7 @@ echo 'OKIDOKI'
             
             instance.do_prestart()
             instance.start()
-            while instance.status(6) != STATUS_FINISHED:
+            while instance.status(6) != AS.STATUS_FINISHED:
                 time.sleep(0.5)
             test_result = (instance.trace(6, "stdout") or "").strip()
             comp_result = "OKIDOKI"
@@ -293,7 +291,7 @@ echo 'OKIDOKI'
             
             instance.do_prestart()
             instance.start()
-            while instance.status(8) != STATUS_FINISHED:
+            while instance.status(8) != AS.STATUS_FINISHED:
                 time.sleep(0.5)
             test_result = (instance.trace(8, "stderr") or "").strip()
             comp_result = r".*real\s*(?P<min>[0-9]+)m(?P<sec>[0-9]+[.][0-9]+)s.*"
@@ -399,7 +397,7 @@ echo 'OKIDOKI'
             
             instance.do_prestart()
             instance.start()
-            while instance.status(9) != STATUS_FINISHED:
+            while instance.status(9) != AS.STATUS_FINISHED:
                 time.sleep(0.5)
             ping_result = instance.trace(9, "stdout") or ""
             packets1 = instance.trace(7, "packets") or ""
@@ -458,7 +456,7 @@ echo 'OKIDOKI'
             
             instance.do_prestart()
             instance.start()
-            while instance.status(12) != STATUS_FINISHED:
+            while instance.status(12) != AS.STATUS_FINISHED:
                 time.sleep(0.5)
             ping_result = (instance.trace(12, "stderr") or "").strip()
             instance.stop()
@@ -500,7 +498,7 @@ echo 'OKIDOKI'
             
             instance.do_prestart()
             instance.start()
-            while instance.status(12) != STATUS_FINISHED:
+            while instance.status(12) != AS.STATUS_FINISHED:
                 time.sleep(0.5)
             ping_result = (instance.trace(12, "stderr") or "").strip()
             instance.stop()
@@ -555,7 +553,7 @@ echo 'OKIDOKI'
             
             instance.do_prestart()
             instance.start()
-            while instance.status(7) != STATUS_FINISHED:
+            while instance.status(7) != AS.STATUS_FINISHED:
                 time.sleep(0.5)
             ping_result = instance.trace(7, "stdout") or ""
             instance.stop()