cpee-instantiation 1.0.10 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d4f2d6bb294992580a51fe2e5f4c5c122506fe31a327fcbae1e88845964e02f
-  data.tar.gz: f2046e8bc78d8ff5d69feed0ba54ffc23d35da3afba9f58bf6417fe8963e01a2
+  metadata.gz: 025e4ba070e685921b00e57887d8f979a3d6434b74b16efbaa6adb310534a7d7
+  data.tar.gz: 9a84e081c68f000c4519054a116b9caa93ce5f7f1920dd88f993478ef1f86a01
 SHA512:
-  metadata.gz: 316d7c396535c85ba2030750591c3152e15a99142120925ed3b6758d0f755a1276e1b3da6c074caab507ae38f8159fdcd5843d556a7417a408e12396b72564e8
-  data.tar.gz: 96dfd842fd444518894bc782c48eb6ca69bca06bb02077c64a1af503843f1bec454bfc4bbdb666b2477ae4bbbc040862586e02e6a3f5cb4a12205c1a8ace949d
+  metadata.gz: d1d447f2bbc430412f369f267ff3b1078d299e65f3613b5a1b40e79b8964ec864ccb8690c8db19bf329a970b5fda8951cfb569b91dd9d2caf442d1d8b7ede905
+  data.tar.gz: '0692514bb3af3b5162d0d7b8d1f97fecc1a1ff04556f5e78cf282f035829e7e307b00636e5b43aeac1a2f6f5d55cf188286144bbabf7b20e37d1093695706648'

data/AUTHORS

@@ -1 +1,2 @@
 Jürgen Mangler <juergen.mangler@gmail.com>
+Heinrich Fenkart <hnrch02@gmail.com>

data/cpee-instantiation.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-instantiation"
-  s.version          = "1.0.10"
+  s.version          = "1.0.18"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Subprocess instantiation service for the cloud process execution engine (cpee.org)"
@@ -15,13 +15,13 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>=2.4.0'
 
-  s.authors          = ['Juergen eTM Mangler']
+  s.authors          = ['Juergen eTM Mangler', 'Heinrich Fenkart']
 
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'
 
   s.add_runtime_dependency 'riddl', '~> 0.99'
   s.add_runtime_dependency 'json', '~> 2.1'
-  s.add_runtime_dependency 'redis', '~> 4.1'
+  s.add_runtime_dependency 'redis', '~> 5.0'
   s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.4'
 end

data/lib/cpee-instantiation/instantiation.rb

@@ -30,73 +30,100 @@ module CPEE
     SERVER = File.expand_path(File.join(__dir__,'instantiation.xml'))
 
     module Helpers #{{{
