rsmp 0.1.32 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7992be63350c61210d51f99a820314c3e8d9d7020e5e08e5000d2fb4a054e96e
-  data.tar.gz: b2b0d397391912c748fe6f1a9b7ea1896e17affaead760ac58b1df8b00355164
+  metadata.gz: ea326578bffa5b75bcd86c0829215d0111b3ba52c88bba7110cca3b9cc0f9fa9
+  data.tar.gz: b7d197a3430be8922429ce5ac5ce3512900d85b4b9d276d5d283f150082a3303
 SHA512:
-  metadata.gz: fce26ff77f208cfe072a0f672a66e75e64d7e73fa7fe61ca28604df64a4c1039cc566340338d5734b745bfadf7fdfc9b34ed6e444a78984e97a1e009f07e68c3
-  data.tar.gz: 698e829317c201896b52ac2a3f2c2c9258d947a64b2cf3b6f3dbc82fff987881c65603d3966437b4b699d6962cf1d38d30da1b31b3d09e2c24fa19519aa2cfbc
+  metadata.gz: '09ad5202d5feb194cdd9e54177f86910631ac260cd94e5afccdf1a386260de91063b438e5e6dc8675703fdaae8112036f6940793f7d3a266e84827ed38d465c1'
+  data.tar.gz: c37dcaac65b0c1a692ef95507ad25f1fa0e78bdfa089758b8511af331e2f47b1bb497cf1452442ad7f9fbf34f8860c9408eeb1674cb3084337ce4fd3b4f552eb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.32)
+    rsmp (0.1.33)
       async (~> 1.28.7)
       async-io (~> 1.30.2)
       colorize (~> 0.8.1)

data/lib/rsmp/component.rb

@@ -28,7 +28,7 @@ module RSMP
       @aggregated_status_bools[5] = true
     end
 
-    def set_aggregated_status status
+    def set_aggregated_status status, options={}
       status = [status] if status.is_a? Symbol
       raise InvalidArgument unless status.is_a? Array
       input = status & AGGREGATED_STATUS_KEYS
@@ -36,7 +36,7 @@ module RSMP
         AGGREGATED_STATUS_KEYS.each_with_index do |key,index|
           @aggregated_status_bools[index] = status.include?(key)
         end
-        aggrated_status_changed
+        aggrated_status_changed options
       end
     end
 
@@ -54,8 +54,8 @@ module RSMP
       end
     end
 
-    def aggrated_status_changed
-      @node.aggrated_status_changed self
+    def aggrated_status_changed options={}
+      @node.aggrated_status_changed self, options
     end
  
     def alarm code:, status:

data/lib/rsmp/components.rb

@@ -8,7 +8,7 @@ module RSMP
       @components = {}
     end
 
-    def aggrated_status_changed component
+    def aggrated_status_changed component, options={}
     end
 
     def setup_components settings

data/lib/rsmp/proxy.rb

@@ -528,18 +528,6 @@ module RSMP
     def version_acknowledged
     end
 
-    def wait_for_acknowledgement original, timeout
-      raise ArgumentError unless original
-      wait_for(@acknowledgement_condition,timeout) do |message|
-        if message.is_a?(MessageNotAck) && message.attributes["oMId"] == original.m_id
-          raise RSMP::MessageRejected.new(message.attributes['rea'])
-        end
-        message.is_a?(MessageAck) && message.attributes["oMId"] == original.m_id
-      end
-    rescue Async::TimeoutError
-      raise RSMP::TimeoutError.new("Acknowledgement for #{original.type} #{original.m_id} not received within #{timeout}s")
-    end
-
     def node
       raise 'Must be overridden'
     end
@@ -547,5 +535,29 @@ module RSMP
     def author
       node.site_id
     end
+
+    def wait_for_acknowledgement parent_task, options={}, m_id
+      collect(parent_task,options.merge({
+        type: ['MessageAck','MessageNotAck'],
+        num: 1
+      })) do |message|
+        if message.is_a?(MessageNotAck)
+          if message.attribute('oMId') == m_id
+            # set result to an exception, but don't raise it.
+            # this will be returned by the task and stored as the task result
+            # when the parent task call wait() on the task, the exception
+            # will be raised in the parent task, and caught by rspec.
+            # rspec will then show the error and record the test as failed
+            m_id_short = RSMP::Message.shorten_m_id m_id, 8
+            result = RSMP::MessageRejected.new "Aggregated status request #{m_id_short} was rejected: #{message.attribute('rea')}"
+            next true   # done, no more messages wanted
+          end
+        elsif message.is_a?(MessageAck)
+          next true if message.attribute('oMId') == m_id
+        end
+        false
+      end
+    end
+
   end
 end

