Fix issue in afi choices (#473)

* Fix issue in afi choices * Fix uts --------- Co-authored-by: Ashwini Mhatre <amhatre@amhatre-thinkpadt14sgen2i.pnq.csb>
ansible-collections · Feb 22, 2024 · 8d7c66a · 8d7c66a
1 parent 478c93d
commit 8d7c66a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/changelogs/fragments/bugfix_bgp_templates.yaml b/changelogs/fragments/bugfix_bgp_templates.yaml
@@ -1,3 +1,3 @@
 ---
-bugfixes:
+minor_changes:
   - Add missing options in afi and safi in address-family of bgp_templates RM.
diff --git a/changelogs/fragments/fix_bgp_template.yaml b/changelogs/fragments/fix_bgp_template.yaml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - Fix 'afi' value in bgp_templates RM to valid values.
diff --git a/docs/cisco.iosxr.iosxr_bgp_templates_module.rst b/docs/cisco.iosxr.iosxr_bgp_templates_module.rst
@@ -225,8 +225,8 @@ Parameters
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>
                                     <li>ipv4</li>
                                     <li>ipv6</li>
-                                    <li>vpn4</li>
-                                    <li>vpn6</li>
+                                    <li>vpnv4</li>
+                                    <li>vpnv6</li>
                                     <li>link-state</li>
                                     <li>l2vpn</li>
                         </ul>

diff --git a/plugins/module_utils/network/iosxr/argspec/bgp_templates/bgp_templates.py b/plugins/module_utils/network/iosxr/argspec/bgp_templates/bgp_templates.py
@@ -51,8 +51,8 @@ class Bgp_templatesArgs(object):  # pylint: disable=R0903
                                     "choices": [
                                         "ipv4",
                                         "ipv6",
-                                        "vpn4",
-                                        "vpn6",
+                                        "vpnv4",
+                                        "vpnv6",
                                         "link-state",
                                         "l2vpn",
                                     ],

diff --git a/plugins/modules/iosxr_bgp_templates.py b/plugins/modules/iosxr_bgp_templates.py
@@ -46,7 +46,7 @@
                   afi:
                     description: address family.
                     type: str
-                    choices: [ 'ipv4', 'ipv6', 'vpn4', 'vpn6', 'link-state', 'l2vpn']
+                    choices: [ 'ipv4', 'ipv6', 'vpnv4', 'vpnv6', 'link-state', 'l2vpn']
                   safi:
                     description: Address Family modifier
                     type: str

diff --git a/tests/unit/modules/network/iosxr/test_iosxr_bgp_templates.py b/tests/unit/modules/network/iosxr/test_iosxr_bgp_templates.py
@@ -240,11 +240,11 @@ def test_iosxr_bgp_tmpl_merged(self):
                                     advertise=dict(local_labeled_route=dict(set=True)),
                                 ),
                                 dict(
-                                    afi="vpn4",
+                                    afi="vpnv4",
                                     safi="unicast",
                                 ),
                                 dict(
-                                    afi="vpn6",
+                                    afi="vpnv6",
                                     safi="unicast",
                                 ),
                                 dict(
@@ -340,8 +340,8 @@ def test_iosxr_bgp_tmpl_merged(self):
             "bfd fast-detect strict-mode",
             "internal-vpn-client",
             "precedence critical",
-            "address-family vpn4 unicast",
-            "address-family vpn6 unicast",
+            "address-family vpnv4 unicast",
+            "address-family vpnv6 unicast",
             "address-family link-state link-state",
             "address-family l2vpn evpn",
             "address-family ipv4 unicast",
@@ -1148,9 +1148,9 @@ def test_iosxr_bgp_tmpl_gathered(self):
                   precedence critical
                   advertisement-interval 10
                   internal-vpn-client
-                  address-family vpn4 unicast
+                  address-family vpnv4 unicast
                   !
-                  address-family vpn6 unicast
+                  address-family vpnv6 unicast
                   !
                   address-family link-state link-state
                   !
@@ -1227,8 +1227,8 @@ def test_iosxr_bgp_tmpl_gathered(self):
                     "advertisement_interval": 10,
                     "internal_vpn_client": True,
                     "address_family": [
-                        {"afi": "vpn4", "safi": "unicast"},
-                        {"afi": "vpn6", "safi": "unicast"},
+                        {"afi": "vpnv4", "safi": "unicast"},
+                        {"afi": "vpnv6", "safi": "unicast"},
                         {"afi": "link-state", "safi": "link-state"},
                         {"afi": "l2vpn", "safi": "evpn"},
                         {