further cream .l's and minor fixes

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index f070c89..3e2bccf 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -57,7 +57,12 @@ l_SRC = \
        aborted.l \
        cancelled.l \
        cream_registered.l \
-       cream_pending.l
+       cream_pending.l \
+       cream_idle.l \
+       cream_running.l \
+       cream_reallyrunning.l \
+       cream_done.l \
+       cream_failed.l \
 
 # TODO: missing resubmission_deep
 #      shallow_resub_complex.l shallow_resub_simple.l shallow_resub_simple2.l \

diff --git a/org.glite.lb.client/examples/cream_done.l b/org.glite.lb.client/examples/cream_done.l
new file mode 100644 (file)
index 0000000..539700d
--- /dev/null
+++ b/org.glite.lb.client/examples/cream_done.l
@@ -0,0 +1,4 @@
+:cream_reallyrunning:
+-s LRMS,-e CREAMDone,--status_code=OK,--exit_code=123
+-s LRMS,-e CREAMDone,--status_code=OK,--exit_code=123
+-s BLAH,-e CREAMDone,--status_code=OK

diff --git a/org.glite.lb.client/examples/cream_failed.l b/org.glite.lb.client/examples/cream_failed.l
new file mode 100644 (file)
index 0000000..0a12e8e
--- /dev/null
+++ b/org.glite.lb.client/examples/cream_failed.l
@@ -0,0 +1,2 @@
+:cream_reallyrunning:
+-s LRMS,-e CREAMDone,--status_code=FAILED,--reason='Oh shit'

diff --git a/org.glite.lb.client/examples/cream_idle.l b/org.glite.lb.client/examples/cream_idle.l
new file mode 100644 (file)
index 0000000..c9fb97b
--- /dev/null
+++ b/org.glite.lb.client/examples/cream_idle.l
@@ -0,0 +1,4 @@
+:cream_pending:
+-s CreamCore,-e CREAMCall,--callee=BLAH,--command=CMDSTART,--cmdid='this is call',--result=OK
+-s BLAH,-e CREAMCall,--callee=LRMS,--command=CMDSTART,--cmdid='this is call',--result=START
+-s BLAH,-e CREAMCall,--callee=LRMS,--command=CMDSTART,--cmdid='this is call',--result=OK,--destid='12345.in.torque'

diff --git a/org.glite.lb.client/examples/cream_pending.l b/org.glite.lb.client/examples/cream_pending.l
index 6228485..3104b96 100644 (file)
--- a/org.glite.lb.client/examples/cream_pending.l
+++ b/org.glite.lb.client/examples/cream_pending.l
@@ -1,6 +1,4 @@
-# macro definition for WAITING state
-
 :cream_registered:
-
 -s CreamCore,-e CREAMStart
 -s CreamCore,-e CREAMStore,--command=CMDSTART,--result=START
+-s CreamCore,-e CREAMStore,--command=CMDSTART,--result=OK

diff --git a/org.glite.lb.client/examples/cream_reallyrunning.l b/org.glite.lb.client/examples/cream_reallyrunning.l
new file mode 100644 (file)
index 0000000..9a858d1
--- /dev/null
+++ b/org.glite.lb.client/examples/cream_reallyrunning.l
@@ -0,0 +1,2 @@
+:cream_running:
+-s LRMS,-e CREAMReallyRunning

diff --git a/org.glite.lb.client/examples/cream_running.l b/org.glite.lb.client/examples/cream_running.l
new file mode 100644 (file)
index 0000000..0c4cbd6
--- /dev/null
+++ b/org.glite.lb.client/examples/cream_running.l
@@ -0,0 +1,3 @@
+:cream_idle:
+-s BLAH,-e CREAMRunning
+-s LRMS,-e CREAMRunning,--node='worker.node.14'

diff --git a/org.glite.lb.types/events.T b/org.glite.lb.types/events.T
index 64213ed..3673aac 100644 (file)
--- a/org.glite.lb.types/events.T
+++ b/org.glite.lb.types/events.T
@@ -382,6 +382,7 @@
 
 @type CREAMRunning
        string  node
+       _optional_
 
 @type CREAMReallyRunning
 
@@ -394,6 +395,7 @@
        string  reason
        _optional_
        int     exit_code
+       _optional_
        _null_  -1
 
 @type CREAMCancel