Merge pull request #69 from samson0v/master

Updated rate limits setting

Author: imbeacon

tb_device_mqtt.py

@@ -339,7 +339,7 @@ def __init__(self, host, port=1883, username=None, password=None, quality_of_ser
         self.__device_client_rpc_dict = {}
         self.__attr_request_number = 0
         self.max_payload_size = max_payload_size
-        self.service_configuration_callback = self.__on_service_configuration
+        self.service_configuration_callback = self.on_service_configuration
         telemetry_rate_limit, telemetry_dp_rate_limit = RateLimit.get_rate_limits_by_host(self.__host,
                                                                                           telemetry_rate_limit,
                                                                                           telemetry_dp_rate_limit)
@@ -645,16 +645,18 @@ def send_rpc_call(self, method, params, callback):
                            self.quality_of_service)
 
     def request_service_configuration(self, callback):
-        self.send_rpc_call("getServiceConfiguration", {}, callback)
-
-    def __on_service_configuration(self, _, service_config, *args, **kwargs):
-        if service_config.get("deviceMsgRateLimit"):
-            self._messages_rate_limit.set_limit(service_config.get("deviceMsgRateLimit"), percentage=80)
-        if service_config.get('deviceTelemetryMsgRateLimit'):
-            self.__telemetry_rate_limit.set_limit(service_config.get('deviceTelemetryMsgRateLimit'), percentage=80)
-        if service_config.get('deviceTelemetryDataPointsRateLimit'):
-            self.__telemetry_dp_rate_limit.set_limit(service_config.get('deviceTelemetryDataPointsRateLimit'),
-                                                     percentage=80)
+        self.send_rpc_call("getSessionLimits", {}, callback)
+
+    def on_service_configuration(self, _, service_config, *args, **kwargs):
+        if service_config.get("rateLimits"):
+            rate_limits_config = service_config.get("rateLimits")
+
+            if rate_limits_config.get('messages'):
+                self._messages_rate_limit.set_limit(rate_limits_config.get('messages'), percentage=80)
+            if rate_limits_config.get('telemetryMessages'):
+                self.__telemetry_rate_limit.set_limit(rate_limits_config.get('telemetryMessages'), percentage=80)
+            if rate_limits_config.get('telemetryDataPoints'):
+                self.__telemetry_dp_rate_limit.set_limit(rate_limits_config.get('telemetryDataPoints'), percentage=80)
         if service_config.get('maxInflightMessages'):
             self.max_inflight_messages_set(int(service_config.get('maxInflightMessages')))
         if service_config.get('maxPayloadSize'):

tb_gateway_mqtt.py

@@ -307,26 +307,32 @@ def _change_devices_rate_limit(self, rate_limit_key, rate_limit_value, percentag
             device[rate_limit_key].set_limit(rate_limit_value, percentage=percentage)
 
     def __on_service_configuration(self, _, service_config, *args, **kwargs):
-        if service_config.get("gatewayDeviceMessagesRateLimits"):
+        gateway_rate_limit_config = service_config.pop('gatewayRateLimits', {})
+        device_rate_limit_config = service_config.pop('rateLimits', {})
+
+        super().on_service_configuration(_, {'rateLimit': gateway_rate_limit_config, **service_config}, *args, **kwargs)
+
+        if device_rate_limit_config.get("messages"):
             # change global rate limit for future devices
-            self.__device_messages_rate_limit = service_config.get('gatewayDeviceMessagesRateLimits')
+            self.__device_messages_rate_limit = device_rate_limit_config.get('messages')
 
             # change rate limit for already connected devices
-            self._change_devices_rate_limit('msg_rate_limit', service_config.get('gatewayDeviceMessagesRateLimits'))
-        if service_config.get('gatewayDeviceTelemetryMessagesRateLimits'):
+            self._change_devices_rate_limit('msg_rate_limit', device_rate_limit_config.get('messages'))
+        if device_rate_limit_config.get('telemetryMessages'):
             # change global rate limit for future devices
-            self.__device_telemetry_rate_limit = service_config.get('gatewayDeviceTelemetryMessagesRateLimits')
+            self.__device_telemetry_rate_limit = device_rate_limit_config.get('telemetryMessages')
 
             # change rate limit for already connected devices
             self._change_devices_rate_limit('telemetry_msg_rate_limit',
-                                            service_config.get('gatewayDeviceTelemetryMessagesRateLimits'))
-        if service_config.get('gatewayDeviceTelemetryDataPointsRateLimits'):
+                                            device_rate_limit_config.get('telemetryMessages'))
+        if device_rate_limit_config.get('telemetryDataPoints'):
             # change global rate limit for future devices
-            self.__device_telemetry_dp_rate_limit = service_config.get('gatewayDeviceTelemetryDataPointsRateLimits')
+            self.__device_telemetry_dp_rate_limit = device_rate_limit_config.get('telemetryDataPoints')
 
             # change rate limit for already connected devices
             self._change_devices_rate_limit('telemetry_dp_rate_limit',
-                                            service_config.get('gatewayDeviceTelemetryDataPointsRateLimits'))
+                                            device_rate_limit_config.get('telemetryDataPoints'))
+
         if service_config.get('maxInflightMessages'):
             self.max_inflight_messages_set(int(service_config.get('maxInflightMessages')))
         if service_config.get('maxPayloadSize'):