rsmp 0.1.21 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aea7740c0640bc069efa1ec9426deb23b3bf4e3f7dce4656e3df814500615d3
-  data.tar.gz: 30d954a75a62d71d46b76b30e448dbc2e30281784f18b82488780e9837b1223b
+  metadata.gz: 7992be63350c61210d51f99a820314c3e8d9d7020e5e08e5000d2fb4a054e96e
+  data.tar.gz: b2b0d397391912c748fe6f1a9b7ea1896e17affaead760ac58b1df8b00355164
 SHA512:
-  metadata.gz: 7a42695cbf11f334d1873843a2550e7734d7719e8fca7ef245d32946d71aa884b6305ff329afbd1713caec41bf213bd0aab62d4f91f5d685c05ed5ce929c68f6
-  data.tar.gz: 3e6c90b6aa6d505285fc27613ce06716f5a00a21893d266cb2e31e0c0f99ea2784610f30f9c4a583c129e95c94770c84a08aabcc6e0e35accfc70b94f3aa2e60
+  metadata.gz: fce26ff77f208cfe072a0f672a66e75e64d7e73fa7fe61ca28604df64a4c1039cc566340338d5734b745bfadf7fdfc9b34ed6e444a78984e97a1e009f07e68c3
+  data.tar.gz: 698e829317c201896b52ac2a3f2c2c9258d947a64b2cf3b6f3dbc82fff987881c65603d3966437b4b699d6962cf1d38d30da1b31b3d09e2c24fa19519aa2cfbc

data/.gitmodules

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

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.21)
-      async (~> 1.28.3)
-      async-io (~> 1.30.1)
+    rsmp (0.1.32)
+      async (~> 1.28.7)
+      async-io (~> 1.30.2)
       colorize (~> 0.8.1)
-      json_schemer (~> 0.2.17)
+      rsmp_schemer (~> 0.2.0)
       thor (~> 1.0.1)
 
 GEM
@@ -18,17 +18,17 @@ GEM
       ffi (~> 1.9)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
-    async (1.28.3)
+    async (1.28.9)
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-io (1.30.1)
+    async-io (1.30.2)
       async (~> 1.14)
     backports (3.17.0)
     builder (3.2.4)
     childprocess (3.0.0)
     colorize (0.8.1)
-    console (1.10.1)
+    console (1.12.0)
       fiber-local
     contracts (0.16.0)
     cucumber (3.1.2)
@@ -54,16 +54,18 @@ GEM
     fiber-local (1.0.0)
     gherkin (5.1.0)
     hana (1.3.7)
-    json_schemer (0.2.17)
+    json_schemer (0.2.18)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       uri_template (~> 0.7)
     multi_json (1.14.1)
     multi_test (0.1.2)
-    nio4r (2.5.4)
+    nio4r (2.5.7)
     rake (13.0.1)
-    regexp_parser (2.0.3)
+    regexp_parser (2.1.1)
+    rsmp_schemer (0.2.0)
+      json_schemer (~> 0.2.18)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -79,7 +81,7 @@ GEM
     rspec-support (3.9.2)
     thor (1.0.1)
     timecop (0.9.1)
-    timers (4.3.2)
+    timers (4.3.3)
     uri_template (0.7.0)
 
 PLATFORMS

data/config/supervisor.yaml

@@ -1,18 +1,12 @@
 port: 12111
-rsmp_versions:
-  - 3.1.1
-  - 3.1.2
-  - 3.1.3
-  - 3.1.4
-
-watchdog_interval: 1
-watchdog_timeout: 2
-acknowledgement_timeout: 2
-store_messages: false
-command_response_timeout: 1
-status_response_timeout: 1
-status_update_timeout: 1
-
+guest:
+  sxl: tlc
+  intervals:
+    timer: 0.1
+    watchdog: 0.1
+  timeouts:
+    watchdog: 0.2
+    acknowledgement: 0.2
 log:
   active: true
   color: true
@@ -20,6 +14,7 @@ log:
   id: true
   component: true
   ip: false
+  port: true
   site_id: true
   text: true
   direction: true
