Skip to content

Commit

Permalink
Merge branch 'main' into route_map_check_mode
Browse files Browse the repository at this point in the history
  • Loading branch information
rohitthakur2590 committed Nov 29, 2023
2 parents 71f52de + 2342353 commit f4b6416
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 19 deletions.
12 changes: 0 additions & 12 deletions .github/workflows/lint.yml

This file was deleted.

15 changes: 10 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: Test collection
name: CI

concurrency:
group: ${{ github.head_ref || github.run_id }}
Expand All @@ -14,9 +14,11 @@ on: # yamllint disable-line rule:truthy


jobs:
ansible-lint:
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:
Expand All @@ -28,18 +30,21 @@ 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
- sanity
- unit-galaxy
- unit-source
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'}"
])"
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ Arista Eos Collection Release Notes
.. contents:: Topics


v6.2.2
======

Bugfixes
--------

- correct the reference of string attribute 'reference_bandwith'.

v6.2.1
======

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

# Arista EOS Collection
[![CI](https://zuul-ci.org/gated.svg)](https://dashboard.zuul.ansible.com/t/ansible/project/github.com/ansible-collections/arista.eos) <!--[![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/vyos)](https://codecov.io/gh/ansible-collections/arista.eos)-->
[![Codecov](https://codecov.io/gh/ansible-collections/arista.eos/branch/main/graph/badge.svg)](https://codecov.io/gh/ansible-collections/arista.eos)
[![CI](https://github.com/ansible-collections/arista.eos/actions/workflows/tests.yml/badge.svg?branch=main&event=schedule)](https://github.com/ansible-collections/arista.eos/actions/workflows/tests.yml)

The Ansible Arista EOS collection includes a variety of Ansible content to help automate the management of Arista EOS network appliances.

Expand Down
7 changes: 7 additions & 0 deletions changelogs/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -579,3 +579,10 @@ releases:
fragments:
- rerelease.yaml
release_date: "2023-10-30"
6.2.2:
changes:
bugfixes:
- correct the reference of string attribute 'reference_bandwith'.
fragments:
- ospf_v2_reference_bandwidth_fix.yaml
release_date: "2023-11-27"
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ readme: README.md
repository: https://github.com/ansible-collections/arista.eos
issues: https://github.com/ansible-collections/arista.eos/issues
tags: [arista, eos, networking, eapi]
version: 6.2.1
version: 6.2.2
3 changes: 2 additions & 1 deletion plugins/module_utils/network/eos/config/ospfv2/ospfv2.py
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,8 @@ def add_commands(self, want, have):
commands.append(c)
if ospf_params.get("auto_cost"):
commands.append(
"auto-cost reference-bandwidth " + ospf_params["auto_cost"],
"auto-cost reference-bandwidth "
+ str(ospf_params["auto_cost"]["reference_bandwidth"]),
)
if ospf_params.get("bfd"):
os_version = self._get_os_version()
Expand Down
4 changes: 4 additions & 0 deletions tests/unit/modules/network/eos/test_eos_ospfv2.py
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,9 @@ def test_eos_ospfv2_rendered(self):
),
),
],
auto_cost=dict(
reference_bandwidth=1000000,
),
default_information=dict(
metric=100,
metric_type=1,
Expand Down Expand Up @@ -641,6 +644,7 @@ def test_eos_ospfv2_rendered(self):
"adjacency exchange-start threshold 20045623",
"area 0.0.0.2 filter 10.1.1.0/24",
"area 0.0.0.50 range 172.20.0.0/16 cost 34",
"auto-cost reference-bandwidth 1000000",
"default-information originate metric 100 metric-type 1",
"distance ospf intra-area 85",
"max-lsa 80000 40 ignore-count 3 ignore-time 6 reset-time 20",
Expand Down

0 comments on commit f4b6416

Please sign in to comment.