use more compact slice names pslc<x> and fslc<x> for plc- and sfa- based slices resp.

[tests.git] / system / config_default.py

diff --git a/system/config_default.py b/system/config_default.py
index c9d6e08..37a740f 100644 (file)
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -62,6 +62,13 @@ def users (options) :
                                'email':'fake-pi2@%s'%domain,
                                'password':'testusertech'},
               'roles':['pi','tech']},
+             {'name':'admin', 'keynames' : [ 'key1' ],
+              'user_fields' : {'first_name':'Admin',
+                               'last_name':'Admin',
+                               'enabled':'true',
+                               'email':'admin@%s'%domain,
+                               'password':'testuseradmin'},
+              'roles':['admin']},
              ]
 
 def all_usernames (options):
@@ -72,7 +79,7 @@ def sites (options,index):
                                'login_base':'main',
                                'abbreviated_name':'PLanettest',
                                'max_slices':100,
-                               'url':'http://testbox1.onelab.eu',
+                               'url':'http://test.onelab.eu',
                                },
               'address_fields' : {'line1':'route des lucioles',
                                   'city':'sophia',
@@ -138,7 +145,7 @@ def initscripts(options,index):
     return initscripts
 
 def slices (options,index):
-    return [ { 'slice_fields': {'name':'main_slicetest%d'%index,
+    return [ { 'slice_fields': {'name':'main_pslc%d'%index,
                                 'instantiation':'plc-instantiated',
                                 'url':'http://foo%d@foo.com'%index,
                                 'description':'testslice number %d'%index,
@@ -159,18 +166,18 @@ def tcp_tests (options,index):
         return [
             # local test
             { 'server_node': 'node1',
-              'server_slice' : 'main_slicetest1',
+              'server_slice' : 'main_pslc1',
               'client_node' : 'node1',
-              'client_slice' : 'main_slicetest1',
+              'client_slice' : 'main_pslc1',
               'port' : 2000,
               }]
     elif index == 2:
         return [
             # remote test
             { 'server_node': 'node1',
-              'server_slice' : 'main_slicetest1',
+              'server_slice' : 'main_pslc1',
               'client_node' : 'node2',
-              'client_slice' : 'main_slicetest2',
+              'client_slice' : 'main_pslc2',
               'port' : 4000,
               },
             ]
@@ -190,7 +197,7 @@ def plc (options,index) :
         'PLC_ROOT_PASSWORD' : 'test++',
         'PLC_NAME' : 'Regression TestLab',
         'PLC_SHORTNAME' : 'Rlab',
-        'PLC_MAIL_ENABLED':'true',
+        'PLC_MAIL_ENABLED':'false',
         'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@sophia.inria.fr',
         'PLC_DB_HOST' : 'deferred-myplc-hostname',
         'PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
@@ -199,6 +206,7 @@ def plc (options,index) :
         'PLC_BOOT_HOST' : 'deferred-myplc-hostname',
         'PLC_NET_DNS1' : 'deferred-dns-1',
         'PLC_NET_DNS2' : 'deferred-dns-2',
+        'PLC_RESERVATION_GRANULARITY':300,
         'sites' : sites(options,index),
         'keys' : keys(options,index),
         'initscripts': initscripts(options,index),
@@ -215,11 +223,15 @@ def sfa (options,index) :
     return { 
         'SFA_REGISTRY_ROOT_AUTH' : root_auth,
         'SFA_REGISTRY_LEVEL1_AUTH' : '',
+       'SFA_REGISTRY_HOST' : 'deferred-myplc-hostname',
+       'SFA_AGGREGATE_HOST': 'deferred-myplc-hostname',
+       'SFA_SM_HOST': 'deferred-myplc-hostname',
         'SFA_PLC_USER' : 'root@test.onelab.eu',
         'SFA_PLC_PASSWORD' : 'test++',
-        'SFA_PLC_DB_HOST':'localhost',
+        'SFA_PLC_DB_HOST':'deferred-myplc-hostname',
         'SFA_PLC_DB_USER' : 'pgsqluser',
         'SFA_PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
+       'SFA_PLC_URL' : 'deferred-myplc-api-url',
         'slices_sfa' : slices_sfa(options,index),
        'sfa_slice_xml' : sfa_slice_xml(options,index),
        'sfa_person_xml' : sfa_person_xml(options,index),
@@ -227,7 +239,7 @@ def sfa (options,index) :
     }
 
 def slices_sfa (options,index):
-    return [ { 'slice_fields': {'name':'main_sfaslicea1',
+    return [ { 'slice_fields': {'name':'main_fslc1',
                                 'url':'http://foo%d@foo.com'%index,
                                 'description':'SFA-testing',
                                 'max_nodes':2,
@@ -239,10 +251,10 @@ def slices_sfa (options,index):
 
 def sfa_slice_xml(options,index):
     if index==1:
-       hrn='plc.main.sfaslicea1'
+       hrn='plc.main.fslc1'
        researcher='plc.main.fake-pi1'
     else:
-       hrn='ple.main.sfaslicea1'
+       hrn='ple.main.fslc1'
        researcher='ple.main.fake-pi1'
 
     return  ["""<record hrn="%s" type="slice" description="SFA-testing" url="http://anil.onelab.eu/"><researcher>%s</researcher></record>"""%(hrn, researcher)]