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

aristanetworks · Oct 28, 2024 · f5fa416 · f5fa416
1 parent 63b29c8
commit f5fa416
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 7 deletions.
diff --git a/...ista/avd/molecule/eos_cli_config_gen/documentation/devices/vmtracer-sessions.md b/...ista/avd/molecule/eos_cli_config_gen/documentation/devices/vmtracer-sessions.md
@@ -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
 
@@ -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

diff --git a/...collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vmtracer-sessions.cfg b/...collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vmtracer-sessions.cfg
@@ -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

diff --git a/...lections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/vmtracer-sessions.yml b/...lections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/vmtracer-sessions.yml
@@ -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"

diff --git a/...ollections/arista/avd/roles/eos_cli_config_gen/docs/tables/vmtracer-sessions.md b/...ollections/arista/avd/roles/eos_cli_config_gen/docs/tables/vmtracer-sessions.md
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/vmtracer-sessions.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/vmtracer-sessions.j2
@@ -10,15 +10,17 @@
 
 #### 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('-') %}
+{%         set username = session.username | arista.avd.default('-') %}
 {%         if session.autovlan_disable is arista.avd.defined(true) %}
 {%             set autovlan = 'disabled' %}
 {%         endif %}
+{%         set vrf =  session.vrf | arista.avd.default('-') %}
 {%         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 }} | {{ username }} | {{ autovlan | arista.avd.default('enabled') }} | {{ vrf }} | {{ source_interface }} |
 {%     endfor %}
 
 #### VM Tracer Device Configuration

diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/vmtracer-sessions.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/vmtracer-sessions.j2
@@ -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 %}

diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml
diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/vmtracer_sessions.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/vmtracer_sessions.schema.yml
@@ -24,5 +24,7 @@ keys:
           description: Type 7 Password Hash.
         autovlan_disable:
           type: bool
+        vrf:
+          type: str
         source_interface:
           type: str