Merge branch 'main' into bug453_port_group

.ansible-lint

@@ -1,7 +1,6 @@
 ---
+
 profile: production
-exclude_paths:
-  - changelogs/changelog.yaml
 skip_list:
   # ansible-lint does not like the `import-3.11` ignore in tests/sanity/ignore-*.txt
   - sanity

.flake8

@@ -0,0 +1,67 @@
+[flake8]
+
+builtins = _
+
+# Print the total number of errors:
+count = true
+
+# Don't even try to analyze these:
+extend-exclude =
+  # No need to traverse egg info dir
+  *.egg-info,
+  # tool cache dirs
+  *_cache
+  # project env vars
+  .env,
+  # GitHub configs
+  .github,
+  # Cache files of MyPy
+  .mypy_cache,
+  # Cache files of pytest
+  .pytest_cache,
+  # Temp dir of pytest-testmon
+  .tmontmp,
+  # Occasional virtualenv dir
+  .venv
+  # VS Code
+  .vscode,
+  # Temporary build dir
+  build,
+  # This contains sdists and wheels of ansible-navigator that we don't want to check
+  dist,
+  # Metadata of `pip wheel` cmd is autogenerated
+  pip-wheel-metadata,
+  # adjacent venv
+  venv
+  # ansible won't let me
+  __init__.py
+
+# IMPORTANT: avoid using ignore option, always use extend-ignore instead
+# Completely and unconditionally ignore the following errors:
+extend-ignore =
+  F841,
+  # line-length
+  E501,
+  # module level import not at top of file
+  E402
+
+# Accessibility/large fonts and PEP8 unfriendly:
+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
+per-file-ignores =
+  # The following ignores have been researched and should be considered permanent
+  # each should be preceeded with an explanation of each of the error codes
+  # If other ignores are added for a specific file in the section following this,
+  # 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.
+  tests/**.py: S101
+
+  # The following were present during the initial implementation.
+  # They are expected to be fixed and unignored over time.
+
+# Count the number of occurrences of each error/warning code and print a report:
+statistics = true

.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: iosxr
+  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 }}
@@ -14,12 +14,16 @@ on:  # yamllint disable-line rule:truthy
 
 jobs:
   changelog:
-    uses: ansible-network/github_actions/.github/workflows/changelog.yml@main
+    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:
-    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:
@@ -30,8 +34,10 @@ jobs:
     if: ${{ always() }}
     needs:
       - changelog
+      - build-import
       - sanity
       - unit-galaxy
+      - ansible-lint
       - unit-source
     runs-on: ubuntu-latest
     steps:
@@ -41,5 +47,6 @@ jobs:
           '${{ needs.changelog.result }}',
           '${{ needs.sanity.result }}',
           '${{ needs.unit-galaxy.result }}',
+          '${{ needs.ansible-lint.result }}',
           '${{ needs.unit-source.result }}'
           ])"

.pre-commit-config.yaml

@@ -3,7 +3,6 @@ repos:
   - repo: https://github.com/ansible-network/collection_prep
     rev: 1.1.1
     hooks:
-      # - id: autoversion # removed as being handled by GHA push and release drafter
       - id: update-docs
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -23,7 +22,7 @@ repos:
       - id: add-trailing-comma
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.0.3"
+    rev: "v4.0.0-alpha.8"
     hooks:
       - id: prettier
         entry: env CI=1 bash -c "prettier --list-different . || ec=$? && prettier --loglevel=error --write . && exit $ec"
@@ -34,13 +33,18 @@ repos:
           - prettier-plugin-toml
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         name: Sort import statements using isort
         args: ["--filter-files"]
 
   - repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 23.12.1
     hooks:
       - id: black
+
+  - repo: https://github.com/pycqa/flake8
+    rev: 7.0.0
+    hooks:
+      - id: flake8

CHANGELOG.rst

@@ -5,6 +5,32 @@ Cisco Iosxr Collection Release Notes
 .. contents:: Topics
 
 
+v8.0.0
+======
+
+Major Changes
+-------------
+
+- This release removes previously deprecated module and attributes from this collection. Please refer to the **Removed Features** section for details.
+
+Removed Features (previously deprecated)
+----------------------------------------
+
+- Remove deprecated iosxr_logging module which is replaced with iosxr_logging_global resource module.
+
+v7.2.0
+======
+
+Minor Changes
+-------------
+
+- Add missing options in afi and safi in address-family of bgp_templates RM.
+
+Bugfixes
+--------
+
+- Fix 'afi' value in bgp_templates RM to valid values.
+
 v7.1.0
 ======
 

README.md

@@ -5,7 +5,7 @@
 
 The Ansible Cisco IOSXR collection includes a variety of Ansible content to help automate the management of Cisco IOSXR network appliances.
 
-This collection has been tested against Cisco IOSXR version 7.0.2.
+This collection has been tested against Cisco IOS-XR version 7.0.2
 
 <!--start requires_ansible-->
 ## Ansible version compatibility
@@ -20,7 +20,8 @@ PEP440 is the schema used to describe the versions of Ansible.
 <!--end requires_ansible-->
 
 ### Supported connections
-The Cisco IOSXR collection supports ``network_cli``  and ``netconf`` connections.
+
+The Cisco IOS-XR collection supports ``network_cli``  and ``netconf`` connections. A detailed platform guide can be found [here](https://github.com/ansible-collections/cisco.iosxr/blob/main/platform_guide.rst).
 
 ## Included content
 <!--start collection content-->
@@ -56,7 +57,6 @@ Name | Description
 [cisco.iosxr.iosxr_lag_interfaces](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_lag_interfaces_module.rst)|Resource module to configure LAG interfaces.
 [cisco.iosxr.iosxr_lldp_global](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_lldp_global_module.rst)|Resource module to configure LLDP.
 [cisco.iosxr.iosxr_lldp_interfaces](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_lldp_interfaces_module.rst)|Resource module to configure LLDP interfaces.
-[cisco.iosxr.iosxr_logging](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_logging_module.rst)|(deprecated, removed after 2023-08-01) Configuration management of system logging services on network devices
 [cisco.iosxr.iosxr_logging_global](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_logging_global_module.rst)|Resource module to configure logging.
 [cisco.iosxr.iosxr_netconf](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_netconf_module.rst)|Configures NetConf sub-system service on Cisco IOS-XR devices
 [cisco.iosxr.iosxr_ntp_global](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_ntp_global_module.rst)|Resource module to configure NTP.
@@ -76,7 +76,7 @@ Click the ``Content`` button to see the list of content included in this collect
 
 ## Installing this collection
 
-You can install the Cisco IOSXR collection with the Ansible Galaxy CLI:
+You can install the Cisco IOS-XR collection with the Ansible Galaxy CLI:
 
     ansible-galaxy collection install cisco.iosxr
 

changelogs/changelog.yaml

@@ -52,11 +52,6 @@ releases:
       - description: LLDP interfaces resource module
         name: iosxr_lldp_interfaces
         namespace: ""
-      - description:
-          Configuration management of system logging services on network
-          devices
-        name: iosxr_logging
-        namespace: ""
       - description: Configures NetConf sub-system service on Cisco IOS-XR devices
         name: iosxr_netconf
         namespace: ""
@@ -709,3 +704,26 @@ releases:
       - fix_add_cdp_neighbors.yaml
       - fix_iosxr_config.yaml
     release_date: "2024-01-08"
+  7.2.0:
+    changes:
+      bugfixes:
+        - Fix 'afi' value in bgp_templates RM to valid values.
+      minor_changes:
+        - Add missing options in afi and safi in address-family of bgp_templates RM.
+    fragments:
+      - bugfix_bgp_templates.yaml
+      - fix_bgp_template.yaml
+      - fix_nightly.yaml
+    release_date: "2024-03-01"
+  8.0.0:
+    changes:
+      major_changes:
+        - This release removes previously deprecated module and attributes from this
+          collection. Please refer to the **Removed Features** section for details.
+      removed_features:
+        - Remove deprecated iosxr_logging module which is replaced with iosxr_logging_global
+          resource module.
+    fragments:
+      - remove_deprecated.yaml
+      - trivial_tests_updates.yaml
+    release_date: "2024-03-27"

changelogs/fragments/add_2.18.yaml

@@ -0,0 +1,3 @@
+---
+trivial:
+  - Add ignore-2.18.txt.

changelogs/fragments/remove_tests.yaml

@@ -0,0 +1,3 @@
+---
+trivial:
+  - Remove tests related to iosxr_logging deprecated module.