rsmp 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1840c079564613302ef539e2c0a502c2cafdabe8c875ab2dfb3b389470becf8
-  data.tar.gz: 35eda6efcfabe4624ba58d5150b3c1263a34a2a0b1f363b1a704566acc65cfed
+  metadata.gz: dfc37b07159cf717f60f293434f6fda0ff6935ad209967b7d5ddb025a9794600
+  data.tar.gz: 5c5e6b1e7728bdffd50776e95a7beb0fd6261dbb58b4ec3f530f7b33ee15cdf4
 SHA512:
-  metadata.gz: 32c6bb82731643e24000e2056a19896fa591755b1336ccad74df28b82ee9800cdb16ee96e6d6e1996e09137fa22cfed5c64801d8b131953a4abc94d32ba9ab08
-  data.tar.gz: d588d1e92eb16473ee86e25e0a595d6bd03c4744f113860bbe89be6f3c3df6ab19bb522daea617f28e8b32708a048d4a2895700cda8de34fed6fd986de85c6a4
+  metadata.gz: 201cad0d07ee914d79af82d8ad2ee10740fbe49002e1f3cbb2740b3d573df61c26532688651e6f6f70ea538e0475f51cbe0a46055b2b6331cd5fff48aa4b8d3e
+  data.tar.gz: 74a44c4ac848c9dbe5f0fbd772f2839c5565a8322d7292218d64f7e31f5fdf8e4849e59845fee361d0ca1ed0ecaa2ce067fdc71a86eaf0e50959e0d826742b2f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.13.1)
+    rsmp (0.13.2)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)
@@ -68,7 +68,7 @@ GEM
     ffi (1.15.5-x64-mingw32)
     fiber-local (1.0.0)
     hana (1.3.7)
-    json_schemer (0.2.20)
+    json_schemer (0.2.21)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
@@ -79,7 +79,7 @@ GEM
     multi_test (0.1.2)
     nio4r (2.5.8)
     rake (13.0.6)
-    regexp_parser (2.3.1)
+    regexp_parser (2.4.0)
     rsmp_schemer (0.4.0)
       json_schemer (~> 0.2.18)
     rspec (3.10.0)

data/lib/rsmp/component.rb

@@ -1,7 +1,7 @@
 module RSMP
   # RSMP component
   class Component < ComponentBase
-    def initialize node:, id:, grouped: false
+    def initialize node:, id:, ntsOId: nil, xNId: nil, grouped: false
       super
     end
 

data/lib/rsmp/component_base.rb

@@ -5,7 +5,8 @@ module RSMP
   class ComponentBase
     include Inspect
 
-    attr_reader :c_id, :node, :alarms, :statuses, :aggregated_status, :aggregated_status_bools, :grouped
+    attr_reader :c_id, :ntsOId, :xNId, :node, :alarms, :statuses,
+      :aggregated_status, :aggregated_status_bools, :grouped
 
     AGGREGATED_STATUS_KEYS = [ :local_control,
                                :communication_distruption,
@@ -16,8 +17,13 @@ module RSMP
                                :rest,
                                :not_connected ]
 
-    def initialize node:, id:, grouped: false
+    def initialize node:, id:,  ntsOId: nil, xNId: nil, grouped: false
+      if grouped==false && (ntsOId || xNId)
+        raise RSMP::ConfigurationError.new("ntsOId and xNId are only allowed for grouped objects")
+      end
       @c_id = id
+      @ntsOId = ntsOId
+      @xNId = xNId
       @node = node
       @grouped = grouped
       clear_aggregated_status

data/lib/rsmp/proxy.rb

@@ -643,5 +643,13 @@ module RSMP
         return { sent: message }
       end
     end
+
+    def set_nts_message_attributes message
+      return unless @site && @site.main
+      ntsOId =  @site.main.ntsOId
+      xNId =  @site.main.xNId
+      message.attributes['ntsOId'] = ntsOId if ntsOId
+      message.attributes['xNId'] = xNId if xNId
+    end
   end
 end

data/lib/rsmp/site_proxy.rb

@@ -114,13 +114,11 @@ module RSMP
     def request_aggregated_status component, options={}
       validate_ready 'request aggregated status'
       m_id = options[:m_id] || RSMP::Message.make_m_id
-
       message = RSMP::AggregatedStatusRequest.new({
-          "ntsOId" => @ntsOId,
-          "xNId" => @xNId,
-          "cId" => component,
-          "mId" => m_id
+        "cId" => component,
+        "mId" => m_id
       })
