Merge pull request #1962 from samson0v/master

Fixed parsing QoS parameter from config

Author: samson0v

thingsboard_gateway/gateway/tb_gateway_service.py

@@ -186,6 +186,7 @@ def __init__(self, config_file=None):
             self.__connectors_init_start_success = False
 
         connection_logger = logging.getLogger('tb_connection')
+        self.quality_of_service = self.__config['thingsboard'].get('qos', 1)
         self.tb_client = TBClient(self.__config["thingsboard"], self._config_dir, connection_logger)
         self.tb_client.register_service_subscription_callback(self.subscribe_to_required_topics)
         self.tb_client.connect()
@@ -2214,22 +2215,28 @@ def __check_devices_idle_time(self):
             self.stop_event.wait(check_devices_idle_every_sec)
 
     @CountMessage('msgsSentToPlatform')
-    def send_telemetry(self, telemetry, quality_of_service=None, wait_for_publish=True):
-        return self.tb_client.client.send_telemetry(telemetry, quality_of_service=quality_of_service,
+    def send_telemetry(self, telemetry, wait_for_publish=True):
+        return self.tb_client.client.send_telemetry(telemetry,
+                                                    quality_of_service=self.quality_of_service,
                                                     wait_for_publish=wait_for_publish)
 
     @CountMessage('msgsSentToPlatform')
-    def gw_send_telemetry(self, device, telemetry, quality_of_service=1):
-        return self.tb_client.client.gw_send_telemetry(device, telemetry, quality_of_service=quality_of_service)
+    def gw_send_telemetry(self, device, telemetry):
+        return self.tb_client.client.gw_send_telemetry(device,
+                                                       telemetry,
+                                                       quality_of_service=self.quality_of_service)
 
     @CountMessage('msgsSentToPlatform')
-    def send_attributes(self, attributes, quality_of_service=None, wait_for_publish=True):
-        return self.tb_client.client.send_attributes(attributes, quality_of_service=quality_of_service,
+    def send_attributes(self, attributes, wait_for_publish=True):
+        return self.tb_client.client.send_attributes(attributes,
+                                                     quality_of_service=self.quality_of_service,
                                                      wait_for_publish=wait_for_publish)
 
     @CountMessage('msgsSentToPlatform')
-    def gw_send_attributes(self, device, attributes, quality_of_service=1):
-        return self.tb_client.client.gw_send_attributes(device, attributes, quality_of_service=quality_of_service)
+    def gw_send_attributes(self, device, attributes):
+        return self.tb_client.client.gw_send_attributes(device,
+                                                        attributes,
+                                                        quality_of_service=self.quality_of_service)
 
     # Service RPC methods ----------------
     def ping(self):

thingsboard_gateway/tb_utility/tb_gateway_remote_configurator.py

@@ -220,7 +220,7 @@ def send_connector_current_configuration(self, connector_configuration: dict):
             config_to_send[REPORT_STRATEGY_PARAMETER] = config_to_send['configurationJson'].pop(REPORT_STRATEGY_PARAMETER) # noqa
         if config_to_send.get('configurationJson', {}).get(CONFIG_VERSION_PARAMETER) is not None:
             config_to_send[CONFIG_VERSION_PARAMETER] = config_to_send['configurationJson'].pop(CONFIG_VERSION_PARAMETER)
-        self._gateway.send_attributes({connector_configuration['name']: config_to_send}, quality_of_service=1)
+        self._gateway.send_attributes({connector_configuration['name']: config_to_send})
 
     def _load_connectors_configuration(self):
         for (_, connector_list) in self._gateway.connectors_configs.items():