rsmp 0.19.3 → 0.19.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8702928138cf433b9d0744b92af2d9e535292342ba5e18bd22fcc3985f341a11
-  data.tar.gz: 27a689a67e585f1da3c40feeda85468f9d7a7306c19437be156d4162b55f7024
+  metadata.gz: ece63f3127c2afec9954b9395079a4f6bd755c1edfa1ebd86a5b656e0eb3ae7b
+  data.tar.gz: d2649a64d7905095f0c418bc3ad8dcae3e6b5c891a784e7fbdc1841f4b17e2db
 SHA512:
-  metadata.gz: 91b20a0cee412984bd269083fd67864175c0c0c1d5627cd9003369cc63e1413c97e9c3b49c135e7328f372fcec9d95cd1f8c0edc54bf692400c4a20109d66137
-  data.tar.gz: dadfc9ba3cfba8ddd0dc82318299a78ef4f7101ff9708e61d3bbe1b54280aac42f9d5111bf9e102dbf8a0b4f1d0c401dbc4471f55b0a760713ab4374be83e781
+  metadata.gz: 70a4b8297b24a0f7d5ffeba0b86ec26bae1d196e01d46d6b06a1cc8ab50b14705f28ecf50ca30f0d4e2487c790781e71e80e6a4c0c4d39dda08ccc98c8e1235c
+  data.tar.gz: f5f4071e92f737153bc989787626d09cd96cf24204f13e2aaf91a49383876cc6bb2ae6ee763f82a08f779806e908e7236790b98315076c652078e95670a04a11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.19.3)
+    rsmp (0.19.5)
       async (~> 1.30.3)
       async-io (~> 1.34.3)
       colorize (~> 0.8.1)

data/lib/rsmp/alarm_state.rb

@@ -1,33 +1,53 @@
 module RSMP
-  # class that tracks the state of an alarm
+
+  # The state of an alarm on a component.
+  # The alarm state is for a particular alarm code,
+  # a component typically have an alarm state for each
+  # alarm code that is defined for the component type.
+
   class AlarmState
     attr_reader :component_id, :code, :acknowledged, :suspended, :active, :timestamp, :category, :priority, :rvs
 
-    def initialize component:, code:
+    def self.create_from_message component, message
+      self.new(
+        component: component,
+        code: message.attribute("aCId"),
+        timestamp: RSMP::Clock.parse(message.attribute('aTs')),
+        acknowledged: message.attribute('ack') == 'Acknowledged',
+        suspended: message.attribute('aS') == 'suspended',
+        active: message.attribute('sS') == 'Active',
+        category: message.attribute('cat'),
+        priority: message.attribute('pri').to_i,
+        rvs: message.attribute('rvs')
+      )
+    end
+
+    def initialize component:, code:, 
+        suspended: false, acknowledged: false, active: false, timestamp: nil,
+        category: 'D', priority: 2, rvs: []
       @component = component
       @component_id = component.c_id
       @code = code
-      @suspended = false
-      @acknowledged = false
-      @suspended = false
-      @active = false
-      @timestamp = nil
-      @category = 'D'
-      @priority = 2
-      @rvs = []
+      @suspended = !!suspended
+      @acknowledged = !!acknowledged 
+      @active = !!active
+      @timestamp =  timestamp
+      @category = category || 'D'
+      @priority = priority || 2
+      @rvs = rvs
     end
 
     def to_hash
       {
-        'cId' => component_id,
-        'aCId' => code,
-        'aTs' => Clock.to_s(timestamp),
-        'ack' => (acknowledged ? 'Acknowledged' : 'notAcknowledged'),
-        'sS' => (suspended ? 'suspended' : 'notSuspended'),
-        'aS' => (active ? 'Active' : 'inActive'),
-        'cat' => category,
-        'pri' => priority.to_s,
-        'rvs' => rvs
+        'cId' => @component_id,
+        'aCId' => @code,
+        'aTs' => Clock.to_s(@timestamp),
+        'ack' => (@acknowledged ? 'Acknowledged' : 'notAcknowledged'),
+        'sS' => (@suspended ? 'suspended' : 'notSuspended'),
+        'aS' => (@active ? 'Active' : 'inActive'),
+        'cat' => @category,
+        'pri' => @priority.to_s,
+        'rvs' => @rvs
       }
     end
 
@@ -65,46 +85,36 @@ module RSMP
     end
     
     def update_timestamp
-      @timestamp = @component.node.clock.now
-    end
-
-    def to_message specialization:
-      Alarm.new(
-        'cId' => @component_id,
-        'aSp' => specialization,
-        'aCId' => @code,
-        'aTs' => Clock.to_s(@timestamp),
-        'ack' => (@acknowledged ? 'Acknowledged' : 'notAcknowledged'),
-        'sS' => (@suspended ? 'suspended' : 'notSuspended'),
-        'aS' => (@active ? 'Active' : 'inActive'),
-        'cat' => @category,
-        'pri' => @priority.to_s,
-        'rvs' => @rvs
-      )
+      @timestamp = @component.now
     end
 
     def differ_from_message? message
