Merge branch 'main' into patch-1

ansible-collections · Nov 17, 2023 · cf84cf7 · cf84cf7
2 parents ae23d29 + 9909513
commit cf84cf7
Show file tree

Hide file tree

Showing 115 changed files with 20,235 additions and 8,001 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -11,16 +11,6 @@ concurrency:
   cancel-in-progress: true
 
 on:  # yamllint disable-line rule:truthy
-  push:
-    # branches to consider in the event; optional, defaults to all
-    branches:
-      - main
-      - 'releases/**'
-      - 'stable/**'
-    # Prevent a 2nd run after the changelog is updated
-    paths-ignore:
-      - CHANGELOG.rst
-      - changelogs/changelog.yaml
   workflow_dispatch:
 
 env:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -18,12 +18,12 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/asottile/add-trailing-comma
-    rev: v2.5.1
+    rev: v3.1.0
     hooks:
       - id: add-trailing-comma
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.0.0-alpha.9-for-vscode"
+    rev: "v3.0.3"
     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.9.1
     hooks:
       - id: black
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,73 @@ Cisco Iosxr Collection Release Notes
 
 .. contents:: Topics
 
+
+v6.1.0
+======
+
+Minor Changes
+-------------
+
+- iosxr_config - Relax restrictions on I(src) parameter so it can be used more like I(lines). (https://github.com/ansible-collections/cisco.iosxr/issues/343).
+- iosxr_config Add updates option in return value(https://github.com/ansible-collections/cisco.iosxr/issues/438).
+
+Documentation Changes
+---------------------
+
+- Fix docs for prefix_lists RM.
+- iosxr_acls - update examples and use YAML output in them for better readibility.
+
+v6.0.1
+======
+
+Bugfixes
+--------
+
+- Fix issue in deletion of ospf.(https://github.com/ansible-collections/cisco.iosxr/issues/425)
+- Fix issue in facts gathering for Interfaces RM.(https://github.com/ansible-collections/cisco.iosxr/issues/417)
+- Fix issue in lacp and lldp_global of local variable commands.
+- Support overridden state in bgp_global,lacp and lldp_global module.(https://github.com/ansible-collections/cisco.iosxr/issues/386)
+
+Documentation Changes
+---------------------
+
+- Fix grpc sub plugin documentation.
+- Update ospf_interfaces examples
+- Update ospfv2 examples
+- Update ospfv3 examples
+
+v6.0.0
+======
+
+Minor Changes
+-------------
+
+- Add iosxr_bgp_templates module (https://github.com/ansible-collections/cisco.iosxr/issues/341).
+- iosxr_facts - Add CPU utilization.
+- iosxr_l2_interfaces - fix issue in supporting multiple iosxr version. (https://github.com/ansible-collections/cisco.iosxr/issues/379).
+
+Deprecated Features
+-------------------
+
+- Deprecated iosxr_bgp module in favor of iosxr_bgp_global,iosxr_bgp_neighbor_address_family and iosxr_bgp_address_family.
+- iosxr_l2_interfaces - deprecate q_vlan with qvlan which allows vlans in str format e.g "any"
+
+Bugfixes
+--------
+
+- Add support to delete specific static route entry.(https://github.com/ansible-collections/cisco.iosxr/issues/375)
+- l2_interfaces Fix issue in qvlan parsing.(https://github.com/ansible-collections/cisco.iosxr/issues/403)
+
+Documentation Changes
+---------------------
+
+- iosxr_facts - Add ansible_net_cpu_utilization.
+
+New Modules
+-----------
+
+- iosxr_bgp_templates - Manages BGP templates resource module.
+
 v5.0.3
 ======
 

diff --git a/README.md b/README.md
@@ -38,10 +38,10 @@ Name | Description
 [cisco.iosxr.iosxr_acl_interfaces](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_acl_interfaces_module.rst)|Resource module to configure ACL interfaces.
 [cisco.iosxr.iosxr_acls](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_acls_module.rst)|Resource module to configure ACLs.
 [cisco.iosxr.iosxr_banner](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_banner_module.rst)|Module to configure multiline banners.
-[cisco.iosxr.iosxr_bgp](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_bgp_module.rst)|Module to configure BGP protocol settings.
 [cisco.iosxr.iosxr_bgp_address_family](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_bgp_address_family_module.rst)|Resource module to configure BGP Address family.
 [cisco.iosxr.iosxr_bgp_global](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_bgp_global_module.rst)|Resource module to configure BGP.
 [cisco.iosxr.iosxr_bgp_neighbor_address_family](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_bgp_neighbor_address_family_module.rst)|Resource module to configure BGP Neighbor Address family.
+[cisco.iosxr.iosxr_bgp_templates](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_bgp_templates_module.rst)|Manages BGP templates resource module.
 [cisco.iosxr.iosxr_command](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_command_module.rst)|Module to run commands on remote devices.
 [cisco.iosxr.iosxr_config](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_config_module.rst)|Module to manage configuration sections.
 [cisco.iosxr.iosxr_facts](https://github.com/ansible-collections/cisco.iosxr/blob/main/docs/cisco.iosxr.iosxr_facts_module.rst)|Module to collect facts from remote devices.

diff --git a/bindep.txt b/bindep.txt
@@ -2,10 +2,8 @@
 # see https://docs.openstack.org/infra/bindep/ for additional information.
 
 gcc-c++ [doc test platform:rpm]
-python3-devel [test platform:rpm]
-python3 [test platform:rpm]
 libssh-devel [test platform:rpm]
 libffi-devel [test platform:rpm]
 openssl-devel [test platform:rpm]
 
-python38-lxml [platform:centos-8 platform:rhel-8]
+python3-lxml [platform:centos-8 platform:rhel-8]
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -610,3 +610,70 @@ releases:
       - fix_l3_interface.yaml
       - healthcheck_pr_1.yml
     release_date: "2023-05-29"
+  6.0.0:
+    changes:
+      bugfixes:
+        - Add support to delete specific static route entry.(https://github.com/ansible-collections/cisco.iosxr/issues/375)
+        - l2_interfaces Fix issue in qvlan parsing.(https://github.com/ansible-collections/cisco.iosxr/issues/403)
+      deprecated_features:
+        - Deprecated iosxr_bgp module in favor of iosxr_bgp_global,iosxr_bgp_neighbor_address_family
+          and iosxr_bgp_address_family.
+        - iosxr_l2_interfaces - deprecate q_vlan with qvlan which allows vlans in str
+          format e.g "any"
+      doc_changes:
+        - iosxr_facts - Add ansible_net_cpu_utilization.
+      minor_changes:
+        - Add iosxr_bgp_templates module (https://github.com/ansible-collections/cisco.iosxr/issues/341).
+        - iosxr_facts - Add CPU utilization.
+        - iosxr_l2_interfaces - fix issue in supporting multiple iosxr version. (https://github.com/ansible-collections/cisco.iosxr/issues/379).
+    fragments:
+      - bgp_templates.yaml
+      - bugfix_l2_interface.yaml
+      - cpu_util.yaml
+      - delete_static_route.yaml
+      - fix_l2_interface.yaml
+      - fix_l2_interface_qvlan.yaml
+      - gha_release.yml
+      - remove_old_modules.yaml
+    modules:
+      - description: Manages BGP templates resource module.
+        name: iosxr_bgp_templates
+        namespace: ""
+    release_date: "2023-07-05"
+  6.0.1:
+    changes:
+      bugfixes:
+        - Fix issue in deletion of ospf.(https://github.com/ansible-collections/cisco.iosxr/issues/425)
+        - Fix issue in facts gathering for Interfaces RM.(https://github.com/ansible-collections/cisco.iosxr/issues/417)
+        - Fix issue in lacp and lldp_global of local variable commands.
+        - Support overridden state in bgp_global,lacp and lldp_global module.(https://github.com/ansible-collections/cisco.iosxr/issues/386)
+      doc_changes:
+        - Fix grpc sub plugin documentation.
+        - Update ospf_interfaces examples
+        - Update ospfv2 examples
+        - Update ospfv3 examples
+    fragments:
+      - Fix_interface_facts.yaml
+      - codecov_pr.yml
+      - fix_ospfv3.yaml
+      - sub_plugin_doc.yml
+      - support_overridden.yaml
+      - update_ospfv2_docs.yaml
+    release_date: "2023-09-07"
+  6.1.0:
+    changes:
+      doc_changes:
+        - Fix docs for prefix_lists RM.
+        - iosxr_acls - update examples and use YAML output in them for better readibility.
+      minor_changes:
+        - iosxr_config - Relax restrictions on I(src) parameter so it can be used more
+          like I(lines). (https://github.com/ansible-collections/cisco.iosxr/issues/343).
+        - iosxr_config Add updates option in return value(https://github.com/ansible-collections/cisco.iosxr/issues/438).
+    fragments:
+      - Fix_iosxr_user_tests.yaml
+      - acls.yaml
+      - fix_bindep.yaml
+      - fix_config_module.yaml
+      - fix_iosxr_config.yaml
+      - prefix_list_doc.yaml
+    release_date: "2023-10-30"
diff --git a/changelogs/fragments/bugfix_l2_interface.yaml b/changelogs/fragments/bugfix_l2_interface.yaml
diff --git a/changelogs/fragments/delete_static_route.yaml b/changelogs/fragments/delete_static_route.yaml
diff --git a/changelogs/fragments/fix_l2_interface.yaml b/changelogs/fragments/fix_l2_interface.yaml
diff --git a/changelogs/fragments/fix_python_version.yaml b/changelogs/fragments/fix_python_version.yaml
@@ -0,0 +1,3 @@
+---
+trivial:
+  - Fix python requirement for tests.
diff --git a/changelogs/fragments/gha_release.yml b/changelogs/fragments/gha_release.yml
diff --git a/codecov.yml b/codecov.yml
@@ -1,7 +1,12 @@
 ---
 codecov:
   require_ci_to_pass: true
-comment: false
+comment:
+  layout: " diff, flags, files"
+  behavior: default
+  require_changes: false
+  require_base: false
+  require_head: true
 coverage:
   status:
     patch: false

diff --git a/...utils/network/iosxr/providers/__init__.py → docs/__init__.py b/...utils/network/iosxr/providers/__init__.py → docs/__init__.py