use slice_sfa_mapper on sfa operations

[tests.git] / system / TestResources.py

diff --git a/system/TestResources.py b/system/TestResources.py
index 663977d..7b14544 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
 
@@ -50,8 +49,7 @@ class TestResources:
         node_map = []
         qemu_pool = TestPoolQemu (self.qemus_ip_pool(), options)
 
-        for index in range(options.size):
-            index += 1
+        for index in range(1,options.size+1):
             if options.ips_qemu:
                 ip_or_hostname=options.ips_qemu.pop()
                 (hostname,ip,unused)=qemu_pool.locate_entry(ip_or_hostname)
@@ -126,13 +124,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