Merge branch 'main' into add_cdp_neighbors

ansible-collections · Nov 29, 2023 · 36ffe37 · 36ffe37
2 parents ff9464b + 033213b
commit 36ffe37
Show file tree

Hide file tree

Showing 84 changed files with 3,689 additions and 3,514 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,5 +1,5 @@
 ---
-name: Test collection
+name: CI
 
 concurrency:
   group: ${{ github.head_ref || github.run_id }}
@@ -17,7 +17,7 @@ jobs:
     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'
+    if: github.event_name == 'pull_request'
   sanity:
     uses: ansible-network/github_actions/.github/workflows/sanity.yml@main
   unit-galaxy:
@@ -29,7 +29,7 @@ jobs:
         git+https://github.com/ansible-collections/ansible.utils.git
         git+https://github.com/ansible-collections/ansible.netcommon.git
   all_green:
-    if: ${{ always() && (github.event_name != 'schedule') }}
+    if: ${{ always() }}
     needs:
       - ansible-lint
       - changelog
@@ -39,10 +39,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: >-
-          python -c "assert set([
+          python -c "assert 'failure' not in
+          set([
           '${{ needs.ansible-lint.result }}',
           '${{ needs.changelog.result }}',
           '${{ needs.sanity.result }}',
           '${{ needs.unit-galaxy.result }}',
           '${{ needs.unit-source.result }}'
-          ]) == {'success'}"
+          ])"
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,29 @@ Cisco Iosxr Collection Release Notes
 .. contents:: Topics
 
 
