Merge branch 'main' into bugfix_906

.ansible-lint

@@ -0,0 +1,5 @@
+---
+profile: production
+
+exclude_paths:
+  - changelogs/changelog.yaml

.github/workflows/lint.yml

@@ -0,0 +1,12 @@
+---
+name: ansible-lint
+on:  # yamllint disable-line rule:truthy
+  pull_request:
+    branches: ["main"]
+jobs:
+  build:
+    name: Ansible Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run ansible-lint
+        uses: ansible/ansible-lint@main

.github/workflows/tests.yml

@@ -14,8 +14,6 @@ on:  # yamllint disable-line rule:truthy
 
 
 jobs:
-  ansible-lint:
-    uses: ansible-network/github_actions/.github/workflows/ansible-lint.yml@main
   changelog:
     uses: ansible-network/github_actions/.github/workflows/changelog.yml@main
     if: github.event_name != 'schedule'
@@ -32,18 +30,17 @@ jobs:
   all_green:
     if: ${{ always() && (github.event_name != 'schedule') }}
     needs:
-      - ansible-lint
       - changelog
       - sanity
       - unit-galaxy
       - unit-source
     runs-on: ubuntu-latest
     steps:
       - run: >-
-          python -c "assert set([
-          '${{ needs.ansible-lint.result }}',
+          python -c "assert 'failure' not in
+          set([
           '${{ needs.changelog.result }}',
           '${{ needs.sanity.result }}',
           '${{ needs.unit-galaxy.result }}',
           '${{ needs.unit-source.result }}'
-          ]) == {'success', 'skipped'}"
+          ])"

.pre-commit-config.yaml

@@ -18,12 +18,12 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/asottile/add-trailing-comma
-    rev: v3.0.0
+    rev: v3.0.1
     hooks:
       - id: add-trailing-comma
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.0.0-alpha.9-for-vscode"
+    rev: "v3.0.2"
     hooks:
       - id: prettier
         entry: env CI=1 bash -c "prettier --list-different . || ec=$? && prettier --loglevel=error --write . && exit $ec"
@@ -41,6 +41,6 @@ repos:
         args: ["--filter-files"]
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black

README.md

@@ -11,7 +11,7 @@ This collection has been tested against Cisco IOS XE Version 17.3 on CML.
 <!--start requires_ansible-->
 ## Ansible version compatibility
 
-This collection has been tested against following Ansible versions: **>=2.9.10**.
+This collection has been tested against following Ansible versions: **>=2.13.11**.
 
 For collections that support Ansible 2.9, please ensure you update your `network_os` to use the
 fully qualified collection name (for example, `cisco.ios.ios`).

changelogs/fragments/bgp_address_family_bug.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - bgp_address_family - fix deleted string with int concat issue in bgp_address_family.

changelogs/fragments/bug_ios_service-private_config_encryption.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - ios_service - Put condition to add `private_config_encryption` in default services

changelogs/fragments/fix_prefix_list_docs.yaml

@@ -0,0 +1,3 @@
+---
+doc_changes:
+  - Fix prefix_lists docs.

changelogs/fragments/ios_acls.yaml

@@ -0,0 +1,3 @@
+---
+doc_changes:
+  - "ios_acls - update examples and use YAML output in them for better readibility."

changelogs/fragments/ios_acls_fix.yaml

@@ -0,0 +1,6 @@
+---
+doc_changes:
+  - "ios_command - Fix formatting of examples."
+bugfixes:
+  - "ios_acls - Fix standard acls rendering."
+  - "ios_acls - Fix protocol_options rendering corrects processing of overridden/ replaced state."

changelogs/fragments/ios_snmp_user.yml

@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - ios_snmp_user - update the user part to compare correctly the auth and privacy parts.

changelogs/fragments/prefix_list_fix.yaml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - ios_prefix_lists - fix deleted state to remove exisiting prefix lists from configuration.

changelogs/fragments/stderr_re_fix.yaml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - The regex looking for errors in the terminal output was matching anything with '\S+ Error:'. Caused issues with 'show runnning-config' if this string appeared in the output. Updated the regex to require the % anchor.

changelogs/fragments/update_ospf_docs.yaml

@@ -0,0 +1,5 @@
+---
+doc_changes:
+  - Update examples for ospfv2
+  - Update examples for ospfv3
+  - Update examples for ospf_interfaces