Merge branch 'main' into spanning_tree

ansible-collections · Jan 15, 2024 · 42d6032 · 42d6032
2 parents 73d4b7d + ca622c9
commit 42d6032
Show file tree

Hide file tree

Showing 39 changed files with 1,627 additions and 890 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,27 @@ Cisco Ios Collection Release Notes
 .. contents:: Topics
 
 
+v6.1.0
+======
+
+Minor Changes
+-------------
+
+- ios_bgp_global - added 'bgp.default.ipv4_unicast' and 'bgp.default.route_target.filter' key
+- ios_l3_interfaces - added 'autostate', 'mac_address', 'ipv4.source_interface', and 'ipv6.enable' key
+- ios_vlans - Add purged state to deal with toplevel vlan and vlan configuration config.
+
+Bugfixes
+--------
+
+- ios_bgp_global - fix template attribute to generate configuration commands.
+- ios_l3_interfaces - remove validation from ipv6 address parameter.
+- ios_snmp_server - fix group and user IPv6 ACL commands.
+- ios_user - fix configuration of user with hashed password.
+- ios_user - fixed configuration removal of ssh users using purge.
+- ios_vlans - Make behaviour of the action states consistent.
+- ios_vlans - Top level configuration attribute is not required, the module works with vlan and vlan configuration both.
+
 v6.0.0
 ======
 

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -1081,3 +1081,31 @@ releases:
       - bgp_dep_rem.yml
       - major_600.yml
     release_date: "2023-11-30"
+  6.1.0:
+    changes:
+      bugfixes:
+        - ios_bgp_global - fix template attribute to generate configuration commands.
+        - ios_l3_interfaces - remove validation from ipv6 address parameter.
+        - ios_snmp_server - fix group and user IPv6 ACL commands.
+        - ios_user - fix configuration of user with hashed password.
+        - ios_user - fixed configuration removal of ssh users using purge.
+        - ios_vlans - Make behaviour of the action states consistent.
+        - ios_vlans - Top level configuration attribute is not required, the module
+          works with vlan and vlan configuration both.
+      minor_changes:
+        - ios_bgp_global - added 'bgp.default.ipv4_unicast' and 'bgp.default.route_target.filter'
+          key
+        - ios_l3_interfaces - added 'autostate', 'mac_address', 'ipv4.source_interface',
+          and 'ipv6.enable' key
+        - ios_vlans - Add purged state to deal with toplevel vlan and vlan configuration
+          config.
+    fragments:
+      - fix_ios_bgp_global_20231204173037.yaml
+      - fix_ios_l3_interfacel_20231207172506.yaml
+      - ios_facts_tests.yml
+      - ios_l3_ipv6.yml
+      - ios_user_fix.yml
+      - ios_vlans_revert.yml
+      - snmp_server_ipv6_acl.yml
+      - template_revoke_bgp.yaml
+    release_date: "2024-01-11"
diff --git a/changelogs/fragments/fix_ios_bgp_global_20231204173037.yaml b/changelogs/fragments/fix_ios_bgp_global_20231204173037.yaml
diff --git a/changelogs/fragments/fix_ios_l3_interfacel_20231207172506.yaml b/changelogs/fragments/fix_ios_l3_interfacel_20231207172506.yaml
diff --git a/changelogs/fragments/ios_facts_tests.yml b/changelogs/fragments/ios_facts_tests.yml
diff --git a/changelogs/fragments/ios_user_fix.yml b/changelogs/fragments/ios_user_fix.yml
diff --git a/changelogs/fragments/snmp_server_ipv6_acl.yml b/changelogs/fragments/snmp_server_ipv6_acl.yml
diff --git a/changelogs/fragments/template_revoke_bgp.yaml b/changelogs/fragments/template_revoke_bgp.yaml
diff --git a/docs/cisco.ios.ios_bgp_address_family_module.rst b/docs/cisco.ios.ios_bgp_address_family_module.rst
@@ -8060,7 +8060,7 @@ Notes
 -----
 
 .. note::
-   - Tested against Cisco IOSXE Version 17.3 on CML.
+   - Tested against Cisco IOS-XE Version 17.3 on CML.
    - This module works with connection ``network_cli``. See https://docs.ansible.com/ansible/latest/network/user_guide/platform_ios.html
    - The module examples uses callback plugin (stdout_callback = yaml) to generate task output in yaml format.
 

diff --git a/docs/cisco.ios.ios_bgp_global_module.rst b/docs/cisco.ios.ios_bgp_global_module.rst
@@ -9513,7 +9513,7 @@ Notes
 -----
 
 .. note::
-   - Tested against Cisco IOSXE Version 17.3 on CML.
+   - Tested against Cisco IOS-XE Version 17.3 on CML.
    - This module works with connection ``network_cli``. See https://docs.ansible.com/ansible/latest/network/user_guide/platform_ios.html
    - The module examples uses callback plugin (stdout_callback = yaml) to generate task output in yaml format.
 

diff --git a/docs/cisco.ios.ios_evpn_evi_module.rst b/docs/cisco.ios.ios_evpn_evi_module.rst
@@ -329,7 +329,7 @@ Notes
 -----
 
 .. note::
-   - Tested against Cisco IOS device with Version 17.13.01 on Cat9k on CML.
+   - Tested against Cisco IOS-XE device with Version 17.13.01 on Cat9k on CML.
    - This module works with connection ``network_cli``. See https://docs.ansible.com/ansible/latest/network/user_guide/platform_ios.html
 
 

diff --git a/docs/cisco.ios.ios_evpn_global_module.rst b/docs/cisco.ios.ios_evpn_global_module.rst
@@ -343,7 +343,7 @@ Notes
 -----
 
 .. note::
-   - Tested against Cisco IOS device with Version 17.13.01 on Cat9k on CML.
+   - Tested against Cisco IOS-XE device with Version 17.13.01 on Cat9k on CML.
    - This module works with connection ``network_cli``. See https://docs.ansible.com/ansible/latest/network/user_guide/platform_ios.html