@@ -27,4 +22,3 @@ log:
   json: true
   acknowledgements: false
   watchdogs: false
-

data/config/tlc.yaml

@@ -2,7 +2,8 @@ site_id: RN+SI0001
 supervisors:
   - ip: 127.0.0.1
     port: 12111
-
+sxl: tlc
+sxl_version: 1.0.15
 components:
   main:
     TC:
@@ -18,15 +19,16 @@ components:
       plan: 'BBB1NB'
   detector_logic:
     DL1:
-watchdog_interval: 0.1
-watchdog_timeout: 0.2
-acknowledgement_timeout: 0.2
-reconnect_interval: 0.1
-
+intervals:
+  timer: 0.1
+  watchdog: 0.1
+  reconnect: 0.1
+timeouts:
+  watchdog: 0.2
+  acknowledgement: 0.2
 security_codes:
   1: '1111'
   2: '2222'
-
 log:
   active: true
   color: true
@@ -41,4 +43,3 @@ log:
   json: true
   acknowledgements: false
   watchdogs: false
-

data/documentation/message_distribution.md

@@ -1,23 +1,23 @@
 # Message distribution
 
-Proxy - - Distributor --> Receivers
+Proxy - - Notifier --> Listeners
 
-A proxy distributes message to receivers, when they are installed.
+A proxy distributes messages to listeners, when they are installed.
 
-Probes are special receivers that waits for specific message, and are used to implement methods for waiting for RMSP responses, statuses, alarms, etc.
+Collectors are special listenerws that waits for specific message, and are used to implement methods for waiting for RMSP responses, statuses, alarms, etc.
 
-Note that Archive is not a receiver, and does not receive messages via the Distributor. Instead the Archive gets and stores messages via the log() interface in the Logging module. The reason is that the items that the Archive and the Logger contain other data as well as the message, like error messages, warnings, text descriptions, colors codes, etc. The Distributor and Receiver handles only Message objects.
+Note that Archive is not a listener, and does not receive messages via the Notifier. Instead the Archive gets and stores messages via the log() interface in the Logging module. The reason is that the items that the Archive and the Logger contain other data as well as the message, like error messages, warnings, text descriptions, colors codes, etc. The Distributor and Receiver handles only Message objects.
 
-## Distributor
+## Notifier
 A module that handles distributing messages to receivers.
 
-## Receiver
+## Listener
 Receives messages as long as it's installed into a distributor.
 
-## Probe
+## Collector
 A subclass of Receiver that wait for specific messages. Once received
 the client receives the collection.
 
 ## Proxy
-A proxy includes the Distributor module and distributes each message to listerens after processing it.
+A proxy includes the Notifier module and distributes each message to listerens after processing it.
 

data/lib/rsmp.rb

@@ -10,6 +10,8 @@ require 'json_schemer'
 require 'async/queue'
 
 require 'rsmp/rsmp'
+require 'rsmp/deep_merge'
+require 'rsmp/inspect'
 require 'rsmp/logging'
 require 'rsmp/wait'
 require 'rsmp/node'
@@ -31,4 +33,7 @@ require 'rsmp/logger'
 require 'rsmp/archive'
 require 'rsmp/tlc'
 
+require 'rsmp/convert/import/yaml'
+require 'rsmp/convert/export/json_schema'
+
 require 'rsmp/version'

data/lib/rsmp/archive.rb

@@ -3,6 +3,8 @@
 
 module RSMP
   class Archive
+    include Inspect
+
     attr_reader :items
 
     @@index = 0
@@ -12,14 +14,15 @@ module RSMP
       @max = max
     end
 
+    def inspect
+      "#<#{self.class.name}:#{self.object_id}, #{inspector(:@items)}>"
+    end
+
     def self.prepare_item item
       raise ArgumentError unless item.is_a? Hash
     
-      now_obj = RSMP.now_object
-      now_str = RSMP.now_string(now_obj)
-
       cleaned = item.select { |k,v| [:author,:level,:ip,:port,:site_id,:component_id,:str,:message,:exception].include? k }
