git://git.onelab.eu
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configurable rspec styles using -y
[tests.git]
/
system
/
config_default.py
diff --git
a/system/config_default.py
b/system/config_default.py
index
fca0d68
..
1f564fc
100644
(file)
--- a/
system/config_default.py
+++ b/
system/config_default.py
@@
-312,16
+312,16
@@
def sfa (options,index) :
'SFA_PLC_URL' : 'deferred-myplc-api-url',
'SFA_API_DEBUG': True,
# details of the slices to create
'SFA_PLC_URL' : 'deferred-myplc-api-url',
'SFA_API_DEBUG': True,
# details of the slices to create
- 'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspec
mod
e)
- for rspec
mode in ['pl','pg']],
+ 'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspec
_styl
e)
+ for rspec
_style in options.rspec_styles ]
}
# subindex is 0 (pl slice) or 1 (pg slice)
}
# subindex is 0 (pl slice) or 1 (pg slice)
-def sfa_slice_spec (options,index,rspec
mod
e):
+def sfa_slice_spec (options,index,rspec
_styl
e):
the_login_base=login_base(index)
piuser='fake-pi%d'%index
the_login_base=login_base(index)
piuser='fake-pi%d'%index
- regularuser='sfauser%d%s'%(index,rspec
mod
e)
- slicename='slsfa%d%s'%(index,rspec
mod
e)
+ regularuser='sfauser%d%s'%(index,rspec
_styl
e)
+ slicename='slsfa%d%s'%(index,rspec
_styl
e)
prefix='%s.%s'%(sfa_root(index),the_login_base)
hrn=prefix+'.'+slicename
person_hrn=prefix+'.'+regularuser
prefix='%s.%s'%(sfa_root(index),the_login_base)
hrn=prefix+'.'+slicename
person_hrn=prefix+'.'+regularuser
@@
-352,7
+352,7
@@
last_name="Sfa" name="%(hrn)s" type="user">
'slicename' : slicename,
'slice_add_xml' : slice_add_xml,
'slice_person_xml' : slice_person_xml,
'slicename' : slicename,
'slice_add_xml' : slice_add_xml,
'slice_person_xml' : slice_person_xml,
- 'rspec
mode':rspecmod
e,
+ 'rspec
_style':rspec_styl
e,
}
}