rsmp 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cabe89d692eb93c0d2e5af449152ff5967b1318fd0163384a57c975673ffe87
-  data.tar.gz: cb53ef7c36c6609eed242e67db16fbf7a57455ca06de90599cb15e324a4cbc87
+  metadata.gz: 0df1c6fd543202b5e5364133461d565269e5301976301c029e2d4311e6e74611
+  data.tar.gz: 2944466c2816349afe4f350052bb7756909a271d8466aa954294d905c1e69ae4
 SHA512:
-  metadata.gz: 9520a1bd0b66eb19d7b17fda09cc8fcd1efb2219c098bf315faa0d04ba953a0e4b5ab823a8bbc425697635fac49e04b777b9dd2ec481f7651c0397c832aed2b0
-  data.tar.gz: a09905ee1f2128a44cbff599f36fa166601a69d97bd2f814c4d0523dfb68bbe5deafdea599b42d6dc9a251e14a48fb5b8b5f8b5a32af2b3dd8ada964b928b59b
+  metadata.gz: 5341c781360c44b1a68fd6c483618fc61d580986ba846fc85192ab02dae3318a526d66dcf911ca84518ad02e2b5263c7149c76df135afc589c6a2c75047bdbd7
+  data.tar.gz: 4023179107aac97ef4fa93daee1932e0b6cfbf4a1f11ae42c1831ea3970813737ae9127667578c1515dbad51d93277274999ab2aece8f3acc08d2450e0c15cac

data/.gitmodules

@@ -1,3 +1,4 @@
 [submodule "rsmp_schema"]
 	path = lib/rsmp_schema
-	url = git@github.com:rsmp-nordic/rsmp_schema.git
+        url = git@github.com:rsmp-nordic/rsmp_schema.git
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.6)
+    rsmp (0.1.7)
       async (~> 1.23.0)
       async-io (~> 1.27.1)
       colorize (~> 0.8.1)

data/config/supervisor.yaml

@@ -1,10 +1,13 @@
 site_id: RN+SU0001
 port: 12111
 rsmp_versions:
+  - 3.1.1
+  - 3.1.2
+  - 3.1.3
   - 3.1.4
 
-watchdog_interval: 1
-watchdog_timeout: 2
+watchdog_interval: 5
+watchdog_timeout: 10
 acknowledgement_timeout: 2
 store_messages: false
 command_response_timeout: 1
@@ -12,6 +15,7 @@ status_response_timeout: 1
 status_update_timeout: 1
 
 sites:
+  KK+AG9998:       # dynniq test tlc
   AA+BBCCC=DDD:    # rsmp simulator
   RN+SI0001:       # ruby rsmp site
 

data/lib/rsmp/base.rb

@@ -15,8 +15,8 @@ module RSMP
     end
 
     def log str, options={}
-      default = { level: :log, author: author }
-      prepared = RSMP::Archive.prepare_item default.merge(options.merge str: str)
+      default = { str:str, level: :log, author: author }
+      prepared = RSMP::Archive.prepare_item default.merge(options)
       @archive.add prepared
       @logger.log prepared
       prepared

data/lib/rsmp/error.rb

@@ -41,4 +41,6 @@ module RSMP
 	class ConnectionError < Error
 	end
 
+	class UnknownComponent < Error
+	end
 end

data/lib/rsmp/logger.rb

@@ -57,6 +57,7 @@ module RSMP
       return false if @settings["info"] == false && item[:level] == :info
       return false if @settings["debug"] != true && item[:level] == :debug
       return false if @settings["statistics"] != true && item[:level] == :statistics
+      return false if @settings["test"] != true && item[:level] == :test
 
       if item[:message]
         type = item[:message].type
@@ -96,6 +97,8 @@ module RSMP
           str.colorize(:light_blue)
         when :statistics
           str.colorize(:light_black)
+        when :test
+          str.colorize(:light_magenta)
         else
           str
         end

data/lib/rsmp/proxy.rb

@@ -179,9 +179,12 @@ module RSMP
     end
 
     def check_watchdog_timeout now
+
       timeout = @settings["watchdog_timeout"]
       latest = @latest_watchdog_received + timeout
-      if now > latest
+      left = latest - now
+      log "check watchdog, time:#{timeout}, last:#{@latest_watchdog_received}, now: #{now}, latest:#{latest}, left #{left}, fail:#{left<0}", level: :debug
+      if left < 0
         log "No Watchdog within #{timeout} seconds, received at #{@latest_watchdog_received}, now is #{now}, diff #{now-latest}", level: :error
         stop
         return true
@@ -354,11 +357,11 @@ module RSMP
       @state
     end
 
-    def send_version rsmp_versions
+    def send_version site_id_array, rsmp_versions
       versions_hash = [rsmp_versions].flatten.map {|v| {"vers" => v} }
       version_response = Version.new({
         "RSMP"=>versions_hash,
-        "siteId"=>[{"sId"=>@settings["site_id"]}],
+        "siteId"=>site_id_array,
         "SXL"=>sxl_version
       })
       send_message version_response

data/lib/rsmp/site_base.rb

@@ -26,5 +26,11 @@ module RSMP
       Component.new id: id, node: self, grouped: true
     end
 
+    def find_component component_id
+      component = @components[component_id]
+      raise UnknownComponent.new("Component #{component_id} not found") unless component
+      component
+    end
+
   end
 end

data/lib/rsmp/site_proxy.rb

@@ -53,7 +53,8 @@ module RSMP
       log "Received Version message for sites [#{@site_ids.join(',')}] using RSMP #{rsmp_version}", message: message, level: :log
       start_timer
       acknowledge message
-      send_version rsmp_version
+      send_version message.attributes['siteId'], rsmp_version
+
       @version_determined = true
 
       site_id = @site_ids.first
@@ -81,6 +82,7 @@ module RSMP
       if component == nil
         if @site_settings == nil || @site_settings['components'] == nil
           component = build_component c_id
+          @components[c_id] = component
           log "Adding component #{c_id} to site #{site_id}", level: :info
         else
           reason = "component #{c_id} not found"
@@ -158,7 +160,7 @@ module RSMP
       item[:message] if item
     end
 
-    def subscribe_to_status component, status_list
+    def subscribe_to_status component, status_list, timeout
       raise NotReady unless @state == :ready
       message = RSMP::StatusSubscribe.new({
           "ntsOId" => '',
@@ -167,7 +169,7 @@ module RSMP
           "sS" => status_list
       })
       send_message message
-      message
+      return message, wait_for_status_update(component: component, timeout: timeout)
     end
 
     def unsubscribe_to_status component, status_list
@@ -189,8 +191,19 @@ module RSMP
 
     def wait_for_status_update options={}
       raise ArgumentError unless options[:component]
-      item = @archive.capture(options.merge(type: "StatusUpdate", with_message: true, num: 1)) do |item|
-        # check component
+      item = @archive.capture(@task,options.merge(type: "StatusUpdate", with_message: true, num: 1)) do |item|
+        # TODO check components
+        found = false
+        sS = item[:message].attributes['sS']
+        sS.each do |status|
+          break if options[:sCI] && options[:sCI] != status['sCI']
+          break if options[:n] && options[:n] != status['n']
+          break if options[:q] && options[:q] != status['q']
+          break if options[:s] && options[:s] != status['s']
+          found = true
+          break
+        end
+        found
       end
       item[:message] if item
     end

data/lib/rsmp/supervisor.rb

@@ -186,7 +186,7 @@ module RSMP
     def find_allowed_site_setting site_id
       return {} unless @supervisor_settings['sites']
       @supervisor_settings['sites'].each_pair do |id,settings|
-        if id == site_id
+        if id == :any || id == site_id
           return settings
         end
       end

data/lib/rsmp/supervisor_proxy.rb

@@ -156,6 +156,9 @@ module RSMP
     end
 
     def process_status_request message
+      component_id = message.attributes["cId"]
+      component = @site.find_component component_id
+
       log "Received #{message.type}", message: message, level: :log
       sS = message.attributes["sS"].clone.map do |request|
         request["s"] = rand(100).to_s
@@ -163,12 +166,14 @@ module RSMP
         request
       end
       response = StatusResponse.new({
-        "cId"=>message.attributes["cId"],
+        "cId"=>component_id,
         "sTs"=>RSMP.now_string,
         "sS"=>sS
       })
       acknowledge message
       send_message response
+    rescue UnknownComponent => e
+      dont_acknowledge message, '', e.to_s
     end
 
     def process_status_subcribe message

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/rsmp_schema/schema/core/alarm.json

@@ -9,33 +9,33 @@
     "aSp" : {
       "description" : "Alarm message variant",
       "type" : "string",
-      "enum" : [ "Issue", "Acknowledge", "Suspend", "Resume" ]  
+      "enum" : [ "issue", "acknowledge", "suspend", "resume" ]
     },
     "ack" : {
       "description" : "Acknowledgement",
       "type" : "string",
-      "enum" : [ "Acknowledged", "notAcknowledged" ]  
+      "enum" : [ "acknowledged", "notAcknowledged" ]
     },
     "aS" : {
       "description" : "Status",
       "type" : "string",
-      "enum" : [ "inActive", "Active" ]  
+      "enum" : [ "inactive", "active" ]
     },
     "sS" : {
       "description" : "Suspended",
       "type" : "string",
-      "enum" : [ "suspended", "notSuspended" ]  
+      "enum" : [ "suspended", "notSuspended" ]
     },
     "aTs" : { "$ref": "definitions.json#/timestamp" },
     "cat" : {
       "description" : "Category",
       "type" : "string",
-      "enum" : [ "T", "D" ]  
+      "enum" : [ "T", "D" ]
     },
     "pri" : {
       "description" : "Priority",
       "type" : "string",
-      "enum" : [ "1", "2", "3" ]  
+      "enum" : [ "1", "2", "3" ]
     },
     "rvs" : {
       "description" : "Return values",

data/lib/rsmp_schema/schema/core/definitions.json

@@ -21,7 +21,7 @@
     "description" : "Version",
     "type": "string",
     "$comment" : "Example: 1.2.3 or 1.2",
-    "pattern" : "^[0-9]{1,2}\\.[0-9]{1,2}(\\.[0-9]{1,2})?$"
+    "pattern" : "^[0-9]{1,2}\\.[0-9]{1,2}(\\.[0-9]{1,2})?"
   },
   "command_code": {
     "description" : "Command code id",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Emil Tin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async