test_pool = TestPool (onelab_plcs_pool,options)
- if len(options.ips) != 0:
- utils.header('Using user-provided IPS:\nips=%r'%options.ips)
- options.ips.reverse()
+ if len(options.plc_ips) != 0:
+ utils.header('Using user-provided IPS:\nplc_ips=%r'%options.plc_ips)
+ options.plc_ips.reverse()
plc_counter=0
for plc in plcs:
try:
- if len(options.ips) != 0:
- ip=options.ips[0]
- options.ips=options.ips[1:]
+ if len(options.plc_ips) != 0:
+ ip=options.plc_ips[0]
+ options.plc_ips=options.plc_ips[1:]
(hostname,ip,mac)=test_pool.locate(ip)
utils.header("Using user-provided %s %s for plc %s"%(
hostname,ip,plc['name']))
### rewrite fields in plc
# compute a helpful vserver name - remove domain in hostname
simplehostname=hostname.split('.')[0]
- # myplc rpm basename, without .rpm
- vservername = os.path.basename(options.myplc_url)
- vservername = vservername.replace(".rpm","")
- # vservername
- vservername = vservername.replace("myplc","vtest")
+ vservername = options.buildname
if len(plcs) == 1 :
vservername = "%s-%s" % (vservername,simplehostname)
else: