cpee 1.4.18 → 1.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30952bfb498150aa39be236415fe6110733f848542c8b1cc875b4f112e3dfc3a
-  data.tar.gz: fe3f5fb06beaf18d6db8f168b107ca0b621e06f9da36c99a1e564ed2af82d184
+  metadata.gz: abed28f89d5a0d2d9fb9a1b3441abf39da7558ece841f3f5bf5e73112cb761fe
+  data.tar.gz: b7ebbda76cd00081c7512a934e77ee23b5566b334d782ce03ae38f65ba610d6e
 SHA512:
-  metadata.gz: d25f4a4c0e44459518b0df15d2a5c0b0c8d3e7ec80c6556b8453ee85c9db780acc697629089b02e609b67b2b87f4474fab0dd8e4291cb888b9978d84f33028a3
-  data.tar.gz: d8404a79cbe9e6429f5ac44f43423f2826f497b8476bd2aa2775fa371d3ef0b7d27d497a3cd550952cff428a8692b676677b07d61d75d624f2ab1e930fc6b5cc
+  metadata.gz: 2655808212b6d633c2e85172285dd8cf8405bc8944a0cc00c22336e0189f585ea8ff6ed5ff0b33f55f54524bf8f55940659dd65788c3b2e5972f5bd51ccd714d
+  data.tar.gz: f170b5a892b8e5c649cf451074e987bc8f24a0c662491de161bfc95fc4c7a6992fb11e9e949c45f6ba2780978436ecb563b50c75ea4ca2a617527b6a3b40319a

data/cockpit/testsets/Subprocess.xml

@@ -0,0 +1,52 @@
+<testset>
+  <dataelements/>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <endpoints>
+    <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <instantiate xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://localhost:9296/url/</instantiate>
+  </endpoints>
+  <positions/>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="instantiate">
+        <parameters>
+          <label>Take 5</label>
+          <method>:post</method>
+          <arguments>
+            <info>Take Time</info>
+            <behavior>wait_running</behavior>
+            <url>http://localhost/testsets/Take_5.xml</url>
+            <init>
+              <a>3</a>
+            </init>
+          </arguments>
+        </parameters>
+        <finalize output="result">data.instance = result['CPEE-INSTANCE']
+data.res = result</finalize>
+        <update output="result"/>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_notes_output/>
+          <_attachments/>
+        </_notes>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <attributes>
+    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Subprocess</info>
+    <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
+    <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">default</theme>
+    <customer xmlns="http://riddl.org/ns/common-patterns/properties/1.0">pilotfabrik</customer>
+    <status xmlns="http://riddl.org/ns/common-patterns/properties/1.0">development</status>
+  </attributes>
+</testset>

data/cockpit/testsets/Take_5.xml

@@ -0,0 +1,44 @@
+<testset>
+  <dataelements/>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <endpoints>
+    <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints>
+  <positions/>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments>
+            <timeout>5</timeout>
+          </arguments>
+        </parameters>
+        <finalize output="result">data.a = 17</finalize>
+        <update output="result"/>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_attachments/>
+        </_notes>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <attributes>
+    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0"></info>
+    <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
+    <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">default</theme>
+    <customer xmlns="http://riddl.org/ns/common-patterns/properties/1.0">pilotfabrik</customer>
+    <status xmlns="http://riddl.org/ns/common-patterns/properties/1.0">development</status>
+  </attributes>
+</testset>

data/cockpit/testsets/testsets.xml

@@ -1,5 +1,6 @@
 <testsets>
   <!--testset>Centurio</testset-->
+  <testset>Subprocess</testset>
   <testset>Async</testset>
   <testset>Log</testset>
   <testset>BCS</testset>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.4.18"
+  s.version          = "1.4.20"
   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/controller.rb

@@ -19,38 +19,10 @@ require ::File.dirname(__FILE__) + '/handler_properties'
 require ::File.dirname(__FILE__) + '/handler_notifications'
 require ::File.dirname(__FILE__) + '/callback'
 require ::File.dirname(__FILE__) + '/empty_workflow'
