VyOS v1.4 support for BGP (T6892 & T6888 & T6822)

plugins/module_utils/network/vyos/config/bgp_address_family/bgp_address_family.py

@@ -33,6 +33,14 @@
     Bgp_address_familyTemplate,
 )
 
+from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.rm_templates.bgp_address_family_14 import (
+    Bgp_address_familyTemplate14,
+)
+
+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 Bgp_address_family(ResourceModule):
     """
@@ -49,12 +57,30 @@ def __init__(self, module):
         )
         self.parsers = []
 
+    def _validate_template(self):
+        version = get_os_version(self._module)
+        if LooseVersion(version) >= LooseVersion("1.4"):
+            self._tmplt = Bgp_address_familyTemplate14()
+        else:
+            self._tmplt = Bgp_address_familyTemplate()
+
+    def parse(self):
+        """ override parse to check template """
+        self._validate_template()
+        return super().parse()
+
+    def get_parser(self, name):
+        """get_parsers"""
+        self._validate_template()
+        return super().get_parser(name)
+
     def execute_module(self):
         """Execute the module
 
         :rtype: A dictionary
         :returns: The result from module execution
         """
+        self._validate_template()
         if self.state not in ["parsed", "gathered"]:
             self.generate_commands()
             self.run_commands()
@@ -67,6 +93,9 @@ def generate_commands(self):
         wantd = {}
         haved = {}
 
+        # if LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+        #     self._tmplt.set_as_number(self.want.get("as_number"))
+
         if self.want.get("as_number") == self.have.get("as_number") or not self.have:
             if self.want:
                 wantd = {self.want["as_number"]: self.want}
@@ -103,6 +132,9 @@ def _compare(self, want, have):
         the `want` and `have` data with the `parsers` defined
         for the Bgp_address_family network resource.
         """
+        if LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+            self._compare_asn(want, have)
+
         self._compare_af(want, have)
         self._compare_neighbors(want, have)
         # Do the negation first
@@ -275,6 +307,12 @@ def _compare_lists(self, want, have, as_number, afi):
             "redistribute.route_map",
             "redistribute.table",
         ]
+
+        if LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+            delete_asn = ""
+        else:
+            delete_asn = " " + str(as_number)
+
         for attrib in ["redistribute", "networks", "aggregate_address"]:
             wdict = want.pop(attrib, {})
             hdict = have.pop(attrib, {})
@@ -300,8 +338,8 @@ def _compare_lists(self, want, have, as_number, afi):
                 attrib = re.sub("_", "-", attrib)
                 attrib = re.sub("networks", "network", attrib)
                 self.commands.append(
-                    "delete protocols bgp "
-                    + str(as_number)
+                    "delete protocols bgp"
+                    + delete_asn
                     + " "
                     + "address-family "
                     + afi
@@ -319,6 +357,15 @@ def _compare_lists(self, want, have, as_number, afi):
                     },
                 )
 
+    def _compare_asn(self, want, have):
+        if want.get("as_number") and not have.get("as_number"):
+            self.commands.append(
+                "set protocols bgp "
+                + "system-as "
+                + " "
+                + str(want.get("as_number")),
+            )
+
     def _bgp_af_list_to_dict(self, entry):
         for name, proc in iteritems(entry):
             if "address_family" in proc:

plugins/module_utils/network/vyos/config/bgp_global/bgp_global.py

@@ -32,6 +32,14 @@
     Bgp_globalTemplate,
 )
 
+from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.rm_templates.bgp_global_14 import (
+    Bgp_globalTemplate14,
+)
+
+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 Bgp_global(ResourceModule):
     """
@@ -48,12 +56,32 @@ def __init__(self, module):
         )
         self.parsers = []
 
+    def _validate_template(self):
+        version = get_os_version(self._module)
+        if LooseVersion(version) >= LooseVersion("1.4"):
+            self._tmplt = Bgp_globalTemplate14()
+        else:
+            self._tmplt = Bgp_globalTemplate()
+
+    def parse(self):
+        """ override parse to check template """
+        self._validate_template()
+        return super().parse()
+
+    def get_parser(self, name):
+        """get_parsers"""
+        self._module.fail_json(msg="#2")
+        self._validate_template()
+        return super().get_parser(name)
+
     def execute_module(self):
         """Execute the module
 
         :rtype: A dictionary
         :returns: The result from module execution
         """
+
+        self._validate_template()
         if self.state not in ["parsed", "gathered"]:
             self.generate_commands()
             self.run_commands()
@@ -105,6 +133,9 @@ def _compare(self, want, have):
         the `want` and `have` data with the `parsers` defined
         for the Bgp_global network resource.
         """
+        if LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+            self._compare_asn(want, have)
+
         parsers = ["maximum_paths", "timers"]
         self._compare_neighbor(want, have)
         self._compare_lists(want, have)
@@ -179,9 +210,11 @@ def _compare_neighbor(self, want, have):
             "network.backdoor",
             "network.route_map",
         ]
+
         wneigh = want.pop("neighbor", {})
         hneigh = have.pop("neighbor", {})
         self._compare_neigh_lists(wneigh, hneigh)
+
         for name, entry in iteritems(wneigh):
             for k, v in entry.items():
                 if k == "address":
