X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_default.py;h=b286b34844ae05302ea5b6d66f21ccefe23f26c3;hb=c321262ffc57008b1d4e9fd33fbd60fa46a8238a;hp=1f564fcbe454bb2b2de339adf0c4fb8dd0c679e0;hpb=c3ac22516b3770b16764a3f7d5b83f73365c7fc7;p=tests.git

diff --git a/system/config_default.py b/system/config_default.py
index 1f564fc..b286b34 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -274,7 +274,7 @@ def plc (options,index) :
         'PLC_MAIL_ENABLED':'false',
         'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@inria.fr',
         'PLC_DB_HOST' : 'deferred-myplc-hostname',
-        'PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
+#        'PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
         'PLC_API_HOST' : 'deferred-myplc-hostname',
         'PLC_WWW_HOST' : 'deferred-myplc-hostname',
         'PLC_BOOT_HOST' : 'deferred-myplc-hostname',
@@ -304,13 +304,12 @@ def sfa (options,index) :
 	'SFA_REGISTRY_HOST' : 'deferred-myplc-hostname',
 	'SFA_AGGREGATE_HOST': 'deferred-myplc-hostname',
 	'SFA_SM_HOST': 'deferred-myplc-hostname',
+	'SFA_PLC_URL' : 'deferred-myplc-api-url',
         'SFA_PLC_USER' : 'root@test.onelab.eu',
         'SFA_PLC_PASSWORD' : 'test++',
-        'SFA_PLC_DB_HOST':'deferred-myplc-hostname',
-        'SFA_PLC_DB_USER' : 'pgsqluser',
-        'SFA_PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
-	'SFA_PLC_URL' : 'deferred-myplc-api-url',
-        '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 ]
@@ -333,7 +332,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()