mirror.MikroTik/tomaae.homeassistant-mikrotik_router
1
0
Fork 0
mirror of https://github.com/tomaae/homeassistant-mikrotik_router.git synced 2025-07-16 12:24:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Removed WAN prefix in RouterOS 7+ client bandwidth, fixes #155

Browse source
This commit is contained in:
Tomaae 2022-03-03 09:15:14 +01:00
parent 4d5030297f
commit 25a09498d6
3 changed files with 44 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
custom_components/mikrotik_router/mikrotik_controller.py
View file

@ -2124,8 +2124,8 @@ class MikrotikControllerData:
"host-name": vals["host-name"], "host-name": vals["host-name"],
"previous-bytes-up": 0.0, "previous-bytes-up": 0.0,
"previous-bytes-down": 0.0, "previous-bytes-down": 0.0,
"wan-tx": 0.0, "tx": 0.0,
"wan-rx": 0.0, "rx": 0.0,
"tx-rx-attr": uom_type, "tx-rx-attr": uom_type,
"available": False, "available": False,
"local_accounting": False, "local_accounting": False,
@ -2175,7 +2175,7 @@ class MikrotikControllerData:
previous_tx = self.data["client_traffic"][uid]["previous-bytes-up"] previous_tx = self.data["client_traffic"][uid]["previous-bytes-up"]
if time_diff: if time_diff:
delta_tx = max(0, current_tx - previous_tx) * 8 delta_tx = max(0, current_tx - previous_tx) * 8
self.data["client_traffic"][uid]["wan-tx"] = round( self.data["client_traffic"][uid]["tx"] = round(
delta_tx / time_diff * uom_div, 2 delta_tx / time_diff * uom_div, 2
) )
self.data["client_traffic"][uid]["previous-bytes-up"] = current_tx self.data["client_traffic"][uid]["previous-bytes-up"] = current_tx
@ -2184,7 +2184,7 @@ class MikrotikControllerData:
previous_rx = self.data["client_traffic"][uid]["previous-bytes-down"] previous_rx = self.data["client_traffic"][uid]["previous-bytes-down"]
if time_diff: if time_diff:
delta_rx = max(0, current_rx - previous_rx) * 8 delta_rx = max(0, current_rx - previous_rx) * 8
self.data["client_traffic"][uid]["wan-rx"] = round( self.data["client_traffic"][uid]["rx"] = round(
delta_rx / time_diff * uom_div, 2 delta_rx / time_diff * uom_div, 2
) )
self.data["client_traffic"][uid]["previous-bytes-down"] = current_rx self.data["client_traffic"][uid]["previous-bytes-down"] = current_rx

4
custom_components/mikrotik_router/sensor.py
View file

@ -68,6 +68,8 @@ def update_items(inst, config_entry, mikrotik_controller, async_add_entities, se
"environment", "environment",
"traffic_rx", "traffic_rx",
"traffic_tx", "traffic_tx",
"client_traffic_rx",
"client_traffic_tx",
"client_traffic_lan_rx", "client_traffic_lan_rx",
"client_traffic_lan_tx", "client_traffic_lan_tx",
"client_traffic_wan_rx", "client_traffic_wan_rx",
@ -82,6 +84,8 @@ def update_items(inst, config_entry, mikrotik_controller, async_add_entities, se
MikrotikClientTrafficSensor, MikrotikClientTrafficSensor,
MikrotikClientTrafficSensor, MikrotikClientTrafficSensor,
MikrotikClientTrafficSensor, MikrotikClientTrafficSensor,
MikrotikClientTrafficSensor,
MikrotikClientTrafficSensor,
], ],
): ):
if sensor.startswith("traffic_") and not config_entry.options.get( if sensor.startswith("traffic_") and not config_entry.options.get(

36
custom_components/mikrotik_router/sensor_types.py
View file

@ -385,6 +385,42 @@ SENSOR_TYPES = {
data_reference="mac-address", data_reference="mac-address",
data_attributes_list=DEVICE_ATTRIBUTES_CLIENT_TRAFFIC, data_attributes_list=DEVICE_ATTRIBUTES_CLIENT_TRAFFIC,
), ),
"client_traffic_tx": MikrotikSensorEntityDescription(
key="client_traffic_tx",
name="TX",
icon="mdi:upload-network",
native_unit_of_measurement="data__tx-rx-attr",
device_class=None,
state_class=SensorStateClass.MEASUREMENT,
entity_category=None,
ha_group="",
ha_connection=CONNECTION_NETWORK_MAC,
ha_connection_value="data__mac-address",
data_path="client_traffic",
data_attribute="tx",
data_name="host-name",
data_uid="",
data_reference="mac-address",
data_attributes_list=DEVICE_ATTRIBUTES_CLIENT_TRAFFIC,
),
"client_traffic_rx": MikrotikSensorEntityDescription(
key="client_traffic_rx",
name="RX",
icon="mdi:download-network",
native_unit_of_measurement="data__tx-rx-attr",
device_class=None,
state_class=SensorStateClass.MEASUREMENT,
entity_category=None,
ha_group="",
ha_connection=CONNECTION_NETWORK_MAC,
ha_connection_value="data__mac-address",
data_path="client_traffic",
data_attribute="rx",
data_name="host-name",
data_uid="",
data_reference="mac-address",
data_attributes_list=DEVICE_ATTRIBUTES_CLIENT_TRAFFIC,
),
"environment": MikrotikSensorEntityDescription( "environment": MikrotikSensorEntityDescription(
key="environment", key="environment",
name="", name="",