Skip to content

Commit 7d7aefa

Browse files
philippebureaugmulocClausHolbechArista
authored
Fix(eos_cli_config_gen): Correct schema and template for sflow.interface.egress (#6487)
Co-authored-by: Guillaume Mulocher <gmulocher@arista.com> Co-authored-by: Claus Holbech <holbech@arista.com>
1 parent 9dbc685 commit 7d7aefa

6 files changed

Lines changed: 12 additions & 7 deletions

File tree

ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/sflow.md

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/porting-guides/6.x.x.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1714,6 +1714,7 @@ Starting AVD 6.0.0, the following data model keys will have defined restrictions
17141714
| `router_general.vrfs[].leak_routes[].source_vrf` | required |
17151715
| `router_isis.segment_routing_mpls.prefix_segments[].prefix` | primary key |
17161716
| `router_isis.set_overload_bit.enabled` | required |
1717+
| `sflow.interface.egress.enable_default` | required |
17171718

17181719
## Changes to role `arista.avd.anta_runner`
17191720

python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/sflow.j2

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,12 @@ no sflow extension {{ extension.name }}
6262
{% if sflow.interface.disable.default is arista.avd.defined(true) %}
6363
sflow interface disable default
6464
{% endif %}
65-
{% if sflow.interface.egress.enable_default is arista.avd.defined(true) and sflow.interface.egress.unmodified is arista.avd.defined(false) %}
66-
sflow interface egress enable default
67-
{% elif sflow.interface.egress.enable_default is arista.avd.defined(true) and sflow.interface.egress.unmodified is arista.avd.defined(true) %}
65+
{% if sflow.interface.egress.enable_default is arista.avd.defined(true) %}
66+
{% if sflow.interface.egress.unmodified is arista.avd.defined(true) %}
6867
sflow interface egress unmodified enable default
68+
{% else %}
69+
sflow interface egress enable default
70+
{% endif %}
6971
{% endif %}
7072
{% if sflow.run is arista.avd.defined(true) %}
7173
sflow run

python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/sflow.schema.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ keys:
114114
type: bool
115115
description: |
116116
Enable egress sFlow by default.
117+
required: true
117118
unmodified:
118119
type: bool
119120
description: |

0 commit comments

Comments
 (0)