Merge branch 'master' of ssh://git.onelab.eu/git/tests

[tests.git] / system / config_default.py

diff --git a/system/config_default.py b/system/config_default.py
index f50003f..2c280fa 100644 (file)
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -20,8 +20,10 @@ def login_base (index):
     else: return 'site%s'%chr(index+94)
 
 def sfa_root (index):
-    # pla, plb, ...
-    return 'pl%s'%chr(index+96)
+    # use plt (planetlab test) instead of pl
+    # otherwise a triangular test ends up with 'plc'
+    # plta, pltb, ...
+    return 'plt%s'%chr(index+96)
 
 def nodes(options,index):
     return [{'name':'node%d'%index,
@@ -307,13 +309,9 @@ def sfa (options,index) :
        'SFA_PLC_URL' : 'deferred-myplc-api-url',
         'SFA_PLC_USER' : 'root@test.onelab.eu',
         'SFA_PLC_PASSWORD' : 'test++',
-#        'SFA_DB_HOST':'deferred-myplc-hostname',
-#        'SFA_DB_USER' : 'pgsqluser',
-#        'SFA_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
-# the default settings come with 'sfa' as the dbname
-# temporary until we get the initscript to create that one
-#        'SFA_DB_NAME' : 'sfa',
-        'SFA_API_DEBUG': True,
+# use -c apiv2 to override this one
+#        'SFA_AGGREGATE_API_VERSION' : 1,
+        'SFA_API_LOGLEVEL': 1,
         # details of the slices to create
         'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspec_style) 
                               for rspec_style in options.rspec_styles ]
@@ -336,7 +334,7 @@ def sfa_slice_spec (options,index,rspec_style):
     print 'in sfa_slice_spec','slicename',slicename,'hrn',hrn,'mail',mail
     key=public_key
     slice_person_xml ='''<record email="%(mail)s" enabled="True" first_name="Fake" hrn="%(person_hrn)s" 
-last_name="Sfa" name="%(hrn)s" type="user">
+last_name="Sfa %(rspec_style)s" name="%(hrn)s" type="user">
 <keys>%(key)s</keys><role_ids>20</role_ids><role_ids>10</role_ids>
 <site_ids>1</site_ids><roles>pi</roles><roles>admin</roles><sites>%(prefix)s</sites></record>'''%locals()