Merge pull request #178 from telekom-mms/fix/associated-interface

fix: address interface attribute is "associated-interface" and not "interface"

Author: neubi4

fortilib/address.py

@@ -6,6 +6,8 @@
 
 
 class FortigateAddress(FortigateNamedObject, FortigateInterfaceMixin):
+    interface_attribute = "associated-interface"
+
     """Fortigate object for addresses.
 
     :ivar interface: Interface the address is connected to
@@ -55,7 +57,7 @@ def render(self) -> dict:
                     "name": "Test_address",
                     "type": "ipmask",
                     "subnet": "10.10.10.1 255.255.255.255",
-                    "interface": "port4",
+                    "associated-interface": "port4",
                     "comments": "Test comment",
                 }
         """
@@ -64,7 +66,7 @@ def render(self) -> dict:
             "type": "ipmask",
             "subnet": f"{self.subnet.network_address} {self.subnet.netmask}",
             "comment": self.comment,
-            "interface": self.interface.name if self.interface else "",
+            "associated-interface": self.interface.name if self.interface else "",
             "color": self.color,
         }
 
@@ -103,7 +105,7 @@ def render(self) -> dict:
                     "type": "iprange",
                     "start-ip": "10.10.10.1",
                     "end-ip": "10.10.10.15",
-                    "interface": "port4",
+                    "associated-interface": "port4",
                     "comments": "Test comment",
                 }
         """
@@ -113,7 +115,7 @@ def render(self) -> dict:
             "start-ip": str(self.ip_start),
             "end-ip": str(self.ip_end),
             "comment": self.comment,
-            "interface": self.interface.name if self.interface else "",
+            "associated-interface": self.interface.name if self.interface else "",
             "color": self.color,
         }
 
@@ -145,7 +147,7 @@ def render(self) -> dict:
                     "name": "Test_fqdn",
                     "type": "fqdn",
                     "fqdn": "kernel.org",
-                    "interface": "port4",
+                    "associated-interface": "port4",
                     "comments": "Test comment",
                 }
         """
@@ -154,6 +156,6 @@ def render(self) -> dict:
             "type": "fqdn",
             "fqdn": self.fqdn,
             "comment": self.comment,
-            "interface": self.interface.name if self.interface else "",
+            "associated-interface": self.interface.name if self.interface else "",
             "color": self.color,
         }

fortilib/vipgroup.py

@@ -9,6 +9,8 @@
 class FortigateVIPGroup(
     FortigateAddress, FortigateInterfaceMixin, FortigateGroupMixin
 ):
+    interface_attribute = "interface"
+
     """Fortigate object for VIP groups.
 
     :ivar member: Collection of vip objects of :class:`fortilib.vip.FortigateVIP`

tests/data.py

@@ -13,10 +13,9 @@
         "cache-ttl": 0,
         "sdn": "",
         "fsso-group": [],
-        "interface": "port4",
+        "associated-interface": "port4",
         "comment": "test comment",
         "visibility": "enable",
-        "associated-interface": "",
         "color": 0,
         "filter": "",
         "sdn-addr-type": "private",
@@ -119,10 +118,9 @@
         "cache-ttl": 0,
         "sdn": "",
         "fsso-group": [],
-        "interface": "port4",
         "obj-type": "ip",
         "comment": "",
-        "associated-interface": "",
+        "associated-interface": "port4",
         "color": 19,
         "filter": "",
         "sdn-addr-type": "private",

tests/tests_fortilib_firewall_read/test_fortilib_firewall_addresses.py

@@ -19,7 +19,7 @@ def test_firewall_base_addresses_ipmask(
                 "name": "NET_198.141.216.0_22",
                 "subnet": "198.141.216.0 255.255.252.0",
                 "comment": "",
-                "interface": "",
+                "associated-interface": "",
                 "color": 0,
             },
         )
@@ -36,7 +36,7 @@ def test_firewall_base_addresses_ipmask_with_interface(self):
                 "name": "NET_199.40.1.0_24",
                 "subnet": "199.40.1.0 255.255.255.0",
                 "comment": "test comment",
-                "interface": "port4",
+                "associated-interface": "port4",
                 "color": 0,
             },
         )
@@ -60,7 +60,7 @@ def test_firewall_base_addresses_iprange(
                 "start-ip": "10.188.128.106",
                 "end-ip": "10.188.128.108",
                 "comment": "snke 20200122 DPDHL 2020012170002501",
-                "interface": "",
+                "associated-interface": "",
                 "color": 0,
             },
         )
@@ -79,7 +79,7 @@ def test_firewall_base_addresses_fqdn(
                 "name": "FQDN_aadcdn.msauth.net",
                 "fqdn": "aadcdn.msauth.net",
                 "comment": "",
-                "interface": "",
+                "associated-interface": "",
                 "color": 19,
             },
         )

tests/tests_fortilib_firewall_write/test_fortilib_firewall_address.py

@@ -25,7 +25,7 @@ def test_firewall_base_address_create(self):
                 "type": "ipmask",
                 "subnet": "10.0.0.0 255.255.255.0",
                 "comment": "Kommentar",
-                "interface": "",
+                "associated-interface": "",
                 "color": 0,
             },
         )
@@ -54,7 +54,7 @@ def test_firewall_base_address_update(self):
                 "name": "NET_198.141.216.0_22",
                 "subnet": "198.141.216.0 255.255.255.0",
                 "comment": "Kommentar",
-                "interface": "",
+                "associated-interface": "",
                 "color": 0,
             },
         )