addressing comments

aristanetworks · Oct 30, 2024 · e5e6fbd · e5e6fbd
1 parent 823ed44
commit e5e6fbd
Show file tree

Hide file tree

Showing 24 changed files with 128 additions and 157 deletions.
diff --git a/...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md b/...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md
@@ -1194,11 +1194,6 @@ interface Ethernet72
 | Ethernet9 | True | True | - |
 | Ethernet10 | False | False | - |
 
-#### MPLS Device Configuration
-
-```eos
-```
-
 ## Multicast
 
 ### PIM Sparse Mode

diff --git a/...a/avd/molecule/eos_cli_config_gen/documentation/devices/loopbacks-interfaces.md b/...a/avd/molecule/eos_cli_config_gen/documentation/devices/loopbacks-interfaces.md
@@ -113,8 +113,3 @@ interface Loopback100
 | Interface | MPLS IP Enabled | LDP Enabled | IGP Sync |
 | --------- | --------------- | ----------- | -------- |
 | Loopback99 | - | True | - |
-
-#### MPLS Device Configuration
-
-```eos
-```
diff --git a/...ollections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls.md b/...ollections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/mpls.md
@@ -176,6 +176,7 @@ mpls rsvp
    refresh interval 3
    authentication index 55 password 7 <removed>
    authentication index 766 password 7 <removed>
+   authentication index 999 password <removed>
    neighbor 1.1.1.1 authentication type md5
    neighbor 1.1.1.1 authentication index 3 active
    neighbor 1.1.12.2 authentication type none

diff --git a/...vd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md b/...vd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md
@@ -883,11 +883,6 @@ interface Port-Channel131.10
 | Port-Channel113 | True | True | True |
 | Port-Channel114 | False | False | - |
 
-#### MPLS Device Configuration
-
-```eos
-```
-
 ## Multicast
 
 ### PIM Sparse Mode

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/mpls.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/mpls.cfg
@@ -29,6 +29,7 @@ mpls rsvp
    refresh interval 3
    authentication index 55 password 7 14241B062114062E142900260B1D23133B
    authentication index 766 password 7 13361E3F1B20011A2A173B
+   authentication index 999 password simplePassword
    neighbor 1.1.1.1 authentication type md5
    neighbor 1.1.1.1 authentication index 3 active
    neighbor 1.1.12.2 authentication type none

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/mpls.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/mpls.yml
@@ -18,6 +18,8 @@ mpls:
         - index: 55
           password_type: '7'
           password: 14241B062114062E142900260B1D23133B
+        - index: 999
+          password: simplePassword
     fast_reroute:
       reversion: local
       bypass_tunnel_optimization_interval: 65535
@@ -42,21 +44,21 @@ mpls:
       timer: 444
     shutdown: true
     neighbors:
-      - ip: 1.1.1.1
+      - ip_address: 1.1.1.1
         authentication:
           index: 3
           type: md5
-      - ip: 10.1.1.2
+      - ip_address: 10.1.1.2
         authentication:
           index: 303
-      - ip: 1.1.12.2
+      - ip_address: 1.1.12.2
         authentication:
           index: 30
           type: none
-      - ip: 1.21.1.20
+      - ip_address: 1.21.1.20
         authentication:
           type: md5
-      - ip: 1.10.1.2
+      - ip_address: 1.10.1.2
         authentication:
           type: none
 

diff --git a/...ons/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md b/...ons/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md
@@ -690,9 +690,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/...ons/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md b/...ons/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md
@@ -690,9 +690,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF1A.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF1A.md
@@ -566,9 +566,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md
@@ -920,9 +920,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2B.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2B.md
@@ -920,9 +920,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE1.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE1.md
@@ -420,9 +420,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP Device Configuration
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE2.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE2.md
@@ -420,9 +420,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP Device Configuration
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE3.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE3.md
@@ -420,9 +420,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP Device Configuration
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE4.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE4.md
@@ -420,9 +420,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP Device Configuration
 

diff --git a/...ns/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md b/...ns/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md
@@ -1040,9 +1040,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/...ns/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3B.md b/...ns/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3B.md
@@ -1013,9 +1013,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/mpls.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/mpls.md
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/mpls-rsvp.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/mpls-rsvp.j2
@@ -70,8 +70,8 @@
 
 | Neighbor IP | Index | Type |
 | ----------- | ----- | ---- |
-{%         for neighbor in mpls.rsvp.neighbors | arista.avd.natural_sort('ip') %}
-| {{ neighbor.ip }} | {{ neighbor.authentication.index | arista.avd.default('-') }} | {{ neighbor.authentication.type | arista.avd.default('-') }} |
+{%         for neighbor in mpls.rsvp.neighbors | arista.avd.natural_sort('ip_address') %}
+| {{ neighbor.ip_address }} | {{ neighbor.authentication.index | arista.avd.default('-') }} | {{ neighbor.authentication.type | arista.avd.default('-') }} |
 {%         endfor %}
 {%     endif %}
 {%     if mpls.rsvp.graceful_restart is arista.avd.defined %}