introduce a workaround for 'vuname: vc_set_vhi_name(): Arg list too long' errors

diff --git a/system/LocalTestResources.sample.inria b/system/LocalTestResources.sample.inria
index a20f94f..96589e7 100644 (file)
--- a/system/LocalTestResources.sample.inria
+++ b/system/LocalTestResources.sample.inria
@@ -54,4 +54,6 @@ class OnelabTestResources (TestResources):
     def max_plcs (self):
         return len(self.plcs_ip_pool())-2
 
+    def preferred_hostname (self):
+        return None
 local_resources = OnelabTestResources ()

diff --git a/system/LocalTestResources.sample.princeton b/system/LocalTestResources.sample.princeton
index cbd08f5..2367ca3 100644 (file)
--- a/system/LocalTestResources.sample.princeton
+++ b/system/LocalTestResources.sample.princeton
@@ -8,7 +8,7 @@
 
 from TestResources import TestResources
 
-class OnelabTestResources (TestResources):
+class PlanetlabTestResources (TestResources):
     
     # we use only one for now but who knows
     def plc_boxes (self):
@@ -35,15 +35,17 @@ class OnelabTestResources (TestResources):
         return 1
 
     def plcs_ip_pool (self):
-        return [ ("plc-01.test.planet-lab.org","128.112.139.34", "de:ad:be:ef:ff:01"),
-                 ("plc-02.test.planet-lab.org","128.112.139.35", "de:ad:be:ef:ff:02"),
-                 ("plc-03.test.planet-lab.org","128.112.139.36", "de:ad:be:ef:ff:03"),
-                 ("plc-04.test.planet-lab.org","128.112.139.37", "de:ad:be:ef:ff:04"),
-                 ("plc-05.test.planet-lab.org","128.112.139.41", "de:ad:be:ef:ff:05"),
+        return [ ("pl-service-08.CS.Princeton.EDU","128.112.139.34", "de:ad:be:ef:ff:01"),
+                 ("pl-service-09.CS.Princeton.EDU","128.112.139.35", "de:ad:be:ef:ff:02"),
+                 ("pl-service-10.CS.Princeton.EDU","128.112.139.36", "de:ad:be:ef:ff:03"),
+                 ("pl-service-11.CS.Princeton.EDU","128.112.139.37", "de:ad:be:ef:ff:04"),
+                 ("pl-service-12.CS.Princeton.EDU","128.112.139.41", "de:ad:be:ef:ff:05"),
                  ]
 
     def max_plcs (self):
         return 4
 
+    def preferred_hostname (self):
+        return "plc"
 
-local_resources = OnelabTestResources ()
+local_resources = PlanetlabTestResources ()

diff --git a/system/TestResources.py b/system/TestResources.py
index 663977d..5d3e1a9 100644 (file)
--- a/system/TestResources.py
+++ b/system/TestResources.py
@@ -126,13 +126,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" % (vservername,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" % (vservername,plc_counter,preferred_hostname)
+
             # apply
             plc['vservername']=vservername
             plc['vserverip']=ip