Merge branch 'main' into fixing-issue-829

.ansible-lint

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

.github/workflows/ack.yml → .github/workflows/check_label.yml

@@ -1,15 +1,11 @@
 ---
-# See https://github.com/ansible-community/devtools/blob/main/.github/workflows/ack.yml
-name: ack
-
+name: "Check label"
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
-
 on:  # yamllint disable-line rule:truthy
   pull_request_target:
     types: [opened, labeled, unlabeled, synchronize]
-
 jobs:
-  ack:
-    uses: ansible/devtools/.github/workflows/ack.yml@main
+  check_label:
+    uses: ansible/ansible-content-actions/.github/workflows/check_label.yaml@main

.github/workflows/codecoverage.yml

@@ -1,8 +1,9 @@
 ---
-name: code_coverage
+name: "Code coverage"
 
 on:  # yamllint disable-line rule:truthy
   push:
+    branches: [main]
   pull_request:
     branches: [ main ]
 

.github/workflows/draft_release.yml

@@ -0,0 +1,18 @@
+---
+name: "Draft release"
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+on:  # yamllint disable-line rule:truthy
+  workflow_dispatch:
+env:
+  NAMESPACE: ${{ github.repository_owner }}
+  COLLECTION_NAME: ios
+  ANSIBLE_COLLECTIONS_PATHS: ./
+jobs:
+  update_release_draft:
+    uses: ansible/ansible-content-actions/.github/workflows/draft_release.yaml@main
+    with:
+      repo: ${{ github.event.pull_request.head.repo.full_name }}
+    secrets:
+      BOT_PAT: ${{ secrets.BOT_PAT }}

.github/workflows/release.yml

@@ -1,12 +1,12 @@
 ---
-name: release
+name: "Release collection"
 on:  # yamllint disable-line rule:truthy
   release:
     types: [published]
 
 jobs:
   release:
-    uses: ansible/devtools/.github/workflows/release_collection.yml@main
+    uses: ansible/ansible-content-actions/.github/workflows/release.yaml@main
     with:
       environment: release
     secrets:

.github/workflows/tests.yml

@@ -1,5 +1,5 @@
 ---
-name: CI
+name: "CI"
 
 concurrency:
   group: ${{ github.head_ref || github.run_id }}
@@ -12,15 +12,16 @@ on:  # yamllint disable-line rule:truthy
   schedule:
     - cron: '0 0 * * *'
 
-
 jobs:
   changelog:
-    uses: ansible-network/github_actions/.github/workflows/changelog.yml@main
-    if: github.event_name != 'schedule'
+    uses: ansible/ansible-content-actions/.github/workflows/changelog.yaml@main
+    if: github.event_name == 'pull_request'
+  ansible-lint:
+    uses: ansible/ansible-content-actions/.github/workflows/ansible_lint.yaml@main
   sanity:
-    uses: ansible-network/github_actions/.github/workflows/sanity.yml@main
+    uses: ansible/ansible-content-actions/.github/workflows/sanity.yaml@main
   unit-galaxy:
-    uses: ansible-network/github_actions/.github/workflows/unit_galaxy.yml@main
+    uses: ansible/ansible-content-actions/.github/workflows/unit.yaml@main
   unit-source:
     uses: ansible-network/github_actions/.github/workflows/unit_source.yml@main
     with:
@@ -33,14 +34,15 @@ jobs:
       - changelog
       - sanity
       - unit-galaxy
-      - unit-source
+      - ansible-lint
     runs-on: ubuntu-latest
     steps:
       - run: >-
           python -c "assert 'failure' not in
           set([
           '${{ needs.changelog.result }}',
           '${{ needs.sanity.result }}',
-          '${{ needs.unit-galaxy.result }}',
+          '${{ needs.unit-galaxy.result }}'
+          '${{ needs.ansible-lint.result }}'
           '${{ needs.unit-source.result }}'
           ])"

CHANGELOG.rst

@@ -5,6 +5,43 @@ Cisco Ios Collection Release Notes
 .. contents:: Topics
 
 