+require ::File.dirname(__FILE__) + '/value_helper'
 
 module CPEE
 
-  class ValueHelper #{{{
-    def self::generate(value)
-      if [String, Integer, Float, TrueClass, FalseClass, Date].include? value.class
-        value.to_s
-      elsif  [Hash, Array].include? value.class
-        JSON::generate(value)
-      elsif value.respond_to?(:to_s)
-        value.to_s
-      end
-    end
-
-    def self::parse(value)
-      case value.downcase
-        when 'true'
-          true
-        when 'false'
-          false
-        when 'nil', 'null'
-          nil
-        else
-          begin
-            JSON::parse(value)
-          rescue
-            (Integer value rescue nil) || (Float value rescue nil) || value.to_s rescue nil || ''
-          end
-      end
-    end
-  end #}}}
-
   class AttributesHelper #{{{
     def translate(__attributes__,__dataelements__,__endpoints__)
       @data       = WEEL::ReadHash.new(__dataelements__)
@@ -283,7 +255,7 @@ module CPEE
         pos.children.delete_all!
         @positions = @instance.positions
         @instance.positions.each do |p|
-          pos.add("#{p.position}",p.detail,'passthrough' => p.passthrough)
+          pos.add("#{p.position}",p.detail,'passthrough' => p.passthrough.to_s.empty? ? nil : p.passthrough)
         end
       end
     end # }}}
@@ -580,6 +552,8 @@ module CPEE
               params = notf.map{|ke,va|Riddl::Parameter::Simple.new(ke,va)}
               params << Riddl::Header.new("CPEE-BASE",self.base)
               params << Riddl::Header.new("CPEE-INSTANCE",self.instance)
+              params << Riddl::Header.new("CPEE-INSTANCE-URL",self.instance_url)
+              params << Riddl::Header.new("CPEE-INSTANCE-UUID",self.uuid)
               client.post params
             elsif url.class == Riddl::Utils::Notifications::Producer::WS
               e = XML::Smart::string("<event/>")
@@ -618,7 +592,9 @@ module CPEE
               client = Riddl::Client.new(u,'http://riddl.org/ns/common-patterns/notifications-consumer/1.0/consumer.xml')
               params = notf.map{|ke,va|Riddl::Parameter::Simple.new(ke,va)}
               params << Riddl::Header.new("CPEE-BASE",self.base_url)
-              params << Riddl::Header.new("CPEE-INSTANCE",self.instance_url)
+              params << Riddl::Header.new("CPEE-INSTANCE",self.instance)
+              params << Riddl::Header.new("CPEE-INSTANCE-URL",self.instance_url)
+              params << Riddl::Header.new("CPEE-INSTANCE-UUID",self.uuid)
               params << Riddl::Header.new("CPEE-CALLBACK",self.instance_url + '/callbacks/' + callback)
               @mutex.synchronize do
                 status, result, headers = client.post params

data/lib/cpee/empty_workflow.rb

@@ -1,18 +1,22 @@
 # This file is part of CPEE.
-# 
+#
 # CPEE is free software: you can redistribute it and/or modify it under the terms
 # of the GNU General Public License as published by the Free Software Foundation,
 # either version 3 of the License, or (at your option) any later version.
-# 
+#
 # CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License along with
 # CPEE (file COPYING in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
-require 'weel'
+if Module.const_defined?(:CPEE) && CPEE.const_defined?(:DEVELOP) && CPEE::DEVELOP.const_defined?(:WEEL)
+  require File.join(CPEE::DEVELOP::WEEL,'weel')
+else
+  require 'weel'
+end
 require ::File.dirname(__FILE__) + '/../../server/handlerwrappers/default'
 
 class EmptyWorkflow < WEEL

data/lib/cpee/implementation.rb

@@ -168,6 +168,10 @@ module CPEE
       controller[id].info = name
       controller[id].state_change!
 
