unset OMF_ENABLED as this requires the XMPP values to be defined as well

[tests.git] / system / config_default.py

diff --git a/system/config_default.py b/system/config_default.py
index ee1b4c5..c776991 100644 (file)
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -137,19 +137,27 @@ def initscripts(options,index):
                      { 'enabled' : True,
                        'name':'script1',
                        'script' : """#! /bin/sh
-(echo Starting test initscript: script1; date) > /tmp/script1.stamp
-echo "This is the stdout of the sliver initscript" 
-echo "This is the stderr of the sliver initscript" 1>&2
+(echo Starting test initscript: script1; date) >> /tmp/script1.stamp
+# expected to be 'start'
+command=$1; shift
+# get slice name
+slicename=$1; shift
+echo "This is the stdout of the sliver $slicename initscript $command (exp. start) pid=$$" 
+echo "This is the stderr of the sliver $slicename initscript $command (exp. start) pid=$$" 1>&2
 """,
                        }},
                    { 'initscript_fields' : 
                      { 'enabled' : True,
                        'name':'script2',
                        'script' : """#! /bin/sh
-(echo Starting loop-forever test initscript: script2; date) > /tmp/script2.stamp
+(echo Starting loop-forever test initscript: script2; date) >> /tmp/script2.stamp
+# expected to be 'start'
+command=$1; shift
+# get slice name
+slicename=$1; shift
 while true; do
-echo "This is the stdout of the loop-for-ever sliver initscript" 
-echo "This is the stderr of the loop-for-ever sliver initscript" 1>&2
+echo "This is the stdout of the loop-for-ever sliver initscript $slicename $command (exp. start) $$" 
+echo "This is the stderr of the loop-for-ever sliver initscript $slicename $command (exp. start) $$" 1>&2
 sleep 10
 done
 """,
@@ -234,6 +242,7 @@ def plc (options,index) :
         'PLC_NET_DNS1' : 'deferred-dns-1',
         'PLC_NET_DNS2' : 'deferred-dns-2',
         'PLC_RESERVATION_GRANULARITY':reservation_granularity,
+        'PLC_OMF_ENABLED' : 'false',
         'sites' : sites(options,index),
         'keys' : keys(options,index),
         'initscripts': initscripts(options,index),