-      def load_testset(tdoc,cpee,name=nil,customization=nil) #{{{
+      def add_to_testset(tdoc,what,data)
+        if data && !data.empty?
+          JSON::parse(data).each do |k,v|
+            ele = tdoc.find("/*/prop:#{what}/prop:#{k}")
+            if ele.any?
+              ele.first.text = CPEE::ValueHelper::generate(v)
+            else
+              ele = tdoc.find("/*/prop:#{what}")
+              ele.first.add(k,CPEE::ValueHelper::generate(v)) if ele.any?
+            end
+          end
+        end
+      end
+
+      def augment_testset(tdoc,p)
+        tdoc = XML::Smart.string(tdoc)
+        tdoc.register_namespace 'desc', 'http://cpee.org/ns/description/1.0'
+        tdoc.register_namespace 'prop', 'http://cpee.org/ns/properties/2.0'
+        tdoc.register_namespace 'sub', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
+
+        if data = p.find{ |e| e.name == 'init' }&.value
+          add_to_testset(tdoc,'dataelements',data)
+        end
+        if data = p.find{ |e| e.name == 'endpoints' }&.value
+          add_to_testset(tdoc,'endpoints',data)
+        end
+        if data = p.find{ |e| e.name == 'attributes' }&.value
+          add_to_testset(tdoc,'attributes',data)
+        end
+        tdoc
+      end
+
+      def load_testset(doc,cpee,name=nil,customization=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://cpee.org/ns/properties/2.0'
-          doc.register_namespace 'sub', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
 
-          srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
-          res = srv.resource('/')
-          if name
-            doc.find('/*/prop:attributes/prop:info').each do |e|
-              e.text = name
-            end
+        srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
+        res = srv.resource('/')
+        if name
+          doc.find('/*/prop:attributes/prop:info').each do |e|
+            e.text = name
           end
-          if customization && !customization.empty?
-            JSON.parse(customization).each do |e|
-              begin
-                customization = Typhoeus.get e['url']
-                if customization.success?
-                  XML::Smart::string(customization.response_body) do |str|
-                    doc.find("//desc:call[@id=\"#{e['id']}\"]/desc:parameters/desc:customization").each do |ele|
-                      ele.replace_by str.root
-                    end
+        end
+        if customization && !customization.empty?
+          JSON.parse(customization).each do |e|
+            begin
+              customization = Typhoeus.get e['url']
+              if customization.success?
+                XML::Smart::string(customization.response_body) do |str|
+                  doc.find("//desc:call[@id=\"#{e['id']}\"]/desc:parameters/desc:customization").each do |ele|
+                    ele.replace_by str.root
                   end
                 end
-              rescue => e
-                puts e.message
-                puts e.backtrace
               end
+            rescue => e
+              puts e.message
+              puts e.backtrace
             end
           end
+        end
+
+        status, response, headers = res.post Riddl::Parameter::Simple.new('info',doc.find('string(/*/prop:attributes/prop:info)'))
 
-          status, response, headers = res.post Riddl::Parameter::Simple.new('info',doc.find('string(/*/prop:attributes/prop:info)'))
+        if status == 200
+          ins = response.first.value
+          uuid = headers['CPEE_INSTANCE_UUID']
 
-          if status == 200
-            ins = response.first.value
-            uuid = headers['CPEE_INSTANCE_UUID']
+          inp = XML::Smart::string('<properties xmlns="http://cpee.org/ns/properties/2.0"/>')
+          inp.register_namespace 'prop', 'http://cpee.org/ns/properties/2.0'
+          %w{executionhandler positions dataelements endpoints attributes description transformation}.each do |item|
+            ele = doc.find("/*/prop:#{item}")
+            inp.root.add(ele.first) if ele.any?
+          end
 
-            inp = XML::Smart::string('<properties xmlns="http://cpee.org/ns/properties/2.0"/>')
-            inp.register_namespace 'prop', 'http://cpee.org/ns/properties/2.0'
-            %w{executionhandler positions dataelements endpoints attributes description transformation}.each do |item|
-              ele = doc.find("/*/prop:#{item}")
-              inp.root.add(ele.first) if ele.any?
+          res = srv.resource("/#{ins}/properties").put Riddl::Parameter::Complex.new('properties','application/xml',inp.to_s)
+          # TODO new versions
+          doc.find('/*/sub:subscriptions/sub:subscription').each do |s|
+            parts = []
+            if id = s.attributes['id']
+              parts << Riddl::Parameter::Simple.new('id', id)
             end
-            res = srv.resource("/#{ins}/properties").put Riddl::Parameter::Complex.new('properties','application/xml',inp.to_s)
-            # TODO new versions
-            doc.find('/*/sub:subscriptions/sub:subscription').each do |s|
-              parts = []
-              if id = s.attributes['id']
-                parts << Riddl::Parameter::Simple.new('id', id)
+            parts << Riddl::Parameter::Simple.new('url', s.attributes['url'])
+            s.find('sub:topic').each do |t|
+              if (evs = t.find('sub:event').map{ |e| e.text }.join(',')).length > 0
+                parts <<  Riddl::Parameter::Simple.new('topic', t.attributes['id'])
+                parts <<  Riddl::Parameter::Simple.new('events', evs)
               end
-              parts << Riddl::Parameter::Simple.new('url', s.attributes['url'])
-              s.find('sub:topic').each do |t|
-                p s.find('sub:event').map{ |e| e.text }
-                if (evs = t.find('sub:event').map{ |e| e.text }.join(',')).length > 0
-                  parts <<  Riddl::Parameter::Simple.new('topic', t.attributes['id'])
-                  parts <<  Riddl::Parameter::Simple.new('events', evs)
-                end
-                if (vos = t.find('sub:vote').map{ |e| e.text }.join(',')).length > 0
-                  parts <<  Riddl::Parameter::Simple.new('topic', t.attributes['id'])
-                  parts <<  Riddl::Parameter::Simple.new('votes', vos)
-                end
+              if (vos = t.find('sub:vote').map{ |e| e.text }.join(',')).length > 0
+                parts <<  Riddl::Parameter::Simple.new('topic', t.attributes['id'])
+                parts <<  Riddl::Parameter::Simple.new('votes', vos)
               end
-              status,body = Riddl::Client::new(cpee+ins+'/notifications/subscriptions/').post parts
-            end rescue nil # in case just no subs are there
-          end
+            end
+            status,body = Riddl::Client::new(cpee+ins+'/notifications/subscriptions/').post parts
+          end rescue nil # in case just no subs are there
         end
         [ins, uuid]
       end #}}}
@@ -125,6 +152,7 @@ module CPEE
       private :handle_waiting
       def handle_starting(cpee,instance,behavior) #{{{
         if behavior =~ /_running$/
+          sleep 0.5
           srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
           res = srv.resource("/#{instance}/properties/state")
           status, response = res.put [
@@ -137,7 +165,7 @@ module CPEE
         if data && !data.empty?
           content = XML::Smart.string('<dataelements xmlns="http://cpee.org/ns/properties/2.0"/>')
           JSON::parse(data).each do |k,v|
-            content.root.add(k,v)
+            content.root.add(k,CPEE::ValueHelper::generate(v))
           end
           srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
           res = srv.resource("/#{instance}/properties/dataelements/")
@@ -159,6 +187,19 @@ module CPEE
           ]
         end rescue nil
       end #}}}
+      def handle_attributes(cpee,instance,data) #{{{
+        if data && !data.empty?
+          content = XML::Smart.string('<attributes xmlns="http://cpee.org/ns/properties/2.0"/>')
+          JSON::parse(data).each do |k,v|
+            content.root.add(k,v)
+          end
+          srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
+          res = srv.resource("/#{instance}/properties/attributes/")
+          status, response = res.patch [
+            Riddl::Parameter::Complex.new('attributes','text/xml',content.to_s)
+          ]
+        end rescue nil
+      end #}}}
     end #}}}
 
     class InstantiateGit < Riddl::Implementation #{{{
@@ -176,14 +217,12 @@ module CPEE
           (@status = 500) && return
         end
         customization = @p.find{ |e| e.name == 'customization' }&.value
+
+        tdoc = augment_testset(tdoc,@p)
         if (instance, uuid = load_testset(tdoc,cpee,nil,customization)).first == -1
           @status = 500
         else
           EM.defer do
-            handle_data cpee, instance, @p[4]&.value if @p[4]&.name == 'init'
-            handle_endpoints cpee, instance, @p[4]&.value if @p[4]&.name == 'endpoints'
-            handle_endpoints cpee, instance, @p[5]&.value if @p[5]&.name == 'endpoints'
-
             handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
             handle_starting cpee, instance, @p[0].value
           end
@@ -219,14 +258,12 @@ module CPEE
           (@status = 500) && return
         end
         customization = @p.find{ |e| e.name == 'customization' }&.value
+
+        tdoc = augment_testset(tdoc,@p)
         if (instance, uuid = load_testset(tdoc,cpee,name,customization)).first == -1
           @status = 500
         else
           EM.defer do
-            handle_data cpee, instance, @p[2]&.value if @p[2]&.name == 'init'
-            handle_endpoints cpee, instance, @p[2]&.value if @p[2]&.name == 'endpoints'
-            handle_endpoints cpee, instance, @p[3]&.value if @p[3]&.name == 'endpoints'
-
             handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
             handle_starting cpee, instance, @p[0].value
           end
@@ -261,11 +298,11 @@ module CPEE
           @p[data].value.read
         end
 
+        tdoc = augment_testset(tdoc,@p)
         if (instance, uuid = load_testset(tdoc,cpee)).first == -1
           @status = 500
         else
           EM.defer do
-            handle_data cpee, instance, @p[data+1]&.value
             handle_waiting cpee, instance, uuid, behavior, selfurl, cblist
             handle_starting cpee, instance, behavior
           end
@@ -293,19 +330,29 @@ module CPEE
         cblist   = @a[2]
         instance = @p[1].value
 
-        srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
-        res = srv.resource("/#{instance}/properties/attributes/uuid")
+        srv = Riddl::Client.new(cpee)
+        res = srv.resource("/#{instance}/properties/attributes/uuid/")
         status, response = res.get
 
         if status >= 200 && status < 300
-          uuid = XML::Smart::string(response.first.value).root.text
+          uuid = response.first.value
           handle_data cpee, instance, @p[2]&.value
           handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
           handle_starting cpee, instance, @p[0].value
+
+          send = {
+            'CPEE-INSTANCE' => instance,
+            'CPEE-INSTANCE-URL' => File.join(cpee,instance),
+            'CPEE-INSTANCE-UUID' => uuid,
+            'CPEE-BEHAVIOR' => @p[0].value
+          }
+
           if @p[0].value =~ /^wait/
             @headers << Riddl::Header.new('CPEE-CALLBACK','true')
           end
-          return Riddl::Parameter::Simple.new("url",cpee + instance)
+          Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
+        else
+          @status = 500
         end
       end
     end #}}}
@@ -375,7 +422,7 @@ module CPEE
             run InstantiateGit, opts[:cpee], opts[:self], opts[:cblist] if post 'git'
           end
           on resource 'instance' do
-            run HandleInstance, opts[:cpee] if post 'instance'
+            run HandleInstance, opts[:cpee], opts[:self], opts[:cblist] if post 'instance'
           end
           on resource 'callback' do
             on resource do

data/lib/cpee-instantiation/instantiation.xml

@@ -33,6 +33,9 @@
     <optional>
       <parameter name="endpoints" type="string"/>
     </optional>
+    <optional>
+      <parameter name="attributes" type="string"/>
+    </optional>
     <optional>
       <parameter name="customization" type="string"/>
     </optional>
@@ -53,6 +56,9 @@
     <optional>
       <parameter name="endpoints" type="string"/>
     </optional>
+    <optional>
+      <parameter name="attributes" type="string"/>
+    </optional>
     <optional>
       <parameter name="customization" type="string"/>
     </optional>

data/tools/cpee-instantiation

@@ -41,7 +41,7 @@ else
 end
 
 insta = "#{curpath}/../server/"
-if !File.exists?(p1)
+if !File.exist?(p1)
   FileUtils.cp_r(insta,p1)
 else
   FileUtils.cp_r(Dir.glob(File.join(insta,'*')).delete_if{|e| e =~ /\.conf/ },p1,remove_destination: true)

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cpee-instantiation
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.18
 platform: ruby
 authors:
 - Juergen eTM Mangler
+- Heinrich Fenkart
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -44,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: cpee
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Subprocess instantiation service for the cloud process execution engine (cpee.org)