+      @headers << Riddl::Header.new("CPEE-INSTANCE", controller[id].instance)
+      @headers << Riddl::Header.new("CPEE-INSTANCE-URL", controller[id].instance_url)
+      @headers << Riddl::Header.new("CPEE-INSTANCE-UUID", controller[id].uuid)
+
       Riddl::Parameter::Simple.new("id", id)
     end
   end #}}}
@@ -240,7 +244,11 @@ module CPEE
         return
       end
       Riddl::Parameter::Complex.new("res","text/plain") do
-        controller[id].console(@p[0].value)
+        begin
+          controller[id].console(@p[0].value)
+        rescue => e
+          e.message
+        end
       end
     end
   end #}}}

data/lib/cpee/instantiation.rb

@@ -19,6 +19,7 @@ require 'base64'
 require 'uri'
 require 'redis'
 require 'json'
+require ::File.dirname(__FILE__) + '/value_helper'
 
 module CPEE
   module Instantiation
@@ -28,6 +29,7 @@ module CPEE
     module Helpers #{{{
       def load_testset(tdoc,cpee,name=nil) #{{{
         ins = -1
+        uuid = nil
         XML::Smart.string(tdoc) do |doc|
           doc.register_namespace 'desc', 'http://cpee.org/ns/description/1.0'
           doc.register_namespace 'prop', 'http://riddl.org/ns/common-patterns/properties/1.0'
@@ -40,10 +42,11 @@ module CPEE
             end
           end
 
-          status, response = res.post Riddl::Parameter::Simple.new("info",doc.find("string(/testset/attributes/prop:info)"))
+          status, response, headers = res.post Riddl::Parameter::Simple.new("info",doc.find("string(/testset/attributes/prop:info)"))
 
           if status == 200
             ins = response.first.value
+            uuid = headers['CPEE_INSTANCE_UUID']
             params = []
 
             res = srv.resource("/#{ins}/properties/values")
@@ -76,10 +79,10 @@ module CPEE
             end
           end
         end
-        return ins
+        [ins, uuid]
       end #}}}
       private :load_testset
-      def handle_waiting(cpee,instance,behavior,selfurl,cblist) #{{{
+      def handle_waiting(cpee,instance,uuid,behavior,selfurl,cblist) #{{{
         if behavior =~ /^wait/
           condition = behavior.match(/_([^_]+)_/)&.[](1) || 'finished'
           @headers << Riddl::Header.new('CPEE-CALLBACK','true')
@@ -96,6 +99,7 @@ module CPEE
             cblist.rpush(cbk, cb)
             cblist.rpush(cbk, condition)
             cblist.rpush(cbk, instance)
+            cblist.rpush(cbk, uuid)
             cblist.rpush(cbk, File.join(cpee,instance))
           end
         end
@@ -112,7 +116,7 @@ module CPEE
         end
       end #}}}
       private :handle_starting
-      def handle_data(cpee,instance,data)
+      def handle_data(cpee,instance,data) #{{{
         if data
           srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
           JSON::parse(data).each do |k,v|
@@ -123,7 +127,7 @@ module CPEE
             sleep 0.42
           end rescue nil
         end
-      end
+      end #}}}
     end #}}}
 
     class InstantiateUrl < Riddl::Implementation #{{{
@@ -140,17 +144,17 @@ module CPEE
           (@status = 500) && return
         end
 
-        if (instance = load_testset(tdoc,cpee,@p[0].value)) == -1
+        if (instance, uuid = load_testset(tdoc,cpee,@p[0].value)).first == -1
           @status = 500
         else
           @headers << Riddl::Header.new('CPEE-INSTANTIATION',File.join(cpee,instance))
           handle_data cpee, instance, @p[3]&.value
-          handle_waiting cpee, instance, @p[1].value, selfurl, cblist
+          handle_waiting cpee, instance, uuid, @p[1].value, selfurl, cblist
           handle_starting cpee, instance, @p[1].value
           return Riddl::Parameter::Simple.new("url",cpee + instance)
         end
       end
-    end #}}}
+    end  #}}}
 
     class InstantiateXML < Riddl::Implementation #{{{
       include Helpers
@@ -167,12 +171,12 @@ module CPEE
           @p[data].value.read
         end
 
