added download and upload rate attributes for queue switches #40

tomaae · May 3, 2020 · a499d5e · a499d5e
1 parent c1c4b41
commit a499d5e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/custom_components/mikrotik_router/mikrotik_controller.py b/custom_components/mikrotik_router/mikrotik_controller.py
@@ -740,6 +740,7 @@ def get_queue(self):
                 {"name": ".id"},
                 {"name": "name", "default": "unknown"},
                 {"name": "target", "default": "unknown"},
+                {"name": "rate", "default": "0/0"},
                 {"name": "max-limit", "default": "0/0"},
                 {"name": "limit-at", "default": "0/0"},
                 {"name": "burst-limit", "default": "0/0"},
@@ -769,6 +770,16 @@ def get_queue(self):
                 "download-max-limit"
             ] = f"{round(download_max_limit_bps * uom_div)} {uom_type}"
 
+            upload_rate_bps, download_rate_bps = [
+                int(x) for x in vals["rate"].split("/")
+            ]
+            self.data["queue"][uid][
+                "upload-rate"
+            ] = f"{round(upload_rate_bps * uom_div)} {uom_type}"
+            self.data["queue"][uid][
+                "download-rate"
+            ] = f"{round(download_rate_bps * uom_div)} {uom_type}"
+
             upload_limit_at_bps, download_limit_at_bps = [
                 int(x) for x in vals["limit-at"].split("/")
             ]

diff --git a/custom_components/mikrotik_router/switch.py b/custom_components/mikrotik_router/switch.py
@@ -44,6 +44,8 @@
 
 DEVICE_ATTRIBUTES_QUEUE = [
     "target",
+    "download-rate",
+    "upload-rate",
     "download-max-limit",
     "upload-max-limit",
     "upload-limit-at",

diff --git a/docs/assets/images/ui/queue_switch.png b/docs/assets/images/ui/queue_switch.png