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 vrf support for vmtracer_sessions #4601

Merged
merged 5 commits into from
Oct 28, 2024
+21 −7
Merged

Feat(eos_cli_config_gen): Add vrf support for vmtracer_sessions #4601

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1dcd02
Feat(eos_cli_config_gen): Add vrf support for vmtracer_sessions
Shivani-gslab Oct 16, 2024
2e71ade
Update doc template
Shivani-gslab Oct 16, 2024
3cd773b
Merge branch 'devel' into vmtracer
gmuloc Oct 28, 2024
3f03119
Refactor: Align documentation template
gmuloc Oct 28, 2024
f48ccc5
Merge branch 'devel' into vmtracer
gmuloc Oct 28, 2024
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
9 changes: 5 additions & 4 deletions ...ista/avd/molecule/eos_cli_config_gen/documentation/devices/vmtracer-sessions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ interface Management1

#### VM Tracer Summary

| Session | URL | Username | Autovlan | Source Interface |
| ------- | --- | -------- | -------- | ---------------- |
| session_1 | https://192.168.0.10 | user1 | disabled | Management1 |
| session_2 | https://192.168.0.10 | user1 | enabled | - |
| Session | URL | Username | Autovlan | VRF | Source Interface |
| ------- | --- | -------- | -------- | --- | ---------------- |
| session_1 | https://192.168.0.10 | user1 | disabled | MGMT | Management1 |
| session_2 | https://192.168.0.10 | user1 | enabled | - | - |

#### VM Tracer Device Configuration

Expand All @@ -55,6 +55,7 @@ vmtracer session session_1
username user1
password 7 encrypted_password
autovlan disable
vrf MGMT
source-interface Management1
!
vmtracer session session_2
Expand Down
1 change: 1 addition & 0 deletions ...collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vmtracer-sessions.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ vmtracer session session_1
username user1
password 7 encrypted_password
autovlan disable
vrf MGMT
source-interface Management1
!
vmtracer session session_2
Expand Down
1 change: 1 addition & 0 deletions ...lections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/vmtracer-sessions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ vmtracer_sessions:
username: user1
password: "encrypted_password"
autovlan_disable: true
vrf: MGMT
source_interface: Management1
- name: session_2
url: "https://192.168.0.10"
Expand Down
2 changes: 2 additions & 0 deletions ...ollections/arista/avd/roles/eos_cli_config_gen/docs/tables/vmtracer-sessions.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: 3 additions & 3 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/vmtracer-sessions.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@

#### VM Tracer Summary

| Session | URL | Username | Autovlan | Source Interface |
| ------- | --- | -------- | -------- | ---------------- |
| Session | URL | Username | Autovlan | VRF | Source Interface |
| ------- | --- | -------- | -------- | --- | ---------------- |
{% for session in vmtracer_sessions | arista.avd.natural_sort('name') %}
{% set url = session.url | arista.avd.default('-') %}
{% if session.autovlan_disable is arista.avd.defined(true) %}
{% set autovlan = 'disabled' %}
{% endif %}
{% set source_interface = session.source_interface | arista.avd.default('-') %}
| {{ session.name }} | {{ url }} | {{ session.username | arista.avd.default('-') }} | {{ autovlan | arista.avd.default('enabled') }} | {{ source_interface }} |
| {{ session.name }} | {{ url }} | {{ session.username | arista.avd.default('-') }} | {{ autovlan | arista.avd.default('enabled') }} | {{ session.vrf | arista.avd.default('-') }} | {{ source_interface }} |
gmuloc marked this conversation as resolved.
Show resolved Hide resolved
{% endfor %}

#### VM Tracer Device Configuration
Expand Down
3 changes: 3 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/vmtracer-sessions.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ vmtracer session {{ session.name }}
{% if session.autovlan_disable is arista.avd.defined(true) %}
autovlan disable
{% endif %}
{% if session.vrf is arista.avd.defined %}
vrf {{ session.vrf }}
{% endif %}
{% if session.source_interface is arista.avd.defined %}
source-interface {{ session.source_interface }}
{% endif %}
Expand Down
2 changes: 2 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.

2 changes: 2 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/vmtracer_sessions.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,7 @@ keys:
description: Type 7 Password Hash.
autovlan_disable:
type: bool
vrf:
type: str
source_interface:
type: str
Loading