Skip to content

Commit

Permalink
Merge branch 'ansible-collections:main' into feature/Add-OG-service-s…
Browse files Browse the repository at this point in the history
…upport
  • Loading branch information
ArchelonU authored Jan 2, 2025
2 parents ad4738b + 0635a8e commit aef63c6
Show file tree
Hide file tree
Showing 44 changed files with 14,248 additions and 131 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
name: Integration
on:
pull_request_target:
branches: [main]
types:
- labeled
- opened
- reopened
- synchronize
paths:
- "plugins/**"
- "tests/integration/**"
workflow_dispatch:

jobs:
safe-to-test:
if: >-
github.event.label.name == 'safe to test' ||
github.event.action != 'labeled'
uses: ansible-network/github_actions/.github/workflows/safe-to-test.yml@main
secrets:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

integration:
uses: ansible/ansible-content-actions/.github/workflows/network_integration.yaml@main
needs:
- safe-to-test
with:
lab_title: cisco_ios
network_os: cisco.ios.ios
pytest_addopts: "--color=yes -n 2 --log-level WARNING -vvv"
collection_pre_install: >-
git+https://github.com/ansible-collections/ansible.utils.git
git+https://github.com/ansible-collections/ansible.netcommon.git
secrets:
cml_ssh_password: ${{ secrets.CML_SSH_PASSWORD }}
virl_host: ${{ secrets.VIRL_HOST }}
virl_password: ${{ secrets.VIRL_PASSWORD }}
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ Name | Description
[cisco.ios.ios_user](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_user_module.rst)|Module to manage the aggregates of local users.
[cisco.ios.ios_vlans](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_vlans_module.rst)|Resource module to configure VLANs.
[cisco.ios.ios_vrf](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_vrf_module.rst)|Module to configure VRF definitions.
[cisco.ios.ios_vrf_address_family](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_vrf_address_family_module.rst)|Resource module to configure VRF definitions.
[cisco.ios.ios_vrf_global](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_vrf_global_module.rst)|Resource module to configure global VRF definitions.
[cisco.ios.ios_vrf_interfaces](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_vrf_interfaces_module.rst)|Manages VRF configuration on interfaces.
[cisco.ios.ios_vxlan_vtep](https://github.com/ansible-collections/cisco.ios/blob/main/docs/cisco.ios.ios_vxlan_vtep_module.rst)|Resource module to configure VXLAN VTEP interface.
Expand Down
3 changes: 3 additions & 0 deletions changelogs/fragments/add_vrf_address_family.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
minor_changes:
- Adds a new module `ios_vrf_address_family` to manage VRFs address families on Cisco IOS devices.
3 changes: 3 additions & 0 deletions changelogs/fragments/fix_facts_gather.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfixes:
- Fixes an issue with facts gathering failing when an sub interface is in a deleted state.
6 changes: 6 additions & 0 deletions changelogs/fragments/fix_purge_and_overridden_operations.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
bugfixes:
- Fix purged state operation to enable users to completely remove VLAN configurations.
- Fix overridden state operations to ensure excluded VLANs in the provided configuration are removed, thus overriding the VLAN configuration.
- Improve documentation to provide clarity on the "shutdown" variable.
- Improve unit tests to align with the changes made.
Loading

0 comments on commit aef63c6

Please sign in to comment.