-      cleaned[:timestamp] = now_obj
+      cleaned[:timestamp] = Clock.now
       if item[:message]
         cleaned[:direction] = item[:message].direction 
         cleaned[:component_id] = item[:message].attributes['cId'] 

data/lib/rsmp/cli.rb

@@ -2,106 +2,137 @@ require 'thor'
 require 'rsmp'
 
 module RSMP
-	class CLI < Thor
-
-		desc "site", "Run RSMP site"
-		method_option :config, :type => :string, :aliases => "-c", banner: 'Path to .yaml config file'
-		method_option :id, :type => :string, :aliases => "-i", banner: 'RSMP site id'
-		method_option :supervisors, :type => :string, :aliases => "-s", banner: 'ip:port,... list of supervisor to connect to'			
-		method_option :log, :type => :string, :aliases => "-l", banner: 'Path to log file'
-		method_option :json, :type => :boolean, :aliases => "-j", banner: 'Show JSON messages in log'
-		method_option :type, :type => :string, :aliases => "-t", banner: 'Type of site: [tlc]'
-		def site
-			settings = {}
-			log_settings = { 'active' => true }
-
-			if options[:config]
-				if File.exist? options[:config]
-					settings = YAML.load_file options[:config]
-					log_settings = settings.delete('log') || {}
-				else
-					puts "Error: Config #{options[:config]} not found"
-					exit
-				end
-			end
-
-			if options[:id]
-				settings['site_id'] = options[:id]
-			end
-
-			if options[:supervisors]
-				options[:supervisors].split(',').each do |supervisor|
-					settings[:supervisors] ||= []
-					ip, port = supervisor.split ':'
-					ip = '127.0.0.1' if ip.empty?
-					port = '12111' if port.empty?
-					settings[:supervisors] << {"ip"=>ip, "port"=>port}
-				end
-			end
-
-			if options[:log]
-				log_settings['path'] = options[:log]
-			end
-
-			if options[:json]
-				log_settings['json'] = options[:json]
-			end
-
-			site_class = RSMP::Site
-			if options[:type]
-				case options[:type]
-					when 'tlc'
-						site_class = RSMP::Tlc
-					else
-						site_class = RSMP::Site
-				end
-			end
-			site_class.new(site_settings:settings, log_settings: log_settings).start
-		end
-
-		desc "supervisor", "Run RSMP supervisor"
-		method_option :config, :type => :string, :aliases => "-c", banner: 'Path to .yaml config file'
-		method_option :id, :type => :string, :aliases => "-i", banner: 'RSMP site id'
-		method_option :ip, :type => :numeric, banner: 'IP address to listen on'			
-		method_option :port, :type => :string, :aliases => "-p", banner: 'Port to listen on'
-		method_option :log, :type => :string, :aliases => "-l", banner: 'Path to log file'
-		method_option :json, :type => :boolean, :aliases => "-j", banner: 'Show JSON messages in log'
-		def supervisor
-			settings = {}
-			log_settings = { 'active' => true }
-
-			if options[:config]
-				if File.exist? options[:config]
-					settings = YAML.load_file options[:config]
-					log_settings = settings.delete 'log'
-				else
-					puts "Error: Config #{options[:config]} not found"
-					exit
-				end
-			end
-
-			if options[:id]
-				settings['site_id'] = options[:id]
-			end
-
-			if options[:ip]
-				settings['ip'] = options[:ip]
-			end
-
-			if options[:port]
-				settings['port'] = options[:port]
-			end
-
-			if options[:log]
-				log_settings['path'] = options[:log]
-			end
-
-			if options[:json]
-				log_settings['json'] = options[:json]
-			end
-
-			RSMP::Supervisor.new(supervisor_settings:settings,log_settings:log_settings).start
-		end
-
-	end
+  class CLI < Thor
+
+    desc "site", "Run RSMP site"
+    method_option :config, :type => :string, :aliases => "-c", banner: 'Path to .yaml config file'
+    method_option :id, :type => :string, :aliases => "-i", banner: 'RSMP site id'
+    method_option :supervisors, :type => :string, :aliases => "-s", banner: 'ip:port,... list of supervisor to connect to'      
+    method_option :log, :type => :string, :aliases => "-l", banner: 'Path to log file'
+    method_option :json, :type => :boolean, :aliases => "-j", banner: 'Show JSON messages in log'
+    method_option :type, :type => :string, :aliases => "-t", banner: 'Type of site: [tlc]'
+    def site
+      settings = {}
+      log_settings = { 'active' => true }
+
+      if options[:config]
+        if File.exist? options[:config]
+          settings = YAML.load_file options[:config]
+          log_settings = settings.delete('log') || {}
+        else
+          puts "Error: Config #{options[:config]} not found"
+          exit
+        end
+      end
+
+      if options[:id]
+        settings['site_id'] = options[:id]
+      end
+
+      if options[:supervisors]
+        settings['supervisors'] = []
+        options[:supervisors].split(',').each do |supervisor|
+          ip, port = supervisor.split ':'
+          ip = '127.0.0.1' if ip.empty?
+          port = '12111' if port.empty?
+          settings['supervisors'] << {"ip"=>ip, "port"=>port}
+        end
+      end
+
+      if options[:log]
+        log_settings['path'] = options[:log]
+      end
+
+      if options[:json]
+        log_settings['json'] = options[:json]
+      end
+
+      site_class = RSMP::Site
+      if options[:type]
+        case options[:type]
+          when 'tlc'
+            site_class = RSMP::Tlc
+          else
+            site_class = RSMP::Site
+        end
+      end
+      site_class.new(site_settings:settings, log_settings: log_settings).start
+    rescue RSMP::Schemer::UnknownSchemaTypeError => e
+      puts "Cannot start site: #{e}"
+    rescue RSMP::Schemer::UnknownSchemaVersionError => e
+      puts "Cannot start site: #{e}"
+    rescue Psych::SyntaxError => e
+      puts "Cannot read config file #{e}"
+    end
+
+    desc "supervisor", "Run RSMP supervisor"
+    method_option :config, :type => :string, :aliases => "-c", banner: 'Path to .yaml config file'
+    method_option :id, :type => :string, :aliases => "-i", banner: 'RSMP site id'
+    method_option :ip, :type => :numeric, banner: 'IP address to listen on'      
+    method_option :port, :type => :string, :aliases => "-p", banner: 'Port to listen on'
+    method_option :log, :type => :string, :aliases => "-l", banner: 'Path to log file'
+    method_option :json, :type => :boolean, :aliases => "-j", banner: 'Show JSON messages in log'
+    def supervisor
+      settings = {}
+      log_settings = { 'active' => true }
+
+      if options[:config]
+        if File.exist? options[:config]
+          settings = YAML.load_file options[:config]
+          log_settings = settings.delete 'log'
+        else
+          puts "Error: Config #{options[:config]} not found"
+          exit
+        end
+      end
+
+      if options[:id]
+        settings['site_id'] = options[:id]
+      end
+
+      if options[:ip]
+        settings['ip'] = options[:ip]
+      end
+
+      if options[:port]
+        settings['port'] = options[:port]
+      end
+
+      if options[:log]
+        log_settings['path'] = options[:log]
+      end
+
+      if options[:json]
+        log_settings['json'] = options[:json]
+      end
+
+      RSMP::Supervisor.new(supervisor_settings:settings,log_settings:log_settings).start
+    rescue RSMP::ConfigurationError => e
+      puts "Cannot start supervisor: #{e}"
+    end
+
+    desc "convert", "Convert SXL from YAML to JSON Schema"
+    method_option :in, :type => :string, :aliases => "-i", banner: 'Path to YAML input file'
+    method_option :out, :type => :string, :aliases => "-o", banner: 'Path to JSON Schema output file'
+    def convert
+      unless options[:in]
+        puts "Error: Input option missing"
+        exit
+      end
+
+      unless options[:out]
+        puts "Error: Output option missing"
+        exit
+      end
+
+      unless File.exist? options[:in]
+        puts "Error: Input path file #{options[:in]} not found"
+        exit
+      end
+
+      sxl = RSMP::Convert::Import::YAML.read options[:in]
+      RSMP::Convert::Export::JSONSchema.write sxl, options[:out]
+    end
+
+  end
 end