update rsmp gem to support core 3.2.2

Gemfile.lock

@@ -11,12 +11,11 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    async (2.10.2)
-      console (~> 1.10)
+    async (2.12.0)
+      console (~> 1.25, >= 1.25.2)
       fiber-annotation
-      io-event (~> 1.5, >= 1.5.1)
-      timers (~> 4.1)
-    async-io (1.42.1)
+      io-event (~> 1.6)
+    async-io (1.43.2)
       async
     base64 (0.2.0)
     bigdecimal (3.1.8)
@@ -32,11 +31,11 @@ GEM
     fiber-annotation (0.2.0)
     fiber-local (1.1.0)
       fiber-storage
-    fiber-storage (0.1.1)
+    fiber-storage (0.1.2)
     hana (1.3.7)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    io-event (1.6.0)
+    io-event (1.6.4)
     json (2.7.2)
     json_schemer (2.3.0)
       bigdecimal
@@ -47,12 +46,12 @@ GEM
     mutex_m (0.2.0)
     rake (13.2.1)
     regexp_parser (2.9.2)
-    rsmp (0.28.0)
-      async (~> 2.10.0)
-      async-io (~> 1.42.0)
+    rsmp (0.29.0)
+      async (~> 2.12.0)
+      async-io (~> 1.43.0)
       colorize (~> 1.1)
-      rsmp_schema (~> 0.6.0)
-    rsmp_schema (0.6.0)
+      rsmp_schema (~> 0.7.0)
+    rsmp_schema (0.7.0)
       json_schemer (~> 2.3.0)
       thor (~> 1.3.1)
     rspec (3.13.0)
@@ -70,7 +69,6 @@ GEM
     rspec-support (3.13.1)
     simpleidn (0.2.3)
     thor (1.3.1)
-    timers (4.3.5)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     yard (0.9.36)

config/gem_tlc.yaml

@@ -47,5 +47,5 @@ alarms:
     activation_input: 7
     component: DL1
 restrict_testing:
-  sxl_version: 1.2
-  core_version: 3.2.1
+  sxl_version: 1.2.1
+  core_version: 3.2.2

config/simulator/tlc.yaml

@@ -3,7 +3,7 @@ site_id: RN+SI0001
 supervisors:
   - ip: 127.0.0.1
     port: 13111
-core_versions: '3.2.1'
+core_versions: '3.2.2'
 sxl: tlc
 sxl_version: '1.2.1'
 components:

docs/pages/configuring.md

@@ -90,8 +90,8 @@ items:                  # other configurations that should be tested
   force_input: 5              # what input to force when testing input forcing
 startup_sequence: 'efg' # expected startup sequence
 restrict_testing:       # restrict what tests are run, default is to run all
-  core_version: 3.2.1   # skip unless relevant for core 3.2.1
-  sxl_version: 1.1      # skip unless relevant for sxl 1.1
+  core_version: 3.2.2   # skip unless relevant for core 3.2.2
+  sxl_version: 1.2.1      # skip unless relevant for sxl 1.2.1
 secrets:                # place secrets or in a separate file, see below
   security_codes:       # RSMP security codes. there are no defaults for these
     1: '1111'           # level 1
@@ -146,8 +146,8 @@ timeouts:             # timeouts
   watchdog: 0.2         # max time between receiving watchdogs, in seconds
   acknowledgement: 0.2  # max time unless a message we send is acknowledged, in seconds
 restrict_testing:       # restrict what tests are run, default is to run all
-  core_version: 3.2.1   # skip unless relevant for core 3.2.1
-  sxl_version: 1.1      # skip unless relevant for sxl 1.1
+  core_version: 3.2.2   # skip unless relevant for core 3.2.2
+  sxl_version: 1.2.1    # skip unless relevant for sxl 1.2.1
 secrets:                # place secrets or in a separate file, see below
   security_codes:       # RSMP security codes. there are no defaults for these
     1: '1111'           # level 1

spec/site/core/connect_spec.rb

@@ -71,5 +71,15 @@
     it 'is correct for rsmp version 3.2.1',  core: '3.2.1' do |example|
       check_sequence '3.2.1'
     end
+
+    # Verify the connection sequence when using rsmp core 3.2.2
+    #
+    # 1. Given the site is connected and using core 3.2.2
+    # 2. When handshake messages are sent and received
+    # 3. Then the handshake messages should be in the specified sequence corresponding to version 3.1.5
+    # 4. And the connection sequence should be complete
+    it 'is correct for rsmp version 3.2.2',  core: '3.2.2' do |example|
+      check_sequence '3.2.2'
+    end
   end
 end

spec/supervisor/connect_spec.rb

@@ -74,7 +74,7 @@ def check_sequence version
       case version
       when '3.1.1', '3.1.2', '3.1.3'
         check_sequence_3_1_1 version
-      when '3.1.4', '3.1.5', '3.2', '3.2.1'
+      when '3.1.4', '3.1.5', '3.2', '3.2.1', '3.2.2'
         check_sequence_3_1_4 version
       else
         raise "Unkown rsmp version #{version}"

spec/support/handshake_helper.rb

@@ -88,7 +88,7 @@ def check_sequence version
       case version
       when '3.1.1', '3.1.2', '3.1.3'
         check_sequence_3_1_1_to_3_1_3 version
-      when '3.1.4', '3.1.5', '3.2', '3.2.1'
+      when '3.1.4', '3.1.5', '3.2', '3.2.1', '3.2.2'
         check_sequence_3_1_4_or_later version
       else
         raise "Unkown rsmp version #{version}"