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 2f9b519..04fd524 100644 (file)
--- 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,34 +304,39 @@ 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_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,
         # details of the slices to create
-        'sfa_slice_specs' : [ sfa_slice_spec(options,index,mode) 
-                              for mode in ['pl','pg']],
+        'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspec_style) 
+                              for rspec_style in options.rspec_styles ]
     }
 
 # subindex is 0 (pl slice) or 1 (pg slice)
-def sfa_slice_spec (options,index,mode):
+def sfa_slice_spec (options,index,rspec_style):
     the_login_base=login_base(index)
     piuser='fake-pi%d'%index
-    regularuser='sfauser%d%s'%(index,mode)
-    slicename='slsfa%d%s'%(index,mode)
+    regularuser='sfauser%d%s'%(index,rspec_style)
+    slicename='slsfa%d%s'%(index,rspec_style)
     prefix='%s.%s'%(sfa_root(index),the_login_base)
     hrn=prefix+'.'+slicename
+    person_hrn=prefix+'.'+regularuser
     researcher=prefix+'.'+piuser
     slice_add_xml = '''<record hrn="%s" type="slice" description="SFA-testing" url="http://test.onelab.eu/">
 <researcher>%s</researcher></record>'''%(hrn, researcher)
 
     mail="%s@%s"%(regularuser,domain)
+    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="%(hrn)s" 
-last_name="Sfa" name="%(hrn)s" type="user">
+    slice_person_xml ='''<record email="%(mail)s" enabled="True" first_name="Fake" hrn="%(person_hrn)s" 
+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()
 
@@ -350,7 +355,7 @@ last_name="Sfa" name="%(hrn)s" type="user">
              'slicename' : slicename,
              'slice_add_xml' : slice_add_xml,
              'slice_person_xml' : slice_person_xml,
-             'mode':mode,
+             'rspec_style':rspec_style,
              }