data/lib/rsmp/site.rb

@@ -14,6 +14,7 @@ module RSMP
       super options
       @proxies = []
       @sleep_condition = Async::Notification.new
+      @proxies_condition = Async::Notification.new
     end
 
     def site_id
@@ -74,9 +75,9 @@ module RSMP
       SupervisorProxy.new settings
     end
 
-    def aggrated_status_changed component
+    def aggrated_status_changed component, options={}
       @proxies.each do |proxy|
-        proxy.send_aggregated_status component
+        proxy.send_aggregated_status component, options
       end
     end
 
@@ -91,9 +92,11 @@ module RSMP
         archive: @archive
       })
       @proxies << proxy
+      @proxies_condition.signal
       run_site_proxy task, proxy
     ensure
       @proxies.delete proxy
+      @proxies_condition.signal
     end
 
     def run_site_proxy task, proxy
@@ -142,5 +145,19 @@ module RSMP
       end
     end
 
+    def wait_for_supervisor ip, timeout
+      supervisor = find_supervisor ip
+      return supervisor if supervisor
+      wait_for(@proxy_condition,timeout) { find_supervisor ip }
+    rescue Async::TimeoutError
+      raise RSMP::TimeoutError.new "Supervisor '#{ip}' did not connect within #{timeout}s"
+    end
+
+    def find_supervisor ip
+      @proxies.each do |supervisor|
+        return supervisor if ip == :any || supervisor.ip == ip
+      end
+      nil
+    end
   end
 end

data/lib/rsmp/site_proxy.rb

@@ -134,7 +134,7 @@ module RSMP
       acknowledge message
     end
 
-    def aggrated_status_changed component
+    def aggrated_status_changed component, options={}
       @supervisor.aggregated_status_changed self, component
     end
 

data/lib/rsmp/site_proxy_wait.rb

@@ -2,24 +2,6 @@
 module RSMP
   module SiteProxyWait
 
-    def wait_for_status_updates parent_task, options={}, &send_block
-      send_while_collecting parent_task, send_block do |task, m_id|
-        collect_status_updates_or_responses task, 'StatusUpdate', options, m_id
-      end
-    end
-
-    def wait_for_status_responses parent_task, options={}, &send_block
-      send_while_collecting parent_task, send_block do |task, m_id|
-        collect_status_updates_or_responses task, 'StatusResponse', options, m_id
-      end
-    end
-
-    def wait_for_command_responses parent_task, options={}, &send_block
-      send_while_collecting parent_task, send_block do |task, m_id|
-        collect_command_responses task, options, m_id
-      end
-    end
-
     def wait_for_alarm parent_task, options={}
       matching_alarm = nil
       message = collect(parent_task,options.merge(type: "Alarm", with_message: true, num: 1)) do |message|
@@ -161,23 +143,6 @@ module RSMP
       true
     end
 
-    def send_while_collecting parent_task, send_block, &collect_block
-      m_id = RSMP::Message.make_m_id    # make message id so we can start waiting for it
-
-      # wait for command responses in an async task
-      task = parent_task.async do |task|
-        collect_block.call task, m_id
-      rescue StandardError => e
-        notify_error e, level: :internal
-      end
-
-       # call block, it should send command request using the given m_id
-      send_block.call m_id
-
-      # wait for the response and return it, raise exception if NotAck received, it it timed out
-      task.wait
-    end
-
     def wait_for_aggregated_status parent_task, options={}
       collect(parent_task,options.merge({
         type: ['AggregatedStatus','MessageNotAck'],

data/lib/rsmp/supervisor_proxy.rb

@@ -123,15 +123,28 @@ module RSMP
       @version_determined = true
     end
 
-    def send_aggregated_status component
+    def send_aggregated_status component, options={}
+      m_id = options[:m_id] || RSMP::Message.make_m_id
       message = AggregatedStatus.new({
         "aSTS" => clock.to_s,
         "cId" =>  component.c_id,
         "fP" => 'NormalControl',
         "fS" => nil,
-        "se" => component.aggregated_status_bools
+        "se" => component.aggregated_status_bools,
+        "mId" => m_id
       })
-      send_message message
+
+      if options[:collect]
+        result = nil
+        task = @task.async do |task|
+          wait_for_acknowledgement task, options[:collect], m_id
+        end
+        send_message message, validate: options[:validate]
+        return message, task.wait
+      else
+        send_message message, validate: options[:validate]
+        message
+      end
     end
 
     def process_aggregated_status message

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.32"
+  VERSION = "0.1.33"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async