cpee 1.3.228 → 1.3.230

data/cockpit/themes/default/rngs/choose.rng

@@ -5,4 +5,8 @@
       <value>inclusive</value>
     </choice>
   </attribute>
+  <element name="alternative">
+    <attribute name="condition"><data type="string"/></attribute>
+  </element>
+  <element name="otherwise"/>
 </element>

data/cockpit/themes/default/rngs/parallel.rng

@@ -2,4 +2,12 @@
   <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
     <data type="integer"/>
   </attribute>
+  <element name="parallel_branch">
+    <attribute name="pass"><data type="string"/></attribute>
+    <attribute name="local"><data type="string"/></attribute>
+  </element>
+  <element name="parallel_branch">
+    <attribute name="pass"><data type="string"/></attribute>
+    <attribute name="local"><data type="string"/></attribute>
+  </element>
 </element>

data/cockpit/themes/default/rngs/stop.rng

@@ -0,0 +1,5 @@
+<element rngui:version="1.2" name="stop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+</element>

data/cockpit/themes/default/rngs/terminate.rng

@@ -0,0 +1 @@
+<element rngui:version="1.2" name="terminate" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org"/>

data/cockpit/themes/default/symbols/stop.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="hfill rfill cline stand"/>
+  <line x1="12.5" y1="22.5" x2="12.5" y2="8.5" class="stand"/>
+  <line x1="17.5" y1="22.5" x2="17.5" y2="8.5" class="stand"/>
+</svg>

data/cockpit/themes/default/symbols/terminate.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="stand"/>
+  <circle cx="15" cy="15" r="9" class="black"/>
+</svg>

data/cockpit/themes/default/theme.js