+v6.1.3
+======
+
+Bugfixes
+--------
+
+- ios_acls - Adds back existing remarks for an ace entry when updated with replaced or overridden state, as all remarks for a specific sequence gets removed when ace entry is updated.
+- ios_bgp_global - Shutdown attributes generates negate command on set as false.
+- ios_vrf - Update and add missing argspec keys that define the attributes.
+
+Documentation Changes
+---------------------
+
+- ios_vrf - Update and add missing documentation for ios_vrf module.
+
+v6.1.2
+======
+
+Bugfixes
+--------
+
+- ios_acls - Fix replaced state to consider remarks and ace entries while comparing configuration.
+- ios_acls - correctly match the different line for ACL without sequence number
+- ios_acls - take correctly in case where we want to push an ACL from a different type
+- ios_ospfv2 - Fix improper rendering of admin_distance attribute.
+- ios_snmp_server - fixed config issue with snmp user password update being idempotent on consecutive runs.
+- ios_user - Fix configuration of hashed passwords and secrets.
+
+v6.1.1
+======
+
+Bugfixes
+--------
+
+- Prevents module_defaults from were being incorrectly applied to the platform action, instead of the concerned module.
+- ios_vlans - fixes behaviour of shutdown attribute with action states.
+
 v6.1.0
 ======
 

README.md

@@ -22,7 +22,7 @@ PEP440 is the schema used to describe the versions of Ansible.
 
 ### Supported connections
 
-The Cisco IOS collection supports `network_cli` connections.
+The Cisco IOS collection supports `network_cli` connections. A detailed platform guide can be found [here](https://github.com/ansible-collections/cisco.ios/blob/main/platform_guide.rst).
 
 ## Included content
 

changelogs/changelog.yaml

@@ -1109,3 +1109,47 @@ releases:
       - snmp_server_ipv6_acl.yml
       - template_revoke_bgp.yaml
     release_date: "2024-01-11"
+  6.1.1:
+    changes:
+      bugfixes:
+        - Prevents module_defaults from were being incorrectly applied to the platform
+          action, instead of the concerned module.
+        - ios_vlans - fixes behaviour of shutdown attribute with action states.
+    fragments:
+      - module_defaults.yaml
+      - vlan_shutdown_fix.yaml
+    release_date: "2024-01-30"
+  6.1.2:
+    changes:
+      bugfixes:
+        - ios_acls - Fix replaced state to consider remarks and ace entries while comparing
+          configuration.
+        - ios_acls - correctly match the different line for ACL without sequence number
+        - ios_acls - take correctly in case where we want to push an ACL from a different
+          type
+        - ios_ospfv2 - Fix improper rendering of admin_distance attribute.
+        - ios_snmp_server - fixed config issue with snmp user password update being
+          idempotent on consecutive runs.
+        - ios_user - Fix configuration of hashed passwords and secrets.
+    fragments:
+      - ios_acls_changes.yml
+      - ios_acls_replaced_state.yml
+      - ios_user_bug.yml
+      - ospfv2_admin_distance_fix.yml
+      - snmp_idempotancy_fix.yml
+    release_date: "2024-02-14"
+  6.1.3:
+    changes:
+      bugfixes:
+        - ios_acls - Adds back existing remarks for an ace entry when updated with replaced
+          or overridden state, as all remarks for a specific sequence gets removed when
+          ace entry is updated.
+        - ios_bgp_global - Shutdown attributes generates negate command on set as false.
+        - ios_vrf - Update and add missing argspec keys that define the attributes.
+      doc_changes:
+        - ios_vrf - Update and add missing documentation for ios_vrf module.
+    fragments:
+      - bgp_global_shutdown.yml
+      - ios_acls_sticky.yml
+      - ios_vrf_docfix.yml
+    release_date: "2024-03-08"

changelogs/config.yaml

@@ -1,3 +1,4 @@
+---
 changelog_filename_template: ../CHANGELOG.rst
 changelog_filename_version_depth: 0
 changes_file: changelog.yaml

changelogs/fragments/acl_refactor.yaml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - ios_acls - update module to apply remarks entry with sequence numbers.