From 18324ac9bc5911c92acbb136118d0c6f06b95f0f Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 18 Jan 2008 09:41:01 +0000 Subject: [PATCH] use a more helpful vserver name --- system/config_onelab_vserver.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/system/config_onelab_vserver.py b/system/config_onelab_vserver.py index d02f575..88d7640 100644 --- a/system/config_onelab_vserver.py +++ b/system/config_onelab_vserver.py @@ -1,9 +1,12 @@ import utils +import os.path +# from 01 to 09 available = [ ( i, 'vnode%02d.inria.fr'%i, '138.96.250.13%d'%i) for i in range(1,10) ] def config (plcs,options): available.reverse() + plc_counter=0 for plc in plcs: ### locating the next available hostname (using ping) while True: @@ -13,7 +16,15 @@ def config (plcs,options): break except: raise Exception('Cannot find an available IP for %s - exiting'%plc['name']) - plc['vservername']=hostname + # compute a helpful vserver name + plc_counter += 1 + vservername = os.path.basename(options.myplc_url) + vservername = vservername.replace(".rpm","") + if len(plcs) == 1 : + vservername = "%s-%s" % (vservername,ip) + else: + vservername = "%s-%d-%s" % (vservername,plc_counter,ip) + plc['vservername']=vservername plc['vserverip']=ip plc['name'] = "%s_%02d"%(plc['name'],i) utils.header("Attaching plc %s to vserver %s (%s)"%\ -- 2.47.0