additional gateway attrs

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>

CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.6.4
+
+Released 2024-02-16
+
+- additional attrs to gateway entites
+- more defensive handling of rules
+
 # v0.6.3
 
 Released 2024-02-16

custom_components/pfsense/pypfsense/__init__.py

@@ -1314,6 +1314,7 @@ def get_telemetry(self):
   "ipsec" => [],
 
   "gateways" => return_gateways_status(true),
+  "gateways_detail" => return_gateways_array(),
 ];
 
 foreach($filesystems as $fs) {

custom_components/pfsense/sensor.py

@@ -576,6 +576,16 @@ def _pfsense_get_gateway(self):
                 break
         return found
 
+    def _pfsense_get_gateway_details(self):
+        state = self.coordinator.data
+        found = None
+        gateway_name = self._pfsense_get_gateway_name()
+        for i_gateway_name in state["telemetry"]["gateways_detail"].keys():
+            if i_gateway_name == gateway_name:
+                found = state["telemetry"]["gateways_detail"][i_gateway_name]
+                break
+        return found
+
     @property
     def available(self) -> bool:
         gateway = self._pfsense_get_gateway()
@@ -596,12 +606,24 @@ def available(self) -> bool:
     def extra_state_attributes(self):
         attributes = {}
         gateway = self._pfsense_get_gateway()
+        gateway_detail = self._pfsense_get_gateway_details()
         for attr in ["monitorip", "srcip", "substatus"]:
             value = gateway[attr]
             if attr == "substatus" and gateway[attr] == "none":
                 value = None
             attributes[attr] = value
 
+        if gateway_detail:
+            for attr in ["weight", "isdefaultgw", "interface", "gateway"]:
+                if attr in gateway_detail:
+                    value = gateway_detail[attr]
+                    attributes[attr] = value
+                else:
+                    # value is omitted when false by pfsense function
+                    if attr == "isdefaultgw":
+                        value = False
+                        attributes[attr] = value
+
         return attributes
 
     @property

custom_components/pfsense/switch.py

@@ -86,6 +86,8 @@ def process_entities_callback(hass, config_entry):
             rules = dict_get(state, "config.nat.rule")
             if isinstance(rules, list):
                 for rule in rules:
+                    if not isinstance(rule, dict):
+                        continue
                     icon = "mdi:network"
                     # likely only want very specific rules to manipulate from actions
                     enabled_default = False
@@ -121,6 +123,8 @@ def process_entities_callback(hass, config_entry):
             rules = dict_get(state, "config.nat.outbound.rule")
             if isinstance(rules, list):
                 for rule in rules:
+                    if not isinstance(rule, dict):
+                        continue
                     icon = "mdi:network"
                     # likely only want very specific rules to manipulate from actions
                     enabled_default = False