-      return true if @timestamp != message.attribute('aTs')
-      return true if message.attribute('ack') && @acknowledged != (message.attribute('ack') == 'True')
-      return true if message.attribute('sS') && @suspended != (message.attribute('sS') == 'True')
-      return true if message.attribute('aS') && @active != (message.attribute('aS') == 'True')
+      return true if RSMP::Clock.to_s(@timestamp) != message.attribute('aTs')
+      return true if message.attribute('ack') && @acknowledged != (message.attribute('ack') == 'Acknowledged')
+      return true if message.attribute('sS') && @suspended != (message.attribute('sS') == 'suspended')
+      return true if message.attribute('aS') && @active != (message.attribute('aS') == 'Active')
       return true if message.attribute('cat') && @category != message.attribute('cat')
       return true if message.attribute('pri') && @priority != message.attribute('pri').to_i
       #return true @rvs = message.attribute('rvs')
       false
     end
 
+    def older_message? message
+      return false if @timestamp == nil
+      RSMP::Clock.parse(message.attribute('aTs')) < @timestamp
+    end
+
     # update from rsmp message
     # component id, alarm code and specialization are not updated
     def update_from_message message
       unless differ_from_message? message
         raise RepeatedAlarmError.new("no changes from previous alarm #{message.m_id_short}")
       end
-      if Time.parse(message.attribute('aTs')) < Time.parse(message.attribute('aTs'))
+      if older_message? message
         raise TimestampError.new("timestamp is earlier than previous alarm #{message.m_id_short}")
       end
     ensure
-      @timestamp = message.attribute('aTs')
+      @timestamp = RSMP::Clock.parse message.attribute('aTs')
       @acknowledged = message.attribute('ack') == 'True'
       @suspended = message.attribute('sS') == 'True'
       @active = message.attribute('aS') == 'True'

data/lib/rsmp/component_base.rb

@@ -30,6 +30,10 @@ module RSMP
       @alarms = {}
     end
 
+    def now
+      node.now
+    end
+
     def get_alarm_state alarm_code
       alarm = @alarms[alarm_code] ||= RSMP::AlarmState.new component: self, code: alarm_code
     end

data/lib/rsmp/message.rb

@@ -233,7 +233,7 @@ module RSMP
   class AlarmIssue < Alarm
     def initialize attributes = {}
       super({
-        "aSp" => "Issue",
+        "aSp" => "Issue"
       }.merge attributes)
     end
   end

data/lib/rsmp/node.rb

@@ -8,7 +8,7 @@ module RSMP
 
     attr_reader :archive, :logger, :task, :deferred, :error_queue, :clock, :collector
 
-    def initialize options
+    def initialize options={}
       initialize_logging options
       initialize_task
       @deferred = []
@@ -18,6 +18,10 @@ module RSMP
       @collect = options[:collect]
     end
 
+    def now
+      clock.now
+    end
+
     # stop proxies, then call super
     def stop_subtasks
       @proxies.each { |proxy| proxy.stop }

data/lib/rsmp/proxy.rb

@@ -24,6 +24,11 @@ module RSMP
       @state = :disconnected
     end
 
+
+    def now
+      node.now
+    end
+
     def disconnect
     end
 

data/lib/rsmp/rsmp.rb

@@ -38,5 +38,8 @@ module RSMP
       (time || now).strftime("%FT%T.%3NZ")
     end
 
+    def self.parse str
+      Time.parse(str)
+    end
   end
 end

data/lib/rsmp/site.rb

@@ -97,18 +97,15 @@ module RSMP
     end
 
     def alarm_acknowledged alarm_state
-      alarm = AlarmAcknowledged.new( alarm_state.to_hash )
-      send_alarm alarm
+      send_alarm AlarmAcknowledged.new( alarm_state.to_hash )
     end
 
     def alarm_suspended_or_resumed alarm_state
-      alarm = AlarmSuspended.new( alarm_state.to_hash.merge('aSp' => 'Suspend') )
-      send_alarm alarm
+      send_alarm AlarmSuspended.new( alarm_state.to_hash )
     end
 
     def alarm_activated_or_deactivated alarm_state
-      alarm = AlarmIssue.new( alarm_state.to_hash.merge('aSp' => 'Issue') )
-      send_alarm alarm
+      send_alarm AlarmIssue.new( alarm_state.to_hash )
     end
 
     def send_alarm alarm

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.19.3"
+  VERSION = "0.19.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.19.5
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async