Skip to content

Commit

Permalink
Feat(eos_cli_config_gen): Add ICMP echo size for Monitor Connectivity…
Browse files Browse the repository at this point in the history 
… hosts (#4853)

Co-authored-by: Guillaume Mulocher <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
@ctyrider @gmuloc @pre-commit-ci
3 people authored Jan 13, 2025
1 parent 1d779e5 commit f2b2ad1
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 20 deletions.
30 changes: 16 additions & 14 deletions ...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2773,12 +2773,12 @@ monitor server radius

#### Host Parameters

| Host Name | Description | IPv4 Address | Probing Interface Set | Address Only | URL |
| --------- | ----------- | ------------ | --------------------- | ------------ | --- |
| server1 | server1_connectivity_monitor | 10.10.10.1 | HOST_SET | True | https://server1.local.com |
| server2 | server2_connectivity_monitor | 10.10.10.2 | HOST_SET | True | https://server2.local.com |
| server3 | server3_connectivity_monitor | 10.10.10.3 | HOST_SET | False | - |
| server4 | - | - | - | True | - |
| Host Name | Description | IPv4 Address | ICMP Echo Size | Probing Interface Set | Address Only | URL |
| --------- | ----------- | ------------ | -------------- | --------------------- | ------------ | --- |
| server1 | server1_connectivity_monitor | 10.10.10.1 | - | HOST_SET | True | https://server1.local.com |
| server2 | server2_connectivity_monitor | 10.10.10.2 | - | HOST_SET | True | https://server2.local.com |
| server3 | server3_connectivity_monitor | 10.10.10.3 | 1200 | HOST_SET | False | - |
| server4 | - | - | - | - | True | - |

### VRF Configuration

Expand All @@ -2798,11 +2798,11 @@ monitor server radius

##### Host Parameters

| Host Name | Description | IPv4 Address | Probing Interface Set | Address Only | URL |
| --------- | ----------- | ------------ | --------------------- | ------------ | --- |
| server4 | server4_connectivity_monitor | 10.10.20.1 | VRF_GLOBAL_SET | False | https://server2.local.com |
| server5 | server5_connectivity_monitor | 10.10.20.11 | VRF_GLOBAL_SET | True | https://server5.local.com |
| server6 | - | - | - | True | - |
| Host Name | Description | IPv4 Address | ICMP Echo Size | Probing Interface Set | Address Only | URL |
| --------- | ----------- | ------------ | -------------- | --------------------- | ------------ | --- |
| server4 | server4_connectivity_monitor | 10.10.20.1 | - | VRF_GLOBAL_SET | False | https://server2.local.com |
| server5 | server5_connectivity_monitor | 10.10.20.11 | - | VRF_GLOBAL_SET | True | https://server5.local.com |
| server6 | - | - | - | - | True | - |

#### Vrf red Configuration

Expand All @@ -2815,9 +2815,9 @@ monitor server radius

##### Host Parameters

| Host Name | Description | IPv4 Address | Probing Interface Set | Address Only | URL |
| --------- | ----------- | ------------ | --------------------- | ------------ | --- |
| server2 | server2_connectivity_monitor | 10.10.20.1 | VRF_HOST_SET | True | https://server2.local.com |
| Host Name | Description | IPv4 Address | ICMP Echo Size | Probing Interface Set | Address Only | URL |
| --------- | ----------- | ------------ | -------------- | --------------------- | ------------ | --- |
| server2 | server2_connectivity_monitor | 10.10.20.1 | 1300 | VRF_HOST_SET | True | https://server2.local.com |

#### Vrf yellow Configuration

Expand Down Expand Up @@ -2863,6 +2863,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 @@ -2891,6 +2892,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
Original file line number Diff line number Diff line change
Expand Up @@ -3936,6 +3936,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 @@ -3964,6 +3965,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 ...arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/monitor-connectivity.yml
View file
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

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

12 changes: 6 additions & 6 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/monitor-connectivity.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@

#### Host Parameters

| Host Name | Description | IPv4 Address | Probing Interface Set | Address Only | URL |
| --------- | ----------- | ------------ | --------------------- | ------------ | --- |
| Host Name | Description | IPv4 Address | ICMP Echo Size | Probing Interface Set | Address Only | URL |
| --------- | ----------- | ------------ | -------------- | --------------------- | ------------ | --- |
{% for host in monitor_connectivity.hosts | arista.avd.natural_sort('name') %}
{% if host.name is arista.avd.defined %}
| {{ host.name }} | {{ host.description | arista.avd.default('-') }} | {{ host.ip | arista.avd.default('-') }} | {{ host.local_interfaces | arista.avd.default('-') }} | {{ host.address_only | arista.avd.default(true) }} | {{ host.url | arista.avd.default('-') }} |
| {{ host.name }} | {{ host.description | arista.avd.default('-') }} | {{ host.ip | arista.avd.default('-') }} | {{ host.icmp_echo_size | arista.avd.default('-') }} | {{ host.local_interfaces | arista.avd.default('-') }} | {{ host.address_only | arista.avd.default(true) }} | {{ host.url | arista.avd.default('-') }} |
{% endif %}
{% endfor %}
{% endif %}
Expand Down Expand Up @@ -70,11 +70,11 @@

##### Host Parameters

| Host Name | Description | IPv4 Address | Probing Interface Set | Address Only | URL |
| --------- | ----------- | ------------ | --------------------- | ------------ | --- |
| Host Name | Description | IPv4 Address | ICMP Echo Size | Probing Interface Set | Address Only | URL |
| --------- | ----------- | ------------ | -------------- | --------------------- | ------------ | --- |
{% for host in vrf.hosts | arista.avd.natural_sort('name') %}
{% if host.name is arista.avd.defined %}
| {{ host.name }} | {{ host.description | arista.avd.default('-') }} | {{ host.ip | arista.avd.default('-') }} | {{ host.local_interfaces | arista.avd.default('-') }} | {{ host.address_only | arista.avd.default(true) }} | {{ host.url | arista.avd.default('-') }} |
| {{ host.name }} | {{ host.description | arista.avd.default('-') }} | {{ host.ip | arista.avd.default('-') }} | {{ host.icmp_echo_size | arista.avd.default('-') }} | {{ host.local_interfaces | arista.avd.default('-') }} | {{ host.address_only | arista.avd.default(true) }} | {{ host.url | arista.avd.default('-') }} |
{% endif %}
{% endfor %}
{% endif %}
Expand Down
6 changes: 6 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/monitor-connectivity.j2
View file
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 %}
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

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

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
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

0 comments on commit f2b2ad1

Please sign in to comment.