+      set_nts_message_attributes message
       send_and_optionally_collect message, options do |collect_options|
         AggregatedStatusCollector.new(
           self,
@@ -187,12 +185,11 @@ module RSMP
       request_list = status_list.map { |item| item.slice('sCI','n') }
 
       message = RSMP::StatusRequest.new({
-          "ntsOId" => @ntsOId,
-          "xNId" => @xNId,
           "cId" => component,
           "sS" => request_list,
           "mId" => m_id
       })
+      set_nts_message_attributes message
       send_and_optionally_collect message, options do |collect_options|
         StatusCollector.new(
           self,
@@ -232,12 +229,11 @@ module RSMP
       component.allow_repeat_updates subscribe_list
 
       message = RSMP::StatusSubscribe.new({
-          "ntsOId" => @ntsOId,
-          "xNId" => @xNId,
           "cId" => component_id,
           "sS" => subscribe_list,
           'mId' => m_id
       })
+      set_nts_message_attributes message
       send_and_optionally_collect message, options do |collect_options|
         StatusCollector.new(
           self,
@@ -262,11 +258,10 @@ module RSMP
       end
 
       message = RSMP::StatusUnsubscribe.new({
-        "ntsOId" => @ntsOId,
-        "xNId" => @xNId,
         "cId" => component_id,
         "sS" => status_list
       })
+      set_nts_message_attributes message
       send_message message, validate: options[:validate]
       message
     end
@@ -292,12 +287,11 @@ module RSMP
       validate_ready 'send command'
       m_id = options[:m_id] || RSMP::Message.make_m_id
       message = RSMP::CommandRequest.new({
-          "ntsOId" => @ntsOId,
-          "xNId" => @xNId,
           "cId" => component,
           "arg" => command_list,
           "mId" => m_id
       })
+      set_nts_message_attributes message
       send_and_optionally_collect message, options do |collect_options|
         CommandResponseCollector.new(
           self,
@@ -369,8 +363,6 @@ module RSMP
       @site_settings = find_site_settings @site_id
       if @site_settings
         @sxl = @site_settings['sxl']
-        @ntsOId = @site_settings['ntsOId']
-        @xNId = @site_settings['xNId']
         setup_components @site_settings['components']
       else
         dont_acknowledge message, 'Rejected', "No config found for site #{@site_id}"

data/lib/rsmp/supervisor_proxy.rb

@@ -15,8 +15,6 @@ module RSMP
       @port = options[:port]
       @status_subscriptions = {}
       @sxl = @site_settings['sxl']
-      @ntsOId = @site_settings['ntsOId']
-      @xNId = @site_settings['xNId']
       @synthetic_id = Supervisor.build_id_from_ip_port @ip, @port
     end
 
@@ -162,9 +160,7 @@ module RSMP
         "se" => component.aggregated_status_bools,
         "mId" => m_id,
       })
-      message.attributes['ntsOId'] = @site_settings['ntsOId'] if @site_settings['ntsOId']
-      message.attributes['xNId'] = @site_settings['xNId'] if @site_settings['xNId']
-
+      set_nts_message_attributes message
       send_and_optionally_collect message, options do |collect_options|
         Collector.new self, collect_options.merge(task:@task, type: 'MessageAck')
       end

data/lib/rsmp/tlc/traffic_controller.rb

@@ -9,9 +9,9 @@ module RSMP
         :functional_position,
         :startup_sequence_active, :startup_sequence, :startup_sequence_pos
 
-      def initialize node:, id:, cycle_time: 10, signal_plans:,
+      def initialize node:, id:, ntsOId: nil, xNId: nil, cycle_time: 10, signal_plans:,
           startup_sequence:, live_output:nil, inputs:{}
-        super node: node, id: id, grouped: true
+        super node: node, id: id, ntsOId: ntsOId, xNId: xNId, grouped: true
         @signal_groups = []
         @detector_logics = []
         @plans = signal_plans

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -52,7 +52,10 @@ module RSMP
       def build_component id:, type:, settings:{}
         component = case type
         when 'main'
-          @main = TrafficController.new node: self, id: id,
+          @main = TrafficController.new node: self,
+            id: id,
+            ntsOId: settings['ntsOId'],
+            xNId: settings['xNId'],
             cycle_time: settings['cycle_time'],
             startup_sequence: @startup_sequence,
             signal_plans: @signal_plans,

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async