DNS Server

Author: Ragin-LundF

models/network/fritzbox_wan_model.py

@@ -16,7 +16,7 @@ def __init__(self, is_connected: bool, is_linked: bool, connection_uptime: int,
                  max_bitrate_upstream_str: str, max_byterate_downstream: float, max_byterate_upstream: float,
                  transmission_rate_downstream: int, transmission_rate_upstream: int,
                  transmission_rate_downstream_str: str, transmission_rate_upstream_str: str,
-                 current_downstream_rate: int, current_upstream_rate: int):
+                 current_downstream_rate: int, current_upstream_rate: int, dns_server: str):
         self.is_connected: bool = is_connected
         self.is_linked: bool = is_linked
         self.connection_uptime: int = connection_uptime
@@ -41,6 +41,7 @@ def __init__(self, is_connected: bool, is_linked: bool, connection_uptime: int,
         self.transmission_rate_upstream_str: str = transmission_rate_upstream_str
         self.current_downstream_rate: int = current_downstream_rate
         self.current_upstream_rate: int = current_upstream_rate
+        self.dns_server: str = dns_server
 
     def influx_data(self) -> str:
         influx_result = list()
@@ -61,5 +62,6 @@ def influx_data(self) -> str:
         InfluxPrint.append(influx_result, "TransmissionRateUpstream", self.transmission_rate_upstream)
         InfluxPrint.append(influx_result, "ByteReceiveRate", self.current_downstream_rate)
         InfluxPrint.append(influx_result, "ByteSendRate", self.current_upstream_rate)
+        InfluxPrint.append(influx_result, "DNSServers", self.dns_server)
 
         return ",".join(influx_result)

modules/network/fritz_connect_wan.py

@@ -32,7 +32,8 @@ def stats(self) -> FritzboxWANModel:
             transmission_rate_downstream_str=self.transmission_rate_downstream_str(),
             transmission_rate_upstream_str=self.transmission_rate_upstream_str(),
             current_downstream_rate=self.current_downstream_rate(),
-            current_upstream_rate=self.current_upstream_rate()
+            current_upstream_rate=self.current_upstream_rate(),
+            dns_server=self.dns_server()
         )
 
         return wan_model
@@ -115,3 +116,10 @@ def packet_downstream_rate(self) -> int:
     def packet_upstream_rate(self) -> int:
         return self.__WAN_ADDON.get('NewPacketSendRate')
 
+    def dns_server(self) -> str:
+        dns_server_str = ""
+        if self.__WAN_ADDON.get('NewDNSServer1'):
+            dns_server_str = self.__WAN_ADDON.get('NewDNSServer1')
+        if self.__WAN_ADDON.get('NewDNSServer2'):
+            dns_server_str = f"{dns_server_str},{self.__WAN_ADDON.get('NewDNSServer2')}"
+        return dns_server_str