X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_default.py;h=2e9056ca23b532f7bd2ec97d24f6a35719f629ab;hb=208728a0f3fa8c08548a13f2654aa8d83693d322;hp=9addccc806cf458a20c3ea7aa7c56c65f7e8c849;hpb=825e0facaff46873d447fb4fe85f8e31f17bb46c;p=tests.git

diff --git a/system/config_default.py b/system/config_default.py
index 9addccc..2e9056c 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -183,7 +183,7 @@ done
 def slices (options,index):
     return [ { 'slice_fields': {'name':'%s_pslc%d'%(login_base(index),i),
                                 'instantiation':'plc-instantiated',
-                                'url':'http://foo.com',
+                                'url':'http://foo%d.com'%index,
                                 'description':'testslice number %d'%i,
                                 'max_nodes':2,
                                 },
@@ -210,10 +210,10 @@ def tcp_tests (options,index):
     elif index == 2:
         return [
             # remote test
-            { 'server_node': 'node1',
-              'server_slice' : '%s_pslc1'%login_base(index),
+            { 'server_node': 'node2',
+              'server_slice' : '%s_pslc3'%login_base(index),
               'client_node' : 'node2',
-              'client_slice' : '%s_pslc2'%login_base(index),
+              'client_slice' : '%s_pslc4'%login_base(index),
               'port' : 4000,
               },
             ]
@@ -249,7 +249,7 @@ def plc (options,index) :
         'PLC_SLICE_PREFIX' : 'auto',
         'PLC_SHORTNAME' : 'Rlab',
         'PLC_MAIL_ENABLED':'false',
-        'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@sophia.inria.fr',
+        'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@inria.fr',
         'PLC_DB_HOST' : 'deferred-myplc-hostname',
         'PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
         'PLC_API_HOST' : 'deferred-myplc-hostname',
@@ -258,7 +258,9 @@ def plc (options,index) :
         'PLC_NET_DNS1' : 'deferred-dns-1',
         'PLC_NET_DNS2' : 'deferred-dns-2',
         'PLC_RESERVATION_GRANULARITY':1800,
-        'PLC_OMF_ENABLED' : 'false',
+        # minimal config so the omf plugins actually trigger
+        'PLC_OMF_ENABLED' : 'true',
+        'PLC_OMF_XMPP_SERVER': 'deferred-myplc-hostname',
         'sites' : sites(options,index),
         'keys' : keys(options,index),
         'initscripts': initscripts(options,index),
@@ -285,6 +287,7 @@ def sfa (options,index) :
         'SFA_PLC_DB_USER' : 'pgsqluser',
         'SFA_PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
 	'SFA_PLC_URL' : 'deferred-myplc-api-url',
+        'SFA_API_DEBUG': True,
         'sfa_slice_specs' : sfa_slice_specs(options,index,slicename,regularuser),
 	'sfa_slice_xml' : sfa_slice_xml(options,index,piuser,slicename),
 	'sfa_person_xml' : sfa_person_xml(options,index,regularuser),