+v6.1.1
+======
+
+Bugfixes
+--------
+
+- Fix issue in gathered state of interfaces and l3_interfaces RMs(https://github.com/ansible-collections/cisco.iosxr/issues/452, https://github.com/ansible-collections/cisco.iosxr/issues/451)
+
+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
 ======
 

diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # Cisco IOSXR Collection
 [![CI](https://zuul-ci.org/gated.svg)](https://dashboard.zuul.ansible.com/t/ansible/project/github.com/ansible-collections/cisco.iosxr) <!--[![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/vyos)](https://codecov.io/gh/ansible-collections/cisco.iosxr)-->
 [![Codecov](https://codecov.io/gh/ansible-collections/cisco.iosxr/branch/main/graph/badge.svg)](https://codecov.io/gh/ansible-collections/cisco.iosxr)
+[![CI](https://github.com/ansible-collections/cisco.iosxr/actions/workflows/tests.yml/badge.svg?branch=main&event=schedule)](https://github.com/ansible-collections/cisco.iosxr/actions/workflows/tests.yml)
+
 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.

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -660,3 +660,31 @@ releases:
       - 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"
+  6.1.1:
+    changes:
+      bugfixes:
+        - Fix issue in gathered state of interfaces and l3_interfaces RMs(https://github.com/ansible-collections/cisco.iosxr/issues/452,
+          https://github.com/ansible-collections/cisco.iosxr/issues/451)
+    fragments:
+      - bugfix_interfaces.yaml
+      - fix_acl_interfaces.yaml
+      - fix_python_version.yaml
+      - revert_pylibssh_depn.yaml
+    release_date: "2023-11-27"
diff --git a/changelogs/fragments/acls.yaml b/changelogs/fragments/acls.yaml
diff --git a/changelogs/fragments/fix_bindep.yaml b/changelogs/fragments/fix_bindep.yaml
diff --git a/changelogs/fragments/prefix_list_doc.yaml b/changelogs/fragments/prefix_list_doc.yaml
diff --git a/docs/cisco.iosxr.iosxr_acl_interfaces_module.rst b/docs/cisco.iosxr.iosxr_acl_interfaces_module.rst
@@ -240,27 +240,26 @@ Examples
     - name: Merge the provided configuration with the existing running configuration
       cisco.iosxr.iosxr_acl_interfaces:
         config:
-        - name: GigabitEthernet0/0/0/0
-          access_groups:
-          - afi: ipv4
-            acls:
-            - name: acl_1
-              direction: in
-            - name: acl_2
-              direction: out
-          - afi: ipv6
-            acls:
-            - name: acl6_1
-              direction: in
-            - name: acl6_2
-              direction: out
-
-        - name: GigabitEthernet0/0/0/1
-          access_groups:
-          - afi: ipv4
-            acls:
-            - name: acl_1
-              direction: out
+          - name: GigabitEthernet0/0/0/0
+            access_groups:
+              - afi: ipv4
+                acls:
+                  - name: acl_1
+                    direction: in
+                  - name: acl_2
+                    direction: out
+              - afi: ipv6
+                acls:
+                  - name: acl6_1
+                    direction: in
+                  - name: acl6_2
+                    direction: out
+          - name: GigabitEthernet0/0/0/1
+            access_groups:
+              - afi: ipv4
+                acls:
+                  - name: acl_1
+                    direction: out
         state: merged
 
     # After state:
@@ -309,14 +308,14 @@ Examples
     - name: Update acl_interfaces configuration using merged
       cisco.iosxr.iosxr_acl_interfaces:
         config:
-        - name: GigabitEthernet0/0/0/1
-          access_groups:
-          - afi: ipv4
-            acls:
-            - name: acl_2
-              direction: out
-            - name: acl_1
-              direction: in
+          - name: GigabitEthernet0/0/0/1
+            access_groups:
+              - afi: ipv4
+                acls:
+                  - name: acl_2
+                    direction: out
+                  - name: acl_1
+                    direction: in
         state: merged
 
     # After state:
@@ -363,15 +362,17 @@ Examples
     #  ipv4 access-group acl_1 egress
     # !
 
-    - name: Replace device configurations of listed interface with provided configurations
+    - name: >-
+        Replace device configurations of listed interface with provided
+        configurations
       cisco.iosxr.iosxr_acl_interfaces:
         config:
-        - name: GigabitEthernet0/0/0/0
-          access_groups:
-          - afi: ipv6
-            acls:
-            - name: acl6_3
-              direction: in
+          - name: GigabitEthernet0/0/0/0
+            access_groups:
+              - afi: ipv6
+                acls:
+                  - name: acl6_3
+                    direction: in
         state: replaced
 
     # After state:
@@ -418,16 +419,16 @@ Examples
     - name: Overridde all interface ACL configuration with provided configuration
       cisco.iosxr.iosxr_acl_interfaces:
         config:
-        - name: GigabitEthernet0/0/0/1
-          access_groups:
-          - afi: ipv4
-            acls:
-            - name: acl_2
-              direction: in
-          - afi: ipv6
-            acls:
-            - name: acl6_3
-              direction: out
+          - name: GigabitEthernet0/0/0/1
+            access_groups:
+              - afi: ipv4
+                acls:
+                  - name: acl_2
+                    direction: in
+              - afi: ipv6
+                acls:
+                  - name: acl6_3
+                    direction: out
         state: overridden
 
     # After state:
@@ -474,7 +475,7 @@ Examples
     - name: Delete all ACL attributes of GigabitEthernet0/0/0/1
       cisco.iosxr.iosxr_acl_interfaces:
         config:
-        - name: GigabitEthernet0/0/0/1
+          - name: GigabitEthernet0/0/0/1
         state: deleted
 
     # After state:
@@ -674,14 +675,14 @@ Examples
     - name: Render platform specific commands from task input using rendered state
       cisco.iosxr.iosxr_acl_interfaces:
         config:
-        - name: GigabitEthernet0/0/0/0
-          access_groups:
-          - afi: ipv4
-            acls:
-            - name: acl_1
-              direction: in
-            - name: acl_2
-              direction: out
+          - name: GigabitEthernet0/0/0/0
+            access_groups:
+              - afi: ipv4
+                acls:
+                  - name: acl_1
+                    direction: in
+                  - name: acl_2
+                    direction: out
         state: rendered
 
     # Task Output (redacted)