T7162: interface preflight (#397)

* T7162: interface preflight

* fix: update with changes from PR 396

* fix: re-run pre-commit for missed updates

* fix: typo

1 files changed, 41 insertions, 25 deletions

diff --git a/plugins/module_utils/network/vyos/config/firewall_global/firewall_global.py b/plugins/module_utils/network/vyos/config/firewall_global/firewall_global.py
index b7bff53e..0d73d209 100644
--- a/plugins/module_utils/network/vyos/config/firewall_global/firewall_global.py
+++ b/plugins/module_utils/network/vyos/config/firewall_global/firewall_global.py
@@ -31,11 +31,11 @@ from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.utils.utils
     list_diff_want_only,
     in_target_not_none,
 )
-
+from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.utils.version import (
+    LooseVersion,
+)
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import get_os_version
 
-from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.utils.version import LooseVersion
-
 
 class Firewall_global(ConfigBase):
     """
@@ -258,11 +258,7 @@ class Firewall_global(ConfigBase):
                             self._form_attr_cmd(attr=key, key=self._bool_to_str(val), opr=opr),
                         )
                         continue
-                    if (
-                        key in l_set
-                        and not self._in_target(h, key)
-                        and not self._is_del(l_set, h)
-                    ):
+                    if key in l_set and not self._in_target(h, key) and not self._is_del(l_set, h):
                         commands.append(
                             self._form_attr_cmd(attr=key, val=self._bool_to_str(val), opr=opr),
                         )
@@ -483,7 +479,9 @@ class Firewall_global(ConfigBase):
                     for key, val in iteritems(w):
                         if val and key != "connection_type":
                             if opr and key in l_set and not (h and self._is_w_same(w, h, key)):
-                                if key == "log" and LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+                                if key == "log" and LooseVersion(
+                                    get_os_version(self._module),
+                                ) >= LooseVersion("1.4"):
                                     commands.append(
                                         self._form_attr_cmd(
                                             key=attr + " " + w["connection_type"],
@@ -509,7 +507,9 @@ class Firewall_global(ConfigBase):
                                         ),
                                     )
                                     break  # delete the whole thing and move on
-                                if (not self._in_target(h, key) or h[key] is None) and (self._in_target(w, key) and w[key]):
+                                if (not self._in_target(h, key) or h[key] is None) and (
+                                    self._in_target(w, key) and w[key]
+                                ):
                                     # delete if not being replaced and value currently exists
                                     commands.append(
                                         self._form_attr_cmd(
@@ -541,11 +541,11 @@ class Firewall_global(ConfigBase):
         if want:
             for w in want:
                 h = self.search_attrib_in_have(have, w, "afi")
-                if 'afi' in w:
-                    afi = w['afi']
+                if "afi" in w:
+                    afi = w["afi"]
                 else:
-                    if h and 'afi' in h:
-                        afi = h['afi']
+                    if h and "afi" in h:
+                        afi = h["afi"]
                     else:
                         afi = None
                     afi = None
@@ -557,7 +557,7 @@ class Firewall_global(ConfigBase):
                                     attr=key,
                                     val=self._bool_to_str(val),
                                     opr=opr,
-                                    type=afi
+                                    type=afi,
                                 ),
                             )
                         elif not opr and key in l_set:
@@ -567,7 +567,7 @@ class Firewall_global(ConfigBase):
                                         attr=key,
                                         val=self._bool_to_str(val),
                                         opr=opr,
-                                        type=afi
+                                        type=afi,
                                     ),
                                 )
                                 continue
@@ -577,7 +577,7 @@ class Firewall_global(ConfigBase):
                                         attr=key,
                                         val=self._bool_to_str(val),
                                         opr=opr,
-                                        type=afi
+                                        type=afi,
                                     ),
                                 )
                         elif key == "icmp_redirects":
@@ -597,11 +597,11 @@ class Firewall_global(ConfigBase):
         commands = []
         h_red = {}
         l_set = ("send", "receive")
-        if w and 'afi' in w:
-            afi = w['afi']
+        if w and "afi" in w:
+            afi = w["afi"]
         else:
-            if h and 'afi' in h:
-                afi = h['afi']
+            if h and "afi" in h:
+                afi = h["afi"]
             else:
                 afi = None
         if w[attr]:
@@ -610,7 +610,12 @@ class Firewall_global(ConfigBase):
             for item, value in iteritems(w[attr]):
                 if opr and item in l_set and not (h_red and self._is_w_same(w[attr], h_red, item)):
                     commands.append(
-                        self._form_attr_cmd(attr=item, val=self._bool_to_str(value), opr=opr, type=afi)
+                        self._form_attr_cmd(
+                            attr=item,
+                            val=self._bool_to_str(value),
+                            opr=opr,
+                            type=afi,
+                        ),
                     )
                 elif (
                     not opr
@@ -644,7 +649,12 @@ class Firewall_global(ConfigBase):
         :param type: AF type of attribute.
         :return: generated command.
         """
-        command = self._compute_command(key=key, attr=self._map_attrib(attr, type=type), val=val, opr=opr)
+        command = self._compute_command(
+            key=key,
+            attr=self._map_attrib(attr, type=type),
+            val=val,
+            opr=opr,
+        )
         return command
 
     def _compute_command(self, key=None, attr=None, val=None, remove=False, opr=True):
@@ -661,14 +671,20 @@ class Firewall_global(ConfigBase):
             cmd = "delete firewall "
         else:
             cmd = "set firewall "
-        if attr and key != "group" and LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+        if (
+            attr
+            and key != "group"
+            and LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4")
+        ):
             cmd += "global-options "
         if key:
             cmd += key.replace("_", "-") + " "
         if attr:
             cmd += attr.replace("_", "-")
         if val and opr:
-            if key == "state_policy" and LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+            if key == "state_policy" and LooseVersion(get_os_version(self._module)) >= LooseVersion(
+                "1.4",
+            ):
                 cmd += ""
             else:
                 cmd += " '" + str(val) + "'"