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): Generate sFlow egress commands #2767

Merged
merged 10 commits into from
Jun 20, 2023
Merged

Feat(eos_cli_config_gen): Generate sFlow egress commands #2767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
85b75e0
CI(molecule): Update Molecule artifacts
xaviramon Apr 27, 2023
543a10d
sFlow egress globally
xaviramon Apr 27, 2023
a72cb3c
Schema changes
xaviramon May 1, 2023
8cf1d51
Template changes
xaviramon May 1, 2023
5992971
CI(molecule): Update Molecule artifacts
xaviramon May 1, 2023
2dee08e
Documentation for both egress options
xaviramon May 4, 2023
e481ad8
schemas
xaviramon May 9, 2023
41b9fa9
cli and documentation
xaviramon May 9, 2023
5cd2648
CI(molecule): Update Molecule artifacts
xaviramon May 9, 2023
da5e379
pre-commit
haylinmoore Jun 20, 2023
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
3 changes: 3 additions & 0 deletions ...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/sflow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ sFlow is enabled.

sFlow is disabled on all interfaces by default.

Unmodified egress sFlow is enabled on all interfaces by default.

sFlow hardware acceleration is enabled.

sFlow hardware accelerated Sample Rate: 1024
Expand Down Expand Up @@ -112,6 +114,7 @@ sflow extension router
no sflow extension switch
no sflow extension tunnel
sflow interface disable default
sflow interface egress unmodified enable default
sflow run
sflow hardware acceleration
sflow hardware acceleration sample 1024
Expand Down
1 change: 1 addition & 0 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/sflow.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ sflow extension router
no sflow extension switch
no sflow extension tunnel
sflow interface disable default
sflow interface egress unmodified enable default
sflow run
sflow hardware acceleration
sflow hardware acceleration sample 1024
Expand Down
3 changes: 3 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/sflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ sflow:
interface:
disable:
default: true
egress:
enable_default: true
unmodified: true
hardware_acceleration:
enabled: true
sample: 1024
Expand Down
6 changes: 6 additions & 0 deletions ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/sflow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
| [<samp>&nbsp;&nbsp;interface</samp>](## "sflow.interface") | Dictionary | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;disable</samp>](## "sflow.interface.disable") | Dictionary | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;default</samp>](## "sflow.interface.disable.default") | Boolean | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;egress</samp>](## "sflow.interface.egress") | Dictionary | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;enable_default</samp>](## "sflow.interface.egress.enable_default") | Boolean | | | | Enable egress sFlow by default.<br> |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;unmodified</samp>](## "sflow.interface.egress.unmodified") | Boolean | | | | Enable egress sFlow unmodified.<br>Platform dependent feature.<br> |
| [<samp>&nbsp;&nbsp;run</samp>](## "sflow.run") | Boolean | | | | |
| [<samp>&nbsp;&nbsp;hardware_acceleration</samp>](## "sflow.hardware_acceleration") | Dictionary | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;enabled</samp>](## "sflow.hardware_acceleration.enabled") | Boolean | | | | |
Expand Down Expand Up @@ -57,6 +60,9 @@
interface:
disable:
default: <bool>
egress:
enable_default: <bool>
unmodified: <bool>
run: <bool>
hardware_acceleration:
enabled: <bool>
Expand Down
20 changes: 20 additions & 0 deletions ...ollections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17750,6 +17750,26 @@
"^_.+$": {}
},
"title": "Disable"
},
"egress": {
"type": "object",
"properties": {
"enable_default": {
"type": "boolean",
"description": "Enable egress sFlow by default.\n",
"title": "Enable Default"
},
"unmodified": {
"type": "boolean",
"description": "Enable egress sFlow unmodified.\nPlatform dependent feature.\n",
"title": "Unmodified"
}
},
"additionalProperties": false,
"patternProperties": {
"^_.+$": {}
},
"title": "Egress"
}
},
"additionalProperties": false,
Expand Down
15 changes: 15 additions & 0 deletions ...ble_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10330,6 +10330,21 @@ keys:
keys:
default:
type: bool
egress:
type: dict
keys:
enable_default:
type: bool
description: 'Enable egress sFlow by default.

'
unmodified:
type: bool
description: 'Enable egress sFlow unmodified.

Platform dependent feature.

'
run:
type: bool
hardware_acceleration:
Expand Down
12 changes: 12 additions & 0 deletions ...collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/sflow.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,18 @@ keys:
keys:
default:
type: bool
egress:
type: dict
keys:
enable_default:
type: bool
description: |
Enable egress sFlow by default.
unmodified:
type: bool
description: |
Enable egress sFlow unmodified.
Platform dependent feature.
run:
type: bool
hardware_acceleration:
Expand Down
7 changes: 7 additions & 0 deletions ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/documentation/sflow.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ sFlow is disabled.

sFlow is disabled on all interfaces by default.
{% endif %}
{% if sflow.interface.egress.enable_default is arista.avd.defined(true) and sflow.interface.egress.unmodified is arista.avd.defined(false) %}

Egress sFlow is enabled on all interfaces by default.
{% elif sflow.interface.egress.enable_default is arista.avd.defined(true) and sflow.interface.egress.unmodified is arista.avd.defined(true) %}

Unmodified egress sFlow is enabled on all interfaces by default.
{% endif %}
{% if sflow.hardware_acceleration.enabled is arista.avd.defined(true) %}

sFlow hardware acceleration is enabled.
Expand Down
5 changes: 5 additions & 0 deletions ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/sflow.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ no sflow extension {{ extension.name }}
{% if sflow.interface.disable.default is arista.avd.defined(true) %}
sflow interface disable default
{% endif %}
{% if sflow.interface.egress.enable_default is arista.avd.defined(true) and sflow.interface.egress.unmodified is arista.avd.defined(false) %}
sflow interface egress enable default
{% elif sflow.interface.egress.enable_default is arista.avd.defined(true) and sflow.interface.egress.unmodified is arista.avd.defined(true) %}
sflow interface egress unmodified enable default
{% endif %}
{% if sflow.run is arista.avd.defined(true) %}
sflow run
{% endif %}
Expand Down