@@ -206,8 +239,12 @@ def _compare_neighbor(self, want, have):
                     )
                     self._module.fail_json(msg=msg)
                 else:
+                    if LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+                        delete_asn = ""
+                    else :
+                        delete_asn = " " + str(have["as_number"])
                     self.commands.append(
-                        "delete protocols bgp " + str(have["as_number"]) + " neighbor " + name,
+                        "delete protocols bgp" + delete_asn + " neighbor " + name,
                     )
                     continue
             for k, v in entry.items():
@@ -243,6 +280,7 @@ def _compare_bgp_params(self, want, have):
             "bgp_params.routerid",
             "bgp_params.scan_time",
         ]
+
         wbgp = want.pop("bgp_params", {})
         hbgp = have.pop("bgp_params", {})
         for name, entry in iteritems(wbgp):
@@ -287,12 +325,16 @@ def _compare_bgp_params(self, want, have):
                     },
                 )
         if not wbgp and hbgp:
-            self.commands.append("delete protocols bgp " + str(have["as_number"]) + " parameters")
+            if LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+                delete_asn = ""
+            else:
+                delete_asn = " " + str(have["as_number"])
+            self.commands.append("delete protocols bgp" + delete_asn + " parameters")
             hbgp = {}
         for name, entry in iteritems(hbgp):
             if name == "confederation":
                 self.commands.append(
-                    "delete protocols bgp " + str(have["as_number"]) + " parameters confederation",
+                    "delete protocols bgp" + delete_asn + " parameters confederation",
                 )
             elif name == "distance":
                 distance_parsers = [
@@ -325,6 +367,7 @@ def _compare_lists(self, want, have):
             "redistribute.route_map",
             "aggregate_address",
         ]
+
         for attrib in ["redistribute", "network", "aggregate_address"]:
             wdict = want.pop(attrib, {})
             hdict = have.pop(attrib, {})
@@ -339,8 +382,12 @@ def _compare_lists(self, want, have):
             # remove remaining items in have for replaced
             if not wdict and hdict:
                 attrib = re.sub("_", "-", attrib)
+                if LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+                    delete_asn = ""
+                else :
+                    delete_asn = " " + str(have["as_number"])
                 self.commands.append(
-                    "delete protocols bgp " + str(have["as_number"]) + " " + attrib,
+                    "delete protocols bgp" + delete_asn + " " + attrib,
                 )
                 hdict = {}
             for key, entry in iteritems(hdict):
@@ -392,6 +439,15 @@ def _bgp_global_list_to_dict(self, entry):
                     redis_dict.update({entry["protocol"]: entry})
                 proc["redistribute"] = redis_dict
 
+    def _compare_asn(self, want, have):
+        if want.get("as_number") and not have.get("as_number"):
+            self.commands.append(
+                "set protocols bgp "
+                + "system-as"
+                + " "
+                + str(want.get("as_number")),
+            )
+
     def _check_af(self, neighbor):
         af_present = False
         if self._connection:

plugins/module_utils/network/vyos/facts/bgp_address_family/bgp_address_family.py

@@ -25,6 +25,13 @@
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.rm_templates.bgp_address_family import (
     Bgp_address_familyTemplate,
 )
+from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.rm_templates.bgp_address_family_14 import (
+    Bgp_address_familyTemplate14,
+)
+
+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 Bgp_address_familyFacts(object):
@@ -55,11 +62,14 @@ def populate_facts(self, connection, ansible_facts, data=None):
             data = self.get_device_data(connection)
 
         for resource in data.splitlines():
-            if "address-family" in resource:
+            if "address-family" in resource or "system-as" in resource:
                 config_lines.append(re.sub("'", "", resource))
 
-        # parse native config using the Bgp_address_family template
-        bgp_address_family_parser = Bgp_address_familyTemplate(lines=config_lines)
+        # parse native config using the Bgp_address_family template based on version
+        if LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+            bgp_address_family_parser = Bgp_address_familyTemplate14(lines=config_lines)
+        else:
+            bgp_address_family_parser = Bgp_address_familyTemplate(lines=config_lines)
         objs = bgp_address_family_parser.parse()
         if objs:
             if "address_family" in objs:

plugins/module_utils/network/vyos/facts/bgp_global/bgp_global.py

@@ -26,6 +26,14 @@
     Bgp_globalTemplate,
 )
 
+from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.rm_templates.bgp_global_14 import (
+    Bgp_globalTemplate14,
+)
+
+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 Bgp_globalFacts(object):
     """The vyos bgp_global facts class"""
@@ -55,10 +63,14 @@ def populate_facts(self, connection, ansible_facts, data=None):
             data = self.get_device_data(connection)
 
         for resource in data.splitlines():
-            if "address-family" not in resource:
+            if "address-family" not in resource in resource:
                 config_lines.append(re.sub("'", "", resource))
 
-        bgp_global_parser = Bgp_globalTemplate(lines=config_lines, module=self._module)
+        if LooseVersion(get_os_version(self._module)) >= LooseVersion("1.4"):
+            bgp_global_parser = Bgp_globalTemplate14(lines=config_lines, module=self._module)
+        else:
+            bgp_global_parser = Bgp_globalTemplate(lines=config_lines, module=self._module)
+
         objs = bgp_global_parser.parse()
 
         if "neighbor" in objs: