rsmp 0.16.8 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4060389b1398d8bf006419c7536bced8d46dfdb2d6852fe1ce625d08f913eda
-  data.tar.gz: 4623b52e36898a400f82a7b9807c1437010e39509c91d3a693165a6766d75a84
+  metadata.gz: 1892a38bd08ed7d72ab19c3807bf142249c5a1a86784b88e19ca126e73a07aa1
+  data.tar.gz: 5aa9489971886d03b93dc2de1130cffa736bbe0184167b51638da601e2622777
 SHA512:
-  metadata.gz: 8422abc49a3db9d5d9239612ff81af6cb741945e16231b96292c80bc1a6d2e072a62ddc204373a67efc3afbfb7eb9cafcbc3c060c292a589335ba6a13ed8f490
-  data.tar.gz: 5f8a271d7e76d0c0e710c457861a36260bfdd26fdbc69b66ea1035c6c6927512c1a5a8191f8e2ae0b87b763393e178fb0f72228a9d7574719bf2d6c411cff7c3
+  metadata.gz: 39ee3bbf2fe62b0929696f955e08d3839b46486357207461d4024ae5a090f4812a9d04d93ee85f974bdd5de9eb9c1999e68ece874079baee2dbb36eb269cf6eb
+  data.tar.gz: 35d5eb80b1f68f04b196250d9976be66e3663886e39d325b5f6a954008da6fa479ef59f78c22549620c1bc3d85bae9b195af95bc8ecbc08ebf186d037715c938

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rsmp (0.16.8)
+    rsmp (0.17.0)
       async (~> 1.30.3)
       async-io (~> 1.33.0)
       colorize (~> 0.8.1)
-      rsmp_schema (~> 0.3.2)
+      rsmp_schema (~> 0.4.0)
       thor (~> 1.2.1)
 
 GEM
@@ -27,7 +27,7 @@ GEM
     builder (3.2.4)
     childprocess (4.1.0)
     colorize (0.8.1)
-    console (1.15.3)
+    console (1.16.2)
       fiber-local
     contracts (0.17)
     cucumber (7.1.0)
@@ -68,7 +68,7 @@ GEM
     ffi (1.15.5-x64-mingw32)
     fiber-local (1.0.0)
     hana (1.3.7)
-    json_schemer (0.2.21)
+    json_schemer (0.2.24)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
@@ -77,10 +77,10 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     multi_test (0.1.2)
-    nio4r (2.5.8)
+    nio4r (2.5.9)
     rake (13.0.6)
-    regexp_parser (2.5.0)
-    rsmp_schema (0.3.2)
+    regexp_parser (2.7.0)
+    rsmp_schema (0.4.0)
       json_schemer (~> 0.2.21)
       thor (~> 1.2.1)
     rspec (3.10.0)
@@ -100,7 +100,7 @@ GEM
       ffi (~> 1.1)
     thor (1.2.1)
     timecop (0.9.5)
-    timers (4.3.4)
+    timers (4.3.5)
     uri_template (0.7.0)
 
 PLATFORMS

data/config/tlc.yaml

@@ -58,6 +58,3 @@ log:
   debug: true
   json: true
 live_output: tmp/tlc.state
-skip_validation:
-  - AlarmSuspend
-  - AlarmResume

data/lib/rsmp/proxy.rb

@@ -648,8 +648,10 @@ module RSMP
       message.attributes['xNId'] = (main && main.xNId) ? main.xNId : ''
     end
 
-    # use Gem class to check version requirement
-    def self.version_requirement_met? requirement, version
+    # Use Gem class to check version requirement
+    # Requirement must be a string like '1.1', '>=1.0.3' or '<2.1.4',
+    # or list of strings, like ['<=1.4','<1.5']
+    def self.version_meets_requirement? version, requirement
       Gem::Requirement.new(requirement).satisfied_by?(Gem::Version.new(version))
     end
 

data/lib/rsmp/supervisor_proxy.rb

@@ -276,23 +276,13 @@ module RSMP
       v.to_s
     end
 
-    # get name of q field, depending on the core version we're using
-    # it changed from 'ageState' to 'q' in version 3.1.3
-    def q_key
-      if Proxy.version_requirement_met? '>=3.1.3', core_version
-        q_key = 'q'
-      else
-        q_key = 'ageState'
-      end
-    end
-
     def process_status_request message, options={}
       component_id = message.attributes["cId"]
       component = @site.find_component component_id
       log "Received #{message.type}", message: message, level: :log
       sS = message.attributes["sS"].map do |arg|
         value, quality =  component.get_status arg['sCI'], arg['n'], {sxl_version: sxl_version}
-        { "s" => rsmpify_value(value), q_key => quality.to_s }.merge arg
+        { "s" => rsmpify_value(value), "q" => quality.to_s }.merge arg
       end
       response = StatusResponse.new({
         "cId"=>component_id,
@@ -430,7 +420,7 @@ module RSMP
             sS << { "sCI" => code,
                      "n" => status_name,
                      "s" => rsmpify_value(value),
-                     q_key => quality }
+                     "q" => quality }
           end
         end
         update = StatusUpdate.new({

data/lib/rsmp/tlc/traffic_controller.rb

@@ -796,7 +796,7 @@ module RSMP
       end
 
       def handle_s0091 status_code, status_name=nil, options={}
-        if Proxy.version_requirement_met? '>=1.1',options[:sxl_version]
+        if Proxy.version_requirement_met? options[:sxl_version], '>=1.1'
           case status_name
           when 'user'
             TrafficControllerSite.make_status 0
@@ -812,7 +812,7 @@ module RSMP
       end
 
       def handle_s0092 status_code, status_name=nil, options={}
-        if Proxy.version_requirement_met? '>=1.1',options[:sxl_version]
+        if Proxy.version_requirement_met? options[:sxl_version], '>=1.1'
           case status_name
           when 'user'
             TrafficControllerSite.make_status 0

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.16.8"
+  VERSION = "0.17.0"
 end

data/rsmp.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "async-io", "~> 1.33.0"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.2.1"
-  spec.add_dependency "rsmp_schema", "~> 0.3.2"
+  spec.add_dependency "rsmp_schema", "~> 0.4.0"
 
   spec.add_development_dependency "bundler", "~> 2.3.7"
   spec.add_development_dependency "rake", "~> 13.0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.16.8
+  version: 0.17.0
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement