# cannot use sfa_slice_mapper to pass dir_name
for slice_spec in self.plc_spec['sfa']['sfa_slice_specs']:
test_slice=TestSliceSfa(self,slice_spec)
- dir_name=self.confsubdir("dot-sfi/%s"%slice_spec['slicename'],clean=True,dry_run=self.options.dry_run)
+ dir_basename=os.path.basename(test_slice.sfi_path())
+ dir_name=self.confsubdir("dot-sfi/%s"%dir_basename,clean=True,dry_run=self.options.dry_run)
test_slice.sfi_config(dir_name)
# push into the remote /root/sfi area
location = test_slice.sfi_path()
else: return 'site%s'%chr(index+94)
def sfa_login_base (index, rspec_style):
- return "sfasite%s"%(rspec_style)
+ return "sfa%s"%(rspec_style)
def sfa_root (index):
# use plt (planetlab test) instead of pl
# one has an initscript code, the other one an initscript name
def slices (options,index):
def theslice (i):
- slice_spec = { 'slice_fields': {'name':'%s_slpl%d'%(login_base(index),i),
+ slice_spec = { 'slice_fields': {'name':'%s_sl%d'%(login_base(index),i),
'instantiation':'plc-instantiated',
'url':'http://foo%d.com'%index,
'description':'testslice number %d'%i,
return [
# local test
{ 'server_node': 'node1',
- 'server_slice' : '%s_slpl1'%login_base(index),
+ 'server_slice' : '%s_sl1'%login_base(index),
'client_node' : 'node1',
- 'client_slice' : '%s_slpl1'%login_base(index),
+ 'client_slice' : '%s_sl1'%login_base(index),
'port' : 2000,
}]
elif index == 2:
return [
# remote test
{ 'server_node': 'node2',
- 'server_slice' : '%s_slpl3'%login_base(index),
+ 'server_slice' : '%s_sl3'%login_base(index),
'client_node' : 'node2',
- 'client_slice' : '%s_slpl4'%login_base(index),
+ 'client_slice' : '%s_sl4'%login_base(index),
'port' : 4000,
},
]
# rspecstyle is 'pl' for sfav1 or 'pg' for pgv2
def sfa_slice_spec (options,index,rspec_style):
the_login_base=sfa_login_base(index,rspec_style)
- piuser='sfapi%d%s'%(index,rspec_style)
+ # we're already in a dedicated site/authority so no need to encumber with odd names
+ piuser='pi'
pimail=piuser+'@test.onelab.eu'
- regularuser='sfauser%d%s'%(index,rspec_style)
- slicename='slsfa%d%s'%(index,rspec_style)
+ regularuser='us'
+ slicename='sl'
prefix='%s.%s'%(sfa_root(index),the_login_base)
hrn=prefix+'.'+slicename
user_hrn=prefix+'.'+regularuser