Merge branch 'main' into feature_vrf

.flake8

@@ -39,19 +39,14 @@ extend-exclude =
 # IMPORTANT: avoid using ignore option, always use extend-ignore instead
 # Completely and unconditionally ignore the following errors:
 extend-ignore =
-  # Safeguard neutering of flake8-quotes : https://github.com/zheller/flake8-quotes/issues/105
-  Q,
-  # annoy black by allowing white space before : https://github.com/psf/black/issues/315
-  E203,
-  # duplicate of pylint W0611 (unused-import)
-  F401,
-  # duplicate of pylint E0602 (undefined-variable)
-  F821,
-  # duplicate of pylint W0612 (unused-variable)
   F841,
+  # line-length
+  E501,
+  # module level import not at top of file
+  E402
 
 # Accessibility/large fonts and PEP8 unfriendly:
-max-line-length = 100
+max-line-length = 120
 
 # Allow certain violations in certain files:
 # Please keep both sections of this list sorted, as it will be easier for others to find and add entries in the future
@@ -62,7 +57,7 @@ per-file-ignores =
   # these will need to be added to that line as well.
 
 
-   # S101: Allow the use of assert within the tests directory, since tests require it.
+  # S101: Allow the use of assert within the tests directory, since tests require it.
   tests/**.py: S101
 
   # The following were present during the initial implementation.

.github/workflows/tests.yml

@@ -16,6 +16,8 @@ jobs:
   changelog:
     uses: ansible/ansible-content-actions/.github/workflows/changelog.yaml@main
     if: github.event_name == 'pull_request'
+  build-import:
+    uses: ansible/ansible-content-actions/.github/workflows/build_import.yaml@main
   ansible-lint:
     uses: ansible/ansible-content-actions/.github/workflows/ansible_lint.yaml@main
   sanity:
@@ -32,6 +34,7 @@ jobs:
     if: ${{ always() }}
     needs:
       - changelog
+      - build-import
       - sanity
       - unit-galaxy
       - ansible-lint
@@ -41,6 +44,7 @@ jobs:
           python -c "assert 'failure' not in
           set([
           '${{ needs.changelog.result }}',
+          '${{ needs.build-import.result }}',
           '${{ needs.sanity.result }}',
           '${{ needs.unit-galaxy.result }}'
           '${{ needs.ansible-lint.result }}'

.pre-commit-config.yaml

@@ -44,3 +44,8 @@ repos:
     rev: 24.3.0
     hooks:
       - id: black
+
+  - repo: https://github.com/pycqa/flake8
+    rev: 7.0.0
+    hooks:
+      - id: flake8

CHANGELOG.rst

@@ -5,6 +5,34 @@ Cisco Ios Collection Release Notes
 .. contents:: Topics
 
 
+v8.0.0
+======
+
+Major Changes
+-------------
+
+- Update the netcommon base version 6.1.0 to support cli_restore plugin.
+
+Minor Changes
+-------------
+
+- Add support for cli_restore functionality.
+- Please refer the PR to know more about core changes (https://github.com/ansible-collections/ansible.netcommon/pull/618).
+- cli_restore module is part of netcommon.
+
+v7.0.0
+======
+
+Major Changes
+-------------
+
+- ios_ntp - Remove deprecated ntp legacy module
+
+Removed Features (previously deprecated)
+----------------------------------------
+
+- Deprecated ios_ntp module in favor of ios_ntp_global.
+
 v6.1.4
 ======
 
@@ -658,7 +686,7 @@ Documentation Changes
 New Modules
 -----------
 
-- ios_hostname - hostname resource module
+- ios_hostname - Resource module to configure hostname.
 
 v2.6.0
 ======
@@ -689,7 +717,7 @@ Documentation Changes
 New Modules
 -----------
 
-- ios_snmp_server - snmp_server resource module
+- ios_snmp_server - Resource module to configure snmp server.
 
 v2.5.0
 ======
@@ -722,7 +750,7 @@ Documentation Changes
 New Modules
 -----------
 
-- ios_ntp_global - ntp_global resource module
+- ios_ntp_global - Resource module to configure NTP.
 
 v2.4.0
 ======
@@ -809,8 +837,8 @@ Bugfixes
 New Modules
 -----------
 
-- ios_logging_global - Logging resource module.
-- ios_prefix_lists - Prefix Lists resource module.
+- ios_logging_global - Resource module to configure logging.
+- ios_prefix_lists - Resource module to configure prefix lists.
 
 v2.1.0
 ======
@@ -834,7 +862,7 @@ Bugfixes
 New Modules
 -----------
 
-- ios_route_maps - Route Maps resource module.
+- ios_route_maps - Resource module to configure route maps.
 
 v2.0.1
 ======
@@ -879,7 +907,7 @@ Bugfixes
 New Modules
 -----------
 
-- ios_bgp_address_family - BGP Address Family resource module.
+- ios_bgp_address_family - Resource module to configure BGP Address family.
 
 v1.3.0
 ======
@@ -902,7 +930,7 @@ Bugfixes
 New Modules
 -----------
 
-- ios_bgp_global - BGP Global resource module
+- ios_bgp_global - Resource module to configure BGP.
 
 v1.2.1
 ======
@@ -933,7 +961,7 @@ Bugfixes
 New Modules
 -----------
 
-- ios_ospf_interfaces - OSPF Interfaces resource module
+- ios_ospf_interfaces - Resource module to configure OSPF interfaces.
 
 v1.1.0
 ======
@@ -954,7 +982,7 @@ Bugfixes
 New Modules
 -----------
 
-- ios_ospfv3 - OSPFv3 resource module
+- ios_ospfv3 - Resource module to configure OSPFv3.
 
 v1.0.3
 ======
@@ -1006,34 +1034,26 @@ Cliconf
 New Modules
 -----------
 
-- ios_acl_interfaces - ACL interfaces resource module
-- ios_acls - ACLs resource module
-- ios_banner - Manage multiline banners on Cisco IOS devices
-- ios_bgp - Configure global BGP protocol settings on Cisco IOS.
-- ios_command - Run commands on remote devices running Cisco IOS
-- ios_config - Manage Cisco IOS configuration sections
-- ios_facts - Collect facts from remote devices running Cisco IOS
-- ios_interface - (deprecated, removed after 2022-06-01) Manage Interface on Cisco IOS network devices
-- ios_interfaces - Interfaces resource module
-- ios_l2_interface - (deprecated, removed after 2022-06-01) Manage Layer-2 interface on Cisco IOS devices.
-- ios_l2_interfaces - L2 interfaces resource module
-- ios_l3_interface - (deprecated, removed after 2022-06-01) Manage Layer-3 interfaces on Cisco IOS network devices.
-- ios_l3_interfaces - L3 interfaces resource module
-- ios_lacp - LACP resource module
-- ios_lacp_interfaces - LACP interfaces resource module
-- ios_lag_interfaces - LAG interfaces resource module
-- ios_linkagg - Manage link aggregation groups on Cisco IOS network devices
-- ios_lldp - Manage LLDP configuration on Cisco IOS network devices.
-- ios_lldp_global - LLDP resource module
-- ios_lldp_interfaces - LLDP interfaces resource module
-- ios_logging - Manage logging on network devices
-- ios_ntp - Manages core NTP configuration.
-- ios_ospfv2 - OSPFv2 resource module
-- ios_ping - Tests reachability using ping from Cisco IOS network devices
-- ios_static_route - (deprecated, removed after 2022-06-01) Manage static IP routes on Cisco IOS network devices
-- ios_static_routes - Static routes resource module
-- ios_system - Manage the system attributes on Cisco IOS devices
-- ios_user - Manage the aggregate of local users on Cisco IOS device
-- ios_vlan - (deprecated, removed after 2022-06-01) Manage VLANs on IOS network devices
-- ios_vlans - VLANs resource module
-- ios_vrf - Manage the collection of VRF definitions on Cisco IOS devices
+- ios_acl_interfaces - Resource module to configure ACL interfaces.
+- ios_acls - Resource module to configure ACLs.
+- ios_banner - Module to configure multiline banners.
+- ios_command - Module to run commands on remote devices.
+- ios_config - Module to manage configuration sections.
+- ios_facts - Module to collect facts from remote devices.
+- ios_interfaces - Resource module to configure interfaces.
+- ios_l2_interfaces - Resource module to configure L2 interfaces.
+- ios_l3_interfaces - Resource module to configure L3 interfaces.
+- ios_lacp - Resource module to configure LACP.
+- ios_lacp_interfaces - Resource module to configure LACP interfaces.
+- ios_lag_interfaces - Resource module to configure LAG interfaces.
+- ios_linkagg - Module to configure link aggregation groups.
+- ios_lldp - (deprecated, removed after 2024-06-01) Manage LLDP configuration on Cisco IOS network devices.
+- ios_lldp_global - Resource module to configure LLDP.
+- ios_lldp_interfaces - Resource module to configure LLDP interfaces.
+- ios_ospfv2 - Resource module to configure OSPFv2.
+- ios_ping - Tests reachability using ping from IOS switch.
+- ios_static_routes - Resource module to configure static routes.
+- ios_system - Module to manage the system attributes.
+- ios_user - Module to manage the aggregates of local users.
+- ios_vlans - Resource module to configure VLANs.
+- ios_vrf - Module to configure VRF definitions.

README.md

@@ -57,7 +57,6 @@ Name | Description
 [cisco.ios.ios_lldp_global](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_lldp_global_module.rst)|Resource module to configure LLDP.
 [cisco.ios.ios_lldp_interfaces](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_lldp_interfaces_module.rst)|Resource module to configure LLDP interfaces.
 [cisco.ios.ios_logging_global](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_logging_global_module.rst)|Resource module to configure logging.
-[cisco.ios.ios_ntp](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_ntp_module.rst)|(deprecated, removed after 2024-01-01) Manages core NTP configuration.
 [cisco.ios.ios_ntp_global](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_ntp_global_module.rst)|Resource module to configure NTP.
 [cisco.ios.ios_ospf_interfaces](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_ospf_interfaces_module.rst)|Resource module to configure OSPF interfaces.
 [cisco.ios.ios_ospfv2](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_ospfv2_module.rst)|Resource module to configure OSPFv2.