-        if (instance = load_testset(tdoc,cpee)) == -1
+        if (instance, uuid = load_testset(tdoc,cpee)).first == -1
           @status = 500
         else
           @headers << Riddl::Header.new('CPEE-INSTANTIATION',File.join(cpee,instance))
           handle_data cpee, instance, @p[data+1]&.value
-          handle_waiting cpee, instance, behavior, selfurl, cblist
+          handle_waiting cpee, instance, uuid, behavior, selfurl, cblist
           handle_starting cpee, instance, behavior
           return Riddl::Parameter::Simple.new("url",cpee + instance)
         end
@@ -188,10 +192,17 @@ module CPEE
         cblist   = @a[2]
         instance = @p[1].value
 
-        handle_data cpee, instance, @p[2]&.value
-        handle_waiting cpee, instance, @p[0].value, selfurl, cblist
-        handle_starting cpee, instance, @p[0].value
-        return Riddl::Parameter::Simple.new("url",cpee + instance)
+        srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
+        res = srv.resource("/#{instance}/properties/values/attributes/uuid")
+        status, response = res.get
+
+        if status >= 200 && status < 300
+          uuid = XML::Smart::string(response.first.value).root.text
+          handle_data cpee, instance, @p[2]&.value
+          handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
+          handle_starting cpee, instance, @p[0].value
+          return Riddl::Parameter::Simple.new("url",cpee + instance)
+        end
       end
     end #}}}
 
@@ -204,23 +215,35 @@ module CPEE
         notification = JSON.parse(@p[3].value)
 
         key = @r.last
-        cb, condition, instance, instance_url = cblist.lrange(key,0,-1)
+        cb, condition, instance, uuid, instance_url = cblist.lrange(key,0,-1)
+
+        send = {
+          'CPEE-INSTANCE' => instance,
+          'CPEE-INSTANCE-URL' => instance_url,
+          'CPEE-INSTANCE-UUID' => uuid,
+          'CPEE-STATE' => notification['state']
+        }
+
         if notification['state'] == condition
           cblist.del(key)
           srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
           res = srv.resource("/#{instance}/properties/values/dataelements")
           status, response = res.get
-          send = { 'CPEE-INSTANCE' => instance_url }
           if status >= 200 && status < 300
             doc = XML::Smart.string(response[0].value.read)
             doc.register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
             doc.find('/p:value/*').each do |e|
-              send[e.qname.name] = e.text
+              send[e.qname.name] = CPEE::ValueHelper::parse(e.text)
             end
           end
           Riddl::Client.new(cb).put [
             Riddl::Parameter::Complex.new('dataelements','application/json',JSON::generate(send))
           ]
+        else
+          Riddl::Client.new(cb).put [
+            Riddl::Header.new('CPEE-UPDATE','true'),
+            Riddl::Parameter::Complex.new('dataelements','application/json',JSON::generate(send))
+          ]
         end
       end
     end #}}}

data/lib/cpee/value_helper.rb

@@ -0,0 +1,32 @@
+module CPEE
+
+  class ValueHelper
+    def self::generate(value)
+      if [String, Integer, Float, TrueClass, FalseClass, Date].include? value.class
+        value.to_s
+      elsif  [Hash, Array].include? value.class
+        JSON::generate(value)
+      elsif value.respond_to?(:to_s)
+        value.to_s
+      end
+    end
+
+    def self::parse(value)
+      case value.downcase
+        when 'true'
+          true
+        when 'false'
+          false
+        when 'nil', 'null'
+          nil
+        else
+          begin
+            JSON::parse(value)
+          rescue
+            (Integer value rescue nil) || (Float value rescue nil) || value.to_s rescue nil || ''
+          end
+      end
+    end
+  end
+
+end

data/lib/engine.xml

@@ -24,7 +24,7 @@
   </message>
 
   <message name="instance-id">
-    <parameter name="id" type="string"/>
+    <parameter name="id" type="nonNegativeInteger"/>
   </message>
 
   <message name="instance-new">