@@ -59,10 +59,10 @@ function WFAdaptorManifestation(adaptor) {
     var tab  = $('#dat_details');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
         tab.empty();
-    if (self.adaptor.description.elements[$(node).attr('svg-type')]) {
+    if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
       save['details_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
-      var rng = self.adaptor.description.elements[$(node).attr('svg-type')].clone();
-      if (save['endpoints_cache'][$(node).attr('endpoint')]) {
+      var rng = self.adaptor.description.elements[$(node).attr('svg-subtype')].clone();
+      if (save['endpoints_cache'][$(node).attr('endpoint')] && save['endpoints_cache'][$(node).attr('endpoint')].schema) {
         var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
         $(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
       }
@@ -275,6 +275,37 @@ function WFAdaptorManifestation(adaptor) {
       'click': self.events.click,
     }//}}}
   }; /*}}}*/
+  this.elements.stop = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/stop.svg'
+    },//}}}
+    'description': self.adaptor.theme_dir + 'rngs/stop.rng',
+    'permissible_children': function(node,mode) { //{{{
+      return [];
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'click': self.events.click,
+    }//}}}
+  }; /*}}}*/
+  this.elements.terminate = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'final': true,
+      'svg': self.adaptor.theme_dir + 'symbols/terminate.svg'
+    },//}}}
+    'description': self.adaptor.theme_dir + 'rngs/terminate.rng',
+    'permissible_children': function(node,mode) { //{{{
+      return [];
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'click': self.events.click,
+    }//}}}
+  }; /*}}}*/
 
   // Complex Elements
   this.elements.choose = { /*{{{*/
@@ -390,6 +421,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
@@ -463,6 +504,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
@@ -525,6 +576,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
@@ -602,6 +663,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': self.adaptor.description.insert_last_into,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': self.adaptor.description.insert_last_into,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': self.adaptor.description.insert_last_into,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
@@ -683,6 +754,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
@@ -758,6 +839,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
@@ -856,6 +947,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.228"
+  s.version          = "1.3.230"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/lib/cpee/instantiation.rb

@@ -23,9 +23,8 @@ module CPEE
 
     SERVER = File.expand_path(__dir__ + '/../instantiation.xml')
 
-    module Testset #{{{
-
-      def self::load(tdoc,cpee)
+    module Helpers #{{{
+      def load_testset(tdoc,cpee) #{{{
         ins = -1
         XML::Smart.string(tdoc) do |doc|
           doc.register_namespace 'desc', 'http://cpee.org/ns/description/1.0'
@@ -70,75 +69,136 @@ module CPEE
           end
         end
         return ins
-      end
+      end #}}}
+      private :load_testset
+      def handle_waiting(cpee,instance,behavior) #{{{
+        if behavior =~ /^wait/
+          condition = behavior.match(/_([^_]+)_/)&.[](1) || 'finished'
+          @headers << Riddl::Header.new('CPEE_CALLBACK','true')
+          cb = @h['CPEE_CALLBACK']
 
+          if cb
+            srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
+            status, response = srv.resource("/#{instance}/notifications/subscriptions/").post [
+              Riddl::Parameter::Simple.new("topic","state"),
+              Riddl::Parameter::Simple.new("events","change"),
+            ]
+            key = response.first.value
+
+            srv.resource("/#{instance}/notifications/subscriptions/#{key}/ws/").ws do |conn|
+              conn.on :message do |msg|
+                if JSON::parse(XML::Smart::string(msg.data).find('string(/event/notification)'))['state'] == condition
+                  conn.close
+                  Riddl::Client.new(cb).put [
+                    # TODO extract all dataelements from instance
+                    Riddl::Parameter::Simple.new('instance',instance)
+                  ]
+                end
+              end
+            end
+          end
+        end
+      end #}}}
+      private :handle_waiting
+      def handle_starting(cpee,instance,behavior) #{{{
+        if behavior =~ /_running$/
+          srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
+          res = srv.resource("/#{instance}/properties/values")
+          status, response = res.put [
+            Riddl::Parameter::Simple.new('name', 'state'),
+            Riddl::Parameter::Simple.new('value','running')
+          ]
+        end
+      end #}}}
+      private :handle_starting
+      def handle_data(cpee,instance,data)
+        if data
+          srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
+          JSON::parse(data).each do |k,v|
+            res = srv.resource("/#{instance}/properties/values/dataelements/#{k}")
+            status, response = res.put [
+              Riddl::Parameter::Simple.new('value',v)
+            ]
+          end rescue nil
+        end
+      end
     end #}}}
 
-    class Instantiate < Riddl::Implementation
+    class InstantiateUrl < Riddl::Implementation #{{{
+      include Helpers
+
       def response
         cpee = @a[0]
-        tdoc = case @p[@p.length - 1].name
-          when 'url'
-            status, res = Riddl::Client.new(@p[@p.length - 1].value).get
-            if status >= 200 && status < 300
-              res[0].value.read
-            else
-              (@status = 500) && return
-            end
-          when 'xml'
-            if @p[@p.length - 1].additional =~ /base64/
-              Base64.decode64(@p[@p.length - 1].value.read)
-            else
-              @p[@p.length - 1].value.read
-            end
+        status, res = Riddl::Client.new(@p[1].value).get
+        tdoc = if status >= 200 && status < 300
+          res[0].value.read
+        else
+          (@status = 500) && return
         end
 
-        if (ins = Testset::load(tdoc,cpee)) == -1
+        if (instance = load_testset(tdoc,cpee)) == -1
           @status = 500
         else
-          if @p[0].value =~ /^wait/
-            @headers << Riddl::Header.new('CPEE_CALLBACK','true')
-            cb = @h['CPEE_CALLBACK']
-
-            if cb
-              srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
-              status, response = srv.resource("/#{ins}/notifications/subscriptions/").post [
-                Riddl::Parameter::Simple.new("topic","state"),
-                Riddl::Parameter::Simple.new("events","change"),
-              ]
-              key = response.first.value
-
-              srv.resource("/#{ins}/notifications/subscriptions/#{key}/ws/").ws do |conn|
-                conn.on :message do |msg|
-                  if JSON::parse(XML::Smart::string(msg.data).find('string(/event/notification)'))['state'] == 'finished'
-                    conn.close
-                    Riddl::Client.new(cb).put [
-                      # TODO extract all dataelements from instance
-                      Riddl::Parameter::Simple.new('instance',ins)
-                    ]
-                  end
-                end
-              end
-            end
-          end
-          if @p.length > 1 && @p[0].value =~ /_running$/
-            srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
-            res = srv.resource("/#{ins}/properties/values")
-            status, response = res.put [
-              Riddl::Parameter::Simple.new('name', 'state'),
-              Riddl::Parameter::Simple.new('value','running')
-            ]
-          end
-          return Riddl::Parameter::Simple.new("url",cpee + ins)
+          handle_data cpee, instance, @p[2]&.value
+          handle_waiting cpee, instance, @p[0].value
+          handle_starting cpee, instance, @p[0].value
+          return Riddl::Parameter::Simple.new("url",cpee + instance)
         end
       end
-    end
+    end #}}}
+
+    class InstantiateXML < Riddl::Implementation #{{{
+      include Helpers
+
+      def response
+        cpee     = @a[0]
+        behavior = @a[1] ? 'fork_ready' : @p[0].value
+        data     = @a[1] ? 0 : 1
+        tdoc = if @p[data].additional =~ /base64/
+          Base64.decode64(@p[data].value.read)
+        else
+          @p[data].value.read
+        end
+
+        if (instance = load_testset(tdoc,cpee)) == -1
+          @status = 500
+        else
+          handle_data cpee, instance, @p[data+1]&.value
+          handle_waiting cpee, instance, behavior
+          handle_starting cpee, instance, behavior
+          return Riddl::Parameter::Simple.new("url",cpee + instance)
+        end
+      end
+    end #}}}
+
+    class HandleInstance < Riddl::Implementation #{{{
+      include Helpers
+
+      def response
+        cpee     = @a[0]
+        instance = @p[1].value
+
+        handle_data cpee, instance, @p[2]&.value
+        handle_waiting cpee, instance, @p[0].value
+        handle_starting cpee, instance, @p[0].value
+        return Riddl::Parameter::Simple.new("url",cpee + instance)
+      end
+    end #}}}
 
     def self::implementation(opts)
       opts[:cpee] ||= 'http://localhost:9298/'
       Proc.new do
         on resource do
-          run Instantiate, opts[:cpee] if post 'instantiate'
+          run InstantiateXML, opts[:cpee],true if post 'xmlsimple'
+          on resource 'xml' do
+            run InstantiateXML, opts[:cpee], false if post 'xml'
+          end
+          on resource 'url' do
+            run InstantiateUrl, opts[:cpee] if post 'url'
+          end
+          on resource 'instance' do
+            run HandleInstance, opts[:cpee] if post 'instance'
+          end
         end
       end
     end

data/lib/instantiation.xml

@@ -1,28 +1,68 @@
 <description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-  <message name="instantiate">
+  <message name="xmlsimple">
+    <parameter name="xml" mimetype="*/xml"/>
+  </message>
+  <message name="xml">
+    <parameter name="behavior" type="string">
+      <choice>
+        <value>fork_ready</value>
+        <value>fork_running</value>
+        <value>wait_ready</value>
+        <value>wait_running</value>
+      </choice>
+    </parameter>
+    <parameter name="xml" mimetype="*/xml"/>
     <optional>
-      <parameter name="behavior" type="string">
-        <choice>
-          <value>fork_ready</value>
-          <value>fork_running</value>
-          <value>wait_ready</value>
-          <value>wait_running</value>
-        </choice>
-      </parameter>
+      <parameter name="init" type="string"/>
+    </optional>
+  </message>
+  <message name="url">
+    <parameter name="behavior" type="string">
+      <choice>
+        <value>fork_ready</value>
+        <value>fork_running</value>
+        <value>wait_ready</value>
+        <value>wait_running</value>
+      </choice>
+    </parameter>
+    <parameter name="url" type="string"/>
+    <optional>
+      <parameter name="init" type="string"/>
     </optional>
-    <choice>
-      <parameter name="xml" mimetype="*/xml"/>
-      <parameter name="url" type="string"/>
-    </choice>
   </message>
-
   <message name="instance">
+    <parameter name="behavior" type="string">
+      <choice>
+        <value>fork_ready</value>
+        <value>fork_running</value>
+        <value>wait_ready</value>
+        <value>wait_running</value>
+        <value>wait_stopped_running</value>
+        <value>wait_finished_running</value>
+      </choice>
+    </parameter>
+    <parameter name="instance" type="integer"/>
+    <optional>
+      <parameter name="init" type="string"/>
+    </optional>
+  </message>
+
+  <message name="result">
     <parameter name="url" type="anyURI"/>
   </message>
 
   <resource>
-    <post in="instantiate" out="instance"/>
+    <post in="xmlsimple" out="result"/>
+    <resource relative="xml">
+      <post in="xml" out="result"/>
+    </resource>
+    <resource relative="instance">
+      <post in="instance" out="result"/>
+    </resource>
+    <resource relative="url">
+      <post in="url" out="result"/>
+    </resource>
   </resource>
 
 </description>