Add job states in docs + states in python

Change-Id: I25af798974dbfe61e144b15056090084aa8ef6dd

2 files changed, 15 insertions, 2 deletions

diff --git a/tools/generate_states.sh b/tools/generate_states.sh
index 308c640..60ca3d4 100755
--- a/tools/generate_states.sh
+++ b/tools/generate_states.sh
@@ -34,3 +34,7 @@ $xsltproc $PWD/.diagram-tools/notugly.xsl /tmp/states.svg > $img_dir/retry_state
 echo "---- Updating wbe request state diagram ----"
 python $script_dir/state_graph.py -w -f /tmp/states.svg
 $xsltproc $PWD/.diagram-tools/notugly.xsl /tmp/states.svg > $img_dir/wbe_request_states.svg
+
+echo "---- Updating job state diagram ----"
+python $script_dir/state_graph.py -j -f /tmp/states.svg
+$xsltproc $PWD/.diagram-tools/notugly.xsl /tmp/states.svg > $img_dir/job_states.svg
diff --git a/tools/state_graph.py b/tools/state_graph.py
index 5ba9da7..7711826 100755
--- a/tools/state_graph.py
+++ b/tools/state_graph.py
@@ -71,7 +71,7 @@ def map_color(internal_states, state):
         return 'red'
     if state == states.REVERTED:
         return 'darkorange'
-    if state == states.SUCCESS:
+    if state in (states.SUCCESS, states.COMPLETE):
         return 'green'
     return None
 
@@ -96,6 +96,10 @@ def main():
                       action='store_true',
                       help="use wbe request transitions",
                       default=False)
+    parser.add_option("-j", "--jobs", dest="jobs",
+                      action='store_true',
+                      help="use job transitions",
+                      default=False)
     parser.add_option("-T", "--format", dest="format",
                       help="output in given format",
                       default='svg')
@@ -109,9 +113,10 @@ def main():
         options.retries,
         options.tasks,
         options.wbe_requests,
+        options.jobs,
     ]
     if sum([int(i) for i in types]) > 1:
-        parser.error("Only one of task/retry/engines/wbe requests"
+        parser.error("Only one of task/retry/engines/wbe requests/jobs"
                      " may be specified.")
 
     internal_states = list()
@@ -135,6 +140,10 @@ def main():
         source_type = "WBE requests"
         source = make_machine(protocol.WAITING,
                               list(protocol._ALLOWED_TRANSITIONS), [])
+    elif options.jobs:
+        source_type = "Jobs"
+        source = make_machine(states.UNCLAIMED,
+                              list(states._ALLOWED_JOB_TRANSITIONS), [])
     else:
         source_type = "Flow"
         source = make_machine(states.PENDING,