holado 0.9.3__tar.gz → 0.10.0__tar.gz

{holado-0.9.3 → holado-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.9.3
+Version: 0.10.0
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues

holado-0.10.0/packaging/VERSION

@@ -0,0 +1 @@
+0.10.0

{holado-0.9.3 → holado-0.10.0}/src/holado/__init__.py

@@ -82,8 +82,8 @@ def initialize_minimal():
                garbage_collector_periodicity=None)
 
 def initialize(TSessionContext=None, use_holado_logger=True, logging_config_file_path=None, 
-               log_level=None, log_time_in_utc=None, log_on_console=False, log_in_file=True, session_kwargs=None,
-               garbage_collector_periodicity=default_value):
+               log_level=None, log_time_in_utc=None, log_on_console=False, log_in_file=True, 
+               config_kwargs=None, session_kwargs=None, garbage_collector_periodicity=default_value):
     global __initialized
     if __initialized:
         from holado_core.common.exceptions.technical_exception import TechnicalException
@@ -113,10 +113,16 @@ def initialize(TSessionContext=None, use_holado_logger=True, logging_config_file
     if Tools.do_log(logger, logging.DEBUG):
         logger.debug("Configured logging")
     
+    # Import modules
     if Tools.do_log(logger, logging.DEBUG):
         logger.debug("Importing HolAdo modules")
     _import_modules(get_holado_module_names())
     
+    # Update config with given kwargs
+    # Note: it is made after modules import to enable override modules specific config parameters
+    _update_config(config_kwargs)
+    
+    # Initialize session context
     _initialize_session_context(session_kwargs)
     
     # Initialize garbage collector
@@ -133,17 +139,29 @@ def initialize(TSessionContext=None, use_holado_logger=True, logging_config_file
     __initialized = True
     
 def initialize_for_script(TSessionContext=None, use_holado_logger=True, logging_config_file_path=None, 
-                          log_level=logging.WARNING, log_on_console=True, log_in_file=False, session_kwargs=None,
-                          garbage_collector_periodicity=None):
+                          log_level=logging.WARNING, log_time_in_utc=None, log_on_console=True, log_in_file=False, 
+                          config_kwargs=None, session_kwargs=None, garbage_collector_periodicity=None):
     if session_kwargs is None:
         session_kwargs={'with_session_path':log_in_file, 'raise_if_not_exist':False}
         
     initialize(TSessionContext=TSessionContext, use_holado_logger=use_holado_logger, logging_config_file_path=logging_config_file_path, 
-               log_level=log_level, log_on_console=log_on_console, log_in_file=log_in_file,
-               session_kwargs=session_kwargs,
+               log_level=log_level, log_time_in_utc=log_time_in_utc, log_on_console=log_on_console, log_in_file=log_in_file,
+               config_kwargs=config_kwargs, session_kwargs=session_kwargs,
                garbage_collector_periodicity=garbage_collector_periodicity )
     
+
+def _update_config(config_kwargs):
+    from holado.holado_config import Config
     
+    if config_kwargs is not None:
+        for name, value in config_kwargs.items():
+            if hasattr(Config, name):
+                setattr(Config, name, value)
+            else:
+                from holado_core.common.exceptions.technical_exception import TechnicalException
+                from holado_python.standard_library.typing import Typing
+                raise TechnicalException(f"Parameter '{name}' is not configurable, it doesn't exist. Available configurable parameters: {Typing.get_object_attributes(Config)}")
+
 def _initialize_session_context(session_kwargs=None):
     from holado_core.common.tools.tools import Tools
     

{holado-0.9.3 → holado-0.10.0}/src/holado/holado_config.py

@@ -15,7 +15,10 @@ import logging
 
 class Config(object):
     """HolAdo project configuration"""
-
+    
+    # Application properties
+    application_group = None
+    
     # Timeouts
     session_timeout_seconds = 7 * 24 * 3600     # Session timeout is by default to 7 days
     timeout_seconds = 240            # Default timeout

{holado-0.9.3 → holado-0.10.0}/src/holado_ais/ais/ais_messages.py

@@ -83,7 +83,37 @@ class AISMessages(object):
             message_type = self.__get_message_type(msg_type)
             res = message_type.create(**data)
             return res
-    
+        
+        def decode_nmea_raw_as_dict(self, raw, merge_tag_block_and_message_dicts=False, enum_as_int=False, ignore_spare=True):
+            # Convert NMEA raw to sentences
+            sentences = self.split_raw_to_sentences(raw)
+            
+            # Convert sentences to message type as dict
+            msg = self.decode(*sentences)
+            msg_dict = msg.asdict(enum_as_int=enum_as_int, ignore_spare=ignore_spare)
+            
+            # Extract tagblock of first sentence if present, and add tagblock information in result
+            tag_block_str, _ = self.split_sentence_to_tab_block_and_message(sentences[0])
+            if not isinstance(tag_block_str, bytes):
+                tag_block_str = tag_block_str.encode('utf8')
+            logger.print(f"++++++++++++ {tag_block_str=}")
+            tag_block = TagBlock(tag_block_str)
+            tag_block.init()
+            tag_block_dict = tag_block.asdict() if tag_block is not None else None
+            if tag_block_dict is not None:
+                tag_block_dict = {k:v for k,v in tag_block_dict.items() if k != 'raw' and v is not None}
+            
+            # Build result
+            if merge_tag_block_and_message_dicts:
+                res = msg_dict
+                if tag_block_dict is not None:
+                    res.update(tag_block_dict)
+            elif tag_block_dict is not None:
+                res = (tag_block_dict, msg_dict)
+            else:
+                res = msg_dict
+            return res
+            
         def decode(self, *args, encoded_msg=None, parts_separator=b'\n'):
             if encoded_msg is not None:
                 if isinstance(encoded_msg, str):
@@ -263,7 +293,7 @@ class AISMessages(object):
         
         res = ais_sentence.split(split_char)
         if len(res) > 1:
-            # Remove part before first '\'
+            # Tag block is present, remove part before first '\'
             del res[0]
         else:
             # Tag block is not present, insert it as None

{holado-0.9.3 → holado-0.10.0}/src/holado_ais/tests/behave/steps/ais/ais_messages_steps.py

@@ -22,6 +22,8 @@ from holado_test.behave.behave import *  # @UnusedWildImport
 from holado_ais.ais.enums import AISMessageType
 from holado_core.common.tools.string_tools import StrTools
 from holado_value.common.tables.converters.value_table_converter import ValueTableConverter
+from holado_core.common.block.function import Function
+from holado_core.common.exceptions.functional_exception import FunctionalException
 
 logger = logging.getLogger(__name__)
 
@@ -148,8 +150,26 @@ if AISMessages.is_available():
         
         __get_variable_manager().register_variable(var_name, res)
     
-    @Step(r"(?P<var_name>{Variable}) = decode NMEA AIS message (?P<encoded_ais_message>{Str})(?P<dictionnary_str> as dictionnary)?")
-    def step_impl(context, var_name, encoded_ais_message, dictionnary_str):
+    @Step(r"(?:(?P<tagblock_var_name>{Variable}), )?(?P<var_name>{Variable}) = decode NMEA AIS raw (?P<ais_raw>{Bytes}|{Str}) as dictionary(?: \((?P<merge_tag_block_and_message_dicts_str>merge tag block and message dictionaries)?\))?")
+    def step_impl(context, tagblock_var_name, var_name, ais_raw, merge_tag_block_and_message_dicts_str):
+        var_name = StepTools.evaluate_variable_name(var_name)
+        ais_raw = StepTools.evaluate_scenario_parameter(ais_raw)
+        merge_tag_block_and_message_dicts = merge_tag_block_and_message_dicts_str is not None
+        
+        res = __get_ais_messages().decode_nmea_raw_as_dict(ais_raw, merge_tag_block_and_message_dicts=merge_tag_block_and_message_dicts)
+        
+        if tagblock_var_name is None:
+            __get_variable_manager().register_variable(var_name, res)
+        else:
+            if len(res) == 2:
+                tb_dict, msg_dict = res
+            else:
+                tb_dict, msg_dict = None, res
+            __get_variable_manager().register_variable(tagblock_var_name, tb_dict)
+            __get_variable_manager().register_variable(var_name, msg_dict)
+    
+    @Step(r"(?P<var_name>{Variable}) = decode NMEA AIS message (?P<encoded_ais_message>{Str})(?P<dictionary_str> as dictionary)?")
+    def step_impl(context, var_name, encoded_ais_message, dictionary_str):
         var_name = StepTools.evaluate_variable_name(var_name)
         encoded_ais_message = StepTools.evaluate_scenario_parameter(encoded_ais_message)
         
@@ -158,7 +178,7 @@ if AISMessages.is_available():
         else:
             res = __get_ais_messages().decode(encoded_msg=encoded_ais_message)
             
-        if dictionnary_str is not None:
+        if dictionary_str is not None:
             res = res.asdict()
             
         __get_variable_manager().register_variable(var_name, res)

{holado-0.9.3 → holado-0.10.0}/src/holado_core/common/tools/path_manager.py

@@ -22,6 +22,7 @@ from datetime import datetime
 from holado_core.common.tools.tools import Tools
 from pathlib import Path
 from holado_python.common.tools.datetime import DateTime
+from holado.holado_config import Config
 
 logger = logging.getLogger(__name__)
 
@@ -162,10 +163,12 @@ class PathManager(object):
         if base_path is None:
             base_path = os.path.join(self.get_user_home_path(), '.holado', 'output')
         
+        res = os.path.join(base_path, "reports")
+        if Config.application_group is not None:
+            res = os.path.join(res, Config.application_group)
         if name is not None:
-            return os.path.join(base_path, "reports", name)
-        else:
-            return os.path.join(base_path, "reports")
+            res = os.path.join(res, name)
+        return res
     
     def chown(self, path, user = None, group = None):
         if user is not None or group is not None:

{holado-0.9.3/src/holado_docker/tools/docker_viewer → holado-0.10.0/src/holado_docker/tools/docker_controller}/server/rest/run.py

@@ -18,8 +18,11 @@ from initialize_holado import insert_holado_source_paths  # @UnresolvedImport
 insert_holado_source_paths(with_test_behave=False)
 
 # Initialize HolAdo
-from holado import initialize_minimal
-initialize_minimal()
+from holado import initialize
+initialize(TSessionContext=None, use_holado_logger=True, logging_config_file_path=None,
+           log_level=None, log_time_in_utc=None, log_on_console=True, log_in_file=False,
+           config_kwargs={'application_group':'docker_controller'},
+           garbage_collector_periodicity=None)
 
 
 app = connexion.FlaskApp(__name__, pythonic_params=True)

{holado-0.9.3/src/holado_docker/tools/docker_controller → holado-0.10.0/src/holado_docker/tools/docker_viewer}/server/rest/run.py

@@ -18,8 +18,11 @@ from initialize_holado import insert_holado_source_paths  # @UnresolvedImport
 insert_holado_source_paths(with_test_behave=False)
 
 # Initialize HolAdo
-from holado import initialize_minimal
-initialize_minimal()
+from holado import initialize
+initialize(TSessionContext=None, use_holado_logger=True, logging_config_file_path=None,
+           log_level=None, log_time_in_utc=None, log_on_console=True, log_in_file=False,
+           config_kwargs={'application_group':'docker_viewer'},
+           garbage_collector_periodicity=None)
 
 
 app = connexion.FlaskApp(__name__, pythonic_params=True)

{holado-0.9.3 → holado-0.10.0}/src/holado_test/test_server/server/rest/run.py

@@ -26,7 +26,8 @@ import holado
 from holado_test.test_server.server.core.server_context import TestServerSessionContext
 holado.initialize(TSessionContext=TestServerSessionContext, 
                   logging_config_file_path=os.path.join(here, 'logging.conf'), log_level=logging.INFO, 
-                  log_on_console=True, log_in_file=False, 
+                  log_on_console=True, log_in_file=False,
+                  config_kwargs={'application_group':'test_server'},
                   garbage_collector_periodicity=None)
 
 # Update stored campaigns

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/environment.py

@@ -33,7 +33,9 @@ import holado
 #    - log_on_console is True for initialization phase, it will be set to False when root log file will be defined
 #    - logging config file
 from test_holado.test_holado_session_context import TestHoladoSessionContext
-holado.initialize(TSessionContext=TestHoladoSessionContext, logging_config_file_path=os.path.join(here, 'logging.conf'), log_level=logging.INFO, log_on_console=True)
+holado.initialize(TSessionContext=TestHoladoSessionContext, logging_config_file_path=os.path.join(here, 'logging.conf'), 
+                  log_level=logging.INFO, log_on_console=True,
+                  config_kwargs={'application_group':'test_runner'})
 
 
 

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/ais_message-bitarray_to_nmea.feature

@@ -1,6 +1,6 @@
 @testing_solution
 @ais
-Feature: Test decode of AIS message from bitarry and its encode in NMEAv4
+Feature: Test decode of AIS message from bitarray and its encode in NMEAv4
 
     @bitarray_to_nmea_through_decode
     Scenario Outline: from bitarray to NMEAv4 sentences through decode

holado-0.10.0/tests/behave/test_holado/features/NonReg/holado_ais/ais_message-nmea_raw_to_dict.feature

@@ -0,0 +1,93 @@
+@testing_solution
+@ais
+Feature: Test decode of NMEA AIS raw to dict
+
+    @nmea_to_dict_without_tagblock
+    Scenario: from NMEA raw to dict (without tagblock)
+        Given RAW = '!AIVDM,1,1,,A,13KG`rU0001RbwdT6CR3TB3f0000,0*4E'
+        
+        When MSG_DICT = decode NMEA AIS raw RAW as dictionary
+        
+        Then MSG_TABLE = convert dictionary MSG_DICT to name/value table
+        Then table MSG_TABLE is
+            | Name       | Value     |
+            | 'accuracy' | False     |
+            | 'course'   | 91.3      |
+            | 'heading'  | 65        |
+            | 'lat'      | 63.086733 |
+            | 'lon'      | 21.555183 |
+            | 'maneuver' | 0         |
+            | 'mmsi'     | 230025450 |
+            | 'msg_type' | 1         |
+            | 'radio'    | 0         |
+            | 'raim'     | False     |
+            | 'repeat'   | 0         |
+            | 'second'   | 55        |
+            | 'speed'    | 0.0       |
+            | 'status'   | 5         |
+            | 'turn'     | 0.0       |
+
+
+    @nmea_to_dict_with_tagblock
+    @without_merge
+    Scenario: from NMEA raw to dict (with tagblock, without merge)
+        Given RAW = '\\s:STATION1,t:Hello*2\\!AIVDM,1,1,,A,13KG`rU0001RbwdT6CR3TB3f0000,0*4E'
+        
+        When TB_DICT, MSG_DICT = decode NMEA AIS raw RAW as dictionary
+        
+        Then TB_TABLE = convert dictionary TB_DICT to name/value table
+        Then table TB_TABLE is
+            | Name             | Value      |
+            | 'source_station' | 'STATION1' |
+            | 'text'           | 'Hello'    |
+        
+        Then MSG_TABLE = convert dictionary MSG_DICT to name/value table
+        Then table MSG_TABLE is
+            | Name       | Value     |
+            | 'accuracy' | False     |
+            | 'course'   | 91.3      |
+            | 'heading'  | 65        |
+            | 'lat'      | 63.086733 |
+            | 'lon'      | 21.555183 |
+            | 'maneuver' | 0         |
+            | 'mmsi'     | 230025450 |
+            | 'msg_type' | 1         |
+            | 'radio'    | 0         |
+            | 'raim'     | False     |
+            | 'repeat'   | 0         |
+            | 'second'   | 55        |
+            | 'speed'    | 0.0       |
+            | 'status'   | 5         |
+            | 'turn'     | 0.0       |
+
+
+    @nmea_to_dict_with_tagblock
+    @with_merge
+    Scenario: from NMEA raw to dict (with tagblock, with merge)
+        Given RAW = '\\s:STATION1,t:Hello*2\\!AIVDM,1,1,,A,13KG`rU0001RbwdT6CR3TB3f0000,0*4E'
+        
+        When MSG_DICT = decode NMEA AIS raw RAW as dictionary (merge tag block and message dictionaries)
+        
+        Then MSG_TABLE = convert dictionary MSG_DICT to name/value table
+        Then table MSG_TABLE is
+            | Name             | Value      |
+            | 'accuracy'       | False      |
+            | 'course'         | 91.3       |
+            | 'heading'        | 65         |
+            | 'lat'            | 63.086733  |
+            | 'lon'            | 21.555183  |
+            | 'maneuver'       | 0          |
+            | 'mmsi'           | 230025450  |
+            | 'msg_type'       | 1          |
+            | 'radio'          | 0          |
+            | 'raim'           | False      |
+            | 'repeat'         | 0          |
+            | 'second'         | 55         |
+            | 'source_station' | 'STATION1' |
+            | 'speed'          | 0.0        |
+            | 'status'         | 5          |
+            | 'text'           | 'Hello'    |
+            | 'turn'           | 0.0        |
+
+
+

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-10.feature

@@ -26,7 +26,7 @@ Feature: Message type 10 : Coordinated UTC Inquiry
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | dest_mmsi | mmsi      | msg_type | repeat |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-12.feature

@@ -26,7 +26,7 @@ Feature: Message type 12 : Addressed Safety Related Message
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | dest_mmsi | mmsi      | msg_type | repeat | retransmit | seqno | text      |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-14.feature

@@ -26,7 +26,7 @@ Feature: Message type 14 : Safety Related Broadcast Message
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | mmsi      | msg_type | repeat | text               |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-15.feature

@@ -26,7 +26,7 @@ Feature: Message type 15 : Interrogation
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | mmsi      | mmsi1    | mmsi2    | msg_type | offset1_1 | offset1_2 | offset2_1 | repeat | type1_1 | type1_2 | type2_1 |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-16.feature

@@ -26,7 +26,7 @@ Feature: Message type 16 : Assigned Mode Command
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | increment1 | increment2 | mmsi      | mmsi1 | mmsi2    | msg_type | offset1 | offset2 | repeat |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-17.feature

@@ -35,7 +35,7 @@ Feature: Message type 17 : GNSS Broadcast Binary Message
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | data | lat | lon | mmsi      | msg_type | repeat |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-18.feature

@@ -26,7 +26,7 @@ Feature: Message type 18 : Standard Class B Position Report
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | accuracy | assigned | band | course | cs   | display | dsc  | heading | lat  | lon  | mmsi      | msg22 | msg_type | radio | raim | repeat | reserved_1 | reserved_2 | second | speed |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-19.feature

@@ -26,7 +26,7 @@ Feature: Message type 19 : Extended Class B Position Report
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | accuracy | assigned | course | dte  | epfd | heading | lat  | lon  | mmsi      | msg_type | raim | repeat | reserved_1 | reserved_2 | second | ship_type | shipname | speed | to_bow | to_port | to_starboard | to_stern |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-1_2_3.feature

@@ -28,7 +28,7 @@ Feature: Message types 1, 2 and 3 : position report
         Then STRING_NMEA_MSG[-3] == <channel>
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | accuracy | course | heading | lat  | lon  | maneuver | mmsi      | msg_type | radio | raim | repeat | second | speed | status | turn |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-20.feature

@@ -26,7 +26,7 @@ Feature: Message type 20 : Data Link Management
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | increment1 | increment2 | increment3 | increment4 | mmsi      | msg_type | number1 | number2 | number3 | number4 | offset1 | offset2 | offset3 | offset4 | repeat | timeout1 | timeout2 | timeout3 | timeout4 |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-21.feature

@@ -26,7 +26,7 @@ Feature: Message type 21 : Aids To Navigation Report
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | accuracy | aid_type | assigned | epfd | lat  | lon  | mmsi      | msg_type | name      | name_ext | off_position | raim | repeat | reserved_1 | second | to_bow | to_port | to_starboard | to_stern | virtual_aid |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-22.feature

@@ -27,7 +27,7 @@ Feature: Message type 22 : Channel Management Addressed & Broadcast
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | addressed | band_a | band_b | channel_a | channel_b | dest1     | dest2     | empty_1 | empty_2 | mmsi      | msg_type | power | repeat | txrx | zonesize |
@@ -73,7 +73,7 @@ Feature: Message type 22 : Channel Management Addressed & Broadcast
         Then STRING_NMEA_MSG[-3] == 'B'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | addressed | band_a | band_b | channel_a | channel_b | mmsi      | msg_type | ne_lat | ne_lon | power | repeat | sw_lat | sw_lon | txrx | zonesize |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-23.feature

@@ -38,7 +38,7 @@ Feature: Message type 23 : Group Assignment Command
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | interval | mmsi      | msg_type | ne_lat | ne_lon | quiet | repeat | ship_type | station_type | sw_lat | sw_lon | txrx |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-24.feature

@@ -27,7 +27,7 @@ Feature: Message type 24 : Static Data Report Part A & part B
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | mmsi      | msg_type | partno | repeat | shipname         |
@@ -61,7 +61,7 @@ Feature: Message type 24 : Static Data Report Part A & part B
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | callsign | mmsi      | model | msg_type | partno | repeat | serial  | ship_type | to_bow | to_port | to_starboard | to_stern | vendorid |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-25.feature

@@ -28,7 +28,7 @@ Feature: Message type 25 : Single Slot Binary Message
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | addressed | app_id | data | dest_mmsi | mmsi      | msg_type | repeat | structured |
@@ -63,7 +63,7 @@ Feature: Message type 25 : Single Slot Binary Message
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | addressed | app_id | data | mmsi      | msg_type | repeat | structured |
@@ -98,7 +98,7 @@ Feature: Message type 25 : Single Slot Binary Message
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | addressed | data | dest_mmsi | mmsi      | msg_type | repeat | structured |
@@ -133,7 +133,7 @@ Feature: Message type 25 : Single Slot Binary Message
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | addressed | data  | mmsi      | msg_type | repeat | structured |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-26.feature

@@ -28,7 +28,7 @@ Feature: Message type 26
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | addressed | app_id | data | dest_mmsi | mmsi      | msg_type | radio | repeat | structured |
@@ -63,7 +63,7 @@ Feature: Message type 26
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | addressed | app_id | data | mmsi      | msg_type | radio | repeat | structured |
@@ -98,7 +98,7 @@ Feature: Message type 26
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | addressed | data            | dest_mmsi | mmsi      | msg_type | radio | repeat | structured |
@@ -133,7 +133,7 @@ Feature: Message type 26
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | addressed | data            | mmsi      | msg_type | radio | repeat | structured |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-27.feature

@@ -26,7 +26,7 @@ Feature: Message type 27
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | accuracy | course | gnss | lat  | lon  | mmsi      | msg_type | raim  | repeat | speed | status |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-4_11.feature

@@ -27,7 +27,7 @@ Feature: Message types 4 and 11 : Base Station Report
         Then STRING_NMEA_MSG[-3] == <channel>
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | accuracy | day | epfd | hour | lat  | lon  | minute | mmsi      | month | msg_type | radio | raim  | repeat | second | year |

{holado-0.9.3 → holado-0.10.0}/tests/behave/test_holado/features/NonReg/holado_ais/message_types/type-5.feature

@@ -26,7 +26,7 @@ Feature: Message type 5 : Ship Static Data
         Then STRING_NMEA_MSG[-3] == 'A'
 
         # Decode NMEA message
-        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionnary
+        Given DECODED_NMEA_MESSAGE = decode NMEA AIS message NMEA_SENTENCES as dictionary
         When DECODED_NMEA_MESSAGE_TABLE = convert dictionary DECODED_NMEA_MESSAGE to table with keys as columns
         Then table DECODED_NMEA_MESSAGE_TABLE is
             | ais_version | callsign  | day | destination | draught | dte  | epfd | hour | imo | minute | mmsi      | month | msg_type | repeat | ship_type | shipname  | to_bow | to_port | to_starboard | to_stern |