reviewed list options parsing

[tests.git] / system / TestResources.py

diff --git a/system/TestResources.py b/system/TestResources.py
index 40364e4..bc928ac 100644 (file)
--- a/system/TestResources.py
+++ b/system/TestResources.py
@@ -1,7 +1,6 @@
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
 #
-# $Id$
-#
-
 import sys
 import traceback
 
@@ -126,13 +125,21 @@ class TestResources:
     
             ### rewrite fields in plc
             # compute a helpful vserver name - remove domain in hostname
-            simplehostname=hostname.split('.')[0]
+            simplehostname = hostname.split('.')[0]
+            preferred_hostname = self.preferred_hostname()
             vservername = options.buildname
             if len(plcs) == 1 :
                 vservername = "%s-%s" % (vservername,simplehostname)
+                #ugly hack for "vuname: vc_set_vhi_name(): Arg list too long" errors
+                if len(vservername) > 38 and preferred_hostname is not None:
+                    vservername = "%s-%s" % (options.buildname,preferred_hostname)
             else:
                 plc_counter += 1
                 vservername = "%s-%d-%s" % (vservername,plc_counter,simplehostname)
+                #ugly hack for "vuname: vc_set_vhi_name(): Arg list too long" errors
+                if len(vservername) > 38 and preferred_hostname is not None:
+                    vservername = "%s-%d-%s" % (options.buildname,plc_counter,preferred_hostname)
+
             # apply
             plc['vservername']=vservername
             plc['vserverip']=ip
@@ -146,71 +153,77 @@ class TestResources:
 
     # as a plc step this should return a boolean
     def step_pre (self,plc):
-        return self.trqemu_record (plc) and self.trqemu_free(plc) \
-           and self.trplc_record (plc) and self.trplc_free(plc)
+        return self.trqemu_record (plc) and self.trqemu_make_space(plc) \
+           and self.trplc_record (plc) and self.trplc_make_space(plc)
 
     def step_post (self,plc):
         return True
 
-    def step_cleanup (self,plc):
-        return self.trqemu_cleanup(plc) and self.trplc_cleanup(plc)
+    def step_release (self,plc):
+        return self.trqemu_release(plc) and self.trplc_release(plc)
+
+    def step_release_plc (self,plc):
+        return self.trplc_release(plc) 
+
+    def step_release_qemu (self,plc):
+        return self.trqemu_release(plc) 
 
     def step_list (self,plc):
         return self.trqemu_list(plc) and self.trplc_list(plc)
 
     ####################
-    def trqemu_record (self,plc):
-        tracker=TrackerQemu(plc.options,instances=self.max_qemus()-1)
-        for site_spec in plc.plc_spec['sites']:
-            for node_spec in site_spec['nodes']:
-                tracker.record(node_spec['host_box'],plc.options.buildname,node_spec['node_fields']['hostname'])
+    def trplc_record (self,plc):
+        tracker = TrackerPlc(plc.options,instances=self.max_plcs())
+        tracker.record(plc.test_ssh.hostname,plc.vservername)
         tracker.store()
         return True
 
-    def trqemu_free (self,plc):
-        tracker=TrackerQemu(plc.options,instances=self.max_qemus()-1)
-        for site_spec in plc.plc_spec['sites']:
-            for node_spec in site_spec['nodes']:
-                tracker.free()
+    def trplc_release (self,plc):
+        tracker = TrackerPlc(plc.options,instances=self.max_plcs())
+        tracker.release(plc.test_ssh.hostname,plc.vservername)
         tracker.store()
         return True
 
-    ###
-    def trplc_record (self,plc):
+    def trplc_make_space (self,plc):
         tracker = TrackerPlc(plc.options,instances=self.max_plcs())
-        tracker.record(plc.test_ssh.hostname,plc.vservername)
+        tracker.make_space()
         tracker.store()
         return True
 
-    def trplc_free (self,plc):
-        tracker = TrackerPlc(plc.options,instances=self.max_plcs())
-        tracker.free()
-        tracker.store()
+    def trplc_list (self,plc):
+        TrackerPlc(plc.options,instances=self.max_plcs()).list()
         return True
 
     ###
-    def trqemu_cleanup (self,plc):
+    def trqemu_record (self,plc):
         tracker=TrackerQemu(plc.options,instances=self.max_qemus()-1)
         for site_spec in plc.plc_spec['sites']:
             for node_spec in site_spec['nodes']:
-                tracker.cleanup()
+                tracker.record(node_spec['host_box'],plc.options.buildname,node_spec['node_fields']['hostname'])
         tracker.store()
         return True
 
-    def trplc_cleanup (self,plc):
-        tracker = TrackerPlc(plc.options,instances=self.max_plcs())
-        tracker.cleanup()
+    def trqemu_release (self,plc):
+        tracker=TrackerQemu(plc.options,instances=self.max_qemus()-1)
+        for site_spec in plc.plc_spec['sites']:
+            for node_spec in site_spec['nodes']:
+                tracker.release(node_spec['host_box'],plc.options.buildname,node_spec['node_fields']['hostname'])
         tracker.store()
         return True
 
-    def trqemu_list (self,plc):
-        TrackerQemu(plc.options,instances=self.max_qemus()-1).list()
+    def trqemu_make_space (self,plc):
+        tracker=TrackerQemu(plc.options,instances=self.max_qemus()-1)
+        for site_spec in plc.plc_spec['sites']:
+            for node_spec in site_spec['nodes']:
+                tracker.make_space()
+        tracker.store()
         return True
 
-    def trplc_list (self,plc):
-        TrackerPlc(plc.options,instances=self.max_plcs()).list()
+    def trqemu_list (self,plc):
+        TrackerQemu(plc.options,instances=self.max_qemus()-1).list()
         return True
 
+    ###
     def localize_rspec (self,plcs,options):
        
        utils.header ("Localize SFA Slice RSpec")