T7012 OSPFv2 integration tests fixes (#395)

* init for ospfv2

* ospfv2 rtt and merge and merge_update tests fixed

* ospfv2 integration test partial fix

* ospfv2 integration tests new structure and 1.4+ fixes

* ospfv2 1.3- unit tests

* ospfv2 changelog

* Added unit tests suite for 1.4+ and vyos_ospfv2

* fixed some netsted dict, added pasive-interface default, added passive-interface exclude for 1.4+

* passive-interface-exclude support for 1.4+

* fix remove func for passive-interface-exclude in 1.4+ ospfv2

* parsed.yaml update

* leftovers removed

* prepare_vyous_tests.yaml to use network_cli and fail fast

* ospfv2 integration tests pre-requisite scripts

* reverted prepare_vyos_tests script

* facts regex corrected

* reworked facts regex

---------

Co-authored-by: Daniil Baturin <daniil@baturin.org>

2 files changed, 46 insertions, 10 deletions

diff --git a/plugins/module_utils/network/vyos/config/ospfv2/ospfv2.py b/plugins/module_utils/network/vyos/config/ospfv2/ospfv2.py
index a9c1de1b..ababc6f1 100644
--- a/plugins/module_utils/network/vyos/config/ospfv2/ospfv2.py
+++ b/plugins/module_utils/network/vyos/config/ospfv2/ospfv2.py
@@ -33,6 +33,9 @@ from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.utils.utils
     _is_w_same,
     list_diff_want_only,
 )
+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 Ospfv2(ConfigBase):
@@ -124,7 +127,7 @@ class Ospfv2(ConfigBase):
 
         want = self._module.params["config"]
         have = existing_ospfv2_facts
-        resp = self.set_state(want, have)
+        resp = self.set_state(remove_empties(want), remove_empties(have))
         return to_list(resp)
 
     def set_state(self, w, h):
@@ -136,7 +139,6 @@ class Ospfv2(ConfigBase):
         :returns: the commands necessary to migrate the current configuration
                   to the desired configuration
         """
-
         commands = []
         if self.state in ("merged", "replaced", "overridden", "rendered") and not w:
             self._module.fail_json(
@@ -270,7 +272,6 @@ class Ospfv2(ConfigBase):
         :param opr: True/False.
         :return: generated list of commands.
         """
-
         commands = []
         h = {}
         if have:
@@ -320,7 +321,6 @@ class Ospfv2(ConfigBase):
         :param opr: True/False.
         :return: generated list of commands.
         """
-
         commands = []
         h = []
         if want:
@@ -336,6 +336,10 @@ class Ospfv2(ConfigBase):
                     command = cmd + attr.replace("_", "-") + " "
                     if attr == "network":
                         command += member["address"]
+                    elif attr == "passive_interface" and member != "default" and LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+                        command = command.replace("passive-interface", "interface") + member + " passive"
+                    elif attr == "passive_interface_exclude" and LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+                        command = command.replace("passive-interface-exclude", "interface") + member + " passive disable"
                     else:
                         command += member
                     commands.append(command)
@@ -348,7 +352,12 @@ class Ospfv2(ConfigBase):
                                     cmd + attr.replace("_", "-") + " " + member["address"],
                                 )
                         elif member not in h:
-                            commands.append(cmd + attr.replace("_", "-") + " " + member)
+                            if attr == "passive_interface" and member != "default" and LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+                                commands.append(cmd + "interface" + " " + member + " passive")
+                            elif attr == "passive_interface_exclude" and LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+                                command = command.replace("passive-interface-exclude", "interface") + member + " passive disable"
+                            else:
+                                commands.append(cmd + attr.replace("_", "-") + " " + member)
                 else:
                     commands.append(cmd + " " + attr.replace("_", "-"))
         return commands
diff --git a/plugins/module_utils/network/vyos/facts/ospfv2/ospfv2.py b/plugins/module_utils/network/vyos/facts/ospfv2/ospfv2.py
index bdc7c9f8..d07bf13a 100644
--- a/plugins/module_utils/network/vyos/facts/ospfv2/ospfv2.py
+++ b/plugins/module_utils/network/vyos/facts/ospfv2/ospfv2.py
@@ -22,6 +22,10 @@ from ansible_collections.ansible.netcommon.plugins.module_utils.network.common i
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.ospfv2.ospfv2 import (
     Ospfv2Args,
 )
+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
 
 
 class Ospfv2Facts(object):
@@ -99,9 +103,9 @@ class Ospfv2Facts(object):
         config["areas"] = self.parse_attrib_list(conf, "area", "area_id")
         config["parameters"] = self.parse_attrib(conf, "parameters", "parameters")
         config["neighbor"] = self.parse_attrib_list(conf, "neighbor", "neighbor_id")
-        config["passive_interface"] = self.parse_leaf_list(conf, "passive-interface")
+        config["passive_interface"] = self.parse_passive(conf, "passive-interface")
         config["redistribute"] = self.parse_attrib_list(conf, "redistribute", "route_type")
-        config["passive_interface_exclude"] = self.parse_leaf_list(
+        config["passive_interface_exclude"] = self.parse_passive(
             conf,
             "passive-interface-exclude",
         )
@@ -159,6 +163,29 @@ class Ospfv2Facts(object):
                 lst.sort()
         return lst
 
+    def parse_passive(self, conf, attrib):
+        """
+        This function forms the regex to fetch the listed attributes
+        from the configuration data
+        :param conf: configuration data
+        :param attrib: attribute name
+        :return: generated rule list configuration
+        """
+        lst = []
+        items = []
+        if LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+            if attrib == "passive-interface-exclude":
+                items = findall("^interface (?:'*)(\\S+)(?:'*) passive disable$", conf, M)
+            else:
+                items = findall("^interface (?:'*)(\\S+)(?:'*) passive$", conf, M)
+
+        items += findall(r"^" + attrib + " (?:'*)(\\S+)(?:'*)", conf, M)
+        if items:
+            for i in set(items):
+                lst.append(i.strip("'"))
+                lst.sort()
+        return lst
+
     def parse_distance(self, conf, attrib=None):
         """
         This function triggers the parsing of 'distance' attributes
@@ -389,13 +416,13 @@ class Ospfv2Facts(object):
         :param match: parent node/attribute name.
         :return: generated config dictionary.
         """
-
         config = {}
         for attrib in attr_list:
             regex = self.map_regex(attrib)
 
             if match:
                 regex = match.replace("_", "-") + " " + regex
+
             if conf:
                 if self.is_bool(attrib):
                     out = conf.find(attrib.replace("_", "-"))
@@ -403,13 +430,13 @@ class Ospfv2Facts(object):
                     if match:
                         if attrib == "set" and conf.find(match) >= 1:
                             config[attrib] = True
-                        en = conf.find(match + " 'enable'")
+                        en = conf.find(match + " enable") != -1
                     if out >= 1:
                         if dis >= 1:
                             config[attrib] = False
                         else:
                             config[attrib] = True
-                    elif match and en >= 1:
+                    elif match and en:
                         config[attrib] = True
                 else:
                     out = search(r"^.*" + regex + " (.+)", conf, M)