Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat(eos_cli_config_gen): Add ICMP echo size for Monitor Connectivity hosts #4853

Open
wants to merge 5 commits into
base: devel
Choose a base branch
from
Open

Feat(eos_cli_config_gen): Add ICMP echo size for Monitor Connectivity hosts #4853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
128e67f
jinja updates
ctyrider Jan 3, 2025
ec11fdf
molecule update
ctyrider Jan 7, 2025
143937f
Merge branch 'devel' into issue4848
gmuloc Jan 7, 2025
80abaeb
change ordering
ctyrider Jan 7, 2025
7445190
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2843,6 +2843,7 @@ monitor connectivity
server2_connectivity_monitor
local-interfaces VRF_HOST_SET address-only
ip 10.10.20.1
icmp echo size 1300
url https://server2.local.com
!
vrf yellow
Expand Down Expand Up @@ -2871,6 +2872,7 @@ monitor connectivity
server3_connectivity_monitor
local-interfaces HOST_SET
ip 10.10.10.3
icmp echo size 1200
!
host server4
```
Expand Down
2 changes: 2 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3935,6 +3935,7 @@ monitor connectivity
server2_connectivity_monitor
local-interfaces VRF_HOST_SET address-only
ip 10.10.20.1
icmp echo size 1300
ctyrider marked this conversation as resolved.
Show resolved Hide resolved
url https://server2.local.com
!
vrf yellow
Expand Down Expand Up @@ -3963,6 +3964,7 @@ monitor connectivity
server3_connectivity_monitor
local-interfaces HOST_SET
ip 10.10.10.3
icmp echo size 1200
ctyrider marked this conversation as resolved.
Show resolved Hide resolved
!
host server4
!
Expand Down
2 changes: 2 additions & 0 deletions ...arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/monitor-connectivity.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ monitor_connectivity:
- name: server3
description: server3_connectivity_monitor
ip: 10.10.10.3
icmp_echo_size: 1200
local_interfaces: HOST_SET
address_only: false
- name: server4
Expand All @@ -41,6 +42,7 @@ monitor_connectivity:
- name: server2
description: server2_connectivity_monitor
ip: 10.10.20.1
icmp_echo_size: 1300
local_interfaces: VRF_HOST_SET
url: https://server2.local.com
- name: blue
Expand Down
8 changes: 8 additions & 0 deletions ...ections/arista/avd/roles/eos_cli_config_gen/docs/tables/monitor-connectivity.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/monitor-connectivity.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ monitor connectivity
{% if host.ip is arista.avd.defined %}
ip {{ host.ip }}
{% endif %}
{% if host.icmp_echo_size is arista.avd.defined %}
ctyrider marked this conversation as resolved.
Show resolved Hide resolved
icmp echo size {{ host.icmp_echo_size }}
{% endif %}
{% if host.url is arista.avd.defined %}
url {{ host.url }}
{% endif %}
Expand Down Expand Up @@ -92,6 +95,9 @@ monitor connectivity
{% if host.ip is arista.avd.defined %}
ip {{ host.ip }}
{% endif %}
{% if host.icmp_echo_size is arista.avd.defined %}
icmp echo size {{ host.icmp_echo_size }}
{% endif %}
{% if host.url is arista.avd.defined %}
url {{ host.url }}
{% endif %}
Expand Down
10 changes: 10 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/monitor_connectivity.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ keys:
type: str
ip:
type: str
icmp_echo_size:
type: int
description: Size of ICMP probe in bytes.
convert_types:
- str
min: 36
max: 18024
local_interfaces:
type: str
address_only:
Expand Down Expand Up @@ -104,6 +111,13 @@ keys:
type: str
ip:
type: str
icmp_echo_size:
type: int
description: Size of ICMP probe in bytes.
convert_types:
- str
min: 36
max: 18024
local_interfaces:
type: str
address_only:
Expand Down
Loading