Skip to content

Refactor(eos_cli_config_gen): Rearrange eos_cli_config_gen config order as per EOS 4.35.0F part 9 #6307

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

Merged
gmuloc merged 8 commits into from
Jan 9, 2026
Merged

Refactor(eos_cli_config_gen): Rearrange eos_cli_config_gen config order as per EOS 4.35.0F part 9 #6307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e59cfae
Refactor(eos_cli_config_gen): Rearrange eos_cli as per EOS 4.35.0F pa…
Shivani-gslab Jan 6, 2026
1cd2453
molecule run
Shivani-gslab Jan 6, 2026
551c3e8
update management cvx
Shivani-gslab Jan 6, 2026
a96cf5c
Merge branch 'devel' into cli_order_part9
Shivani-gslab Jan 6, 2026
96b0bd8
Merge branch 'devel' into cli_order_part9
Shivani-gslab Jan 8, 2026
923f16c
addressing comments
Shivani-gslab Jan 9, 2026
93fc1c4
Merge branch 'devel' into cli_order_part9
MaheshGSLAB Jan 9, 2026
c77d21d
Merge branch 'devel' into cli_order_part9
gmuloc Jan 9, 2026
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
4 changes: 2 additions & 2 deletions .../digital_twin/digital_twin/documentation/devices/digital-twin-enforce-eapi-2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ management api http-commands
protocol https
no shutdown
!
vrf default
vrf MGMT
no shutdown
!
vrf MGMT
vrf default
no shutdown
```

Expand Down
4 changes: 2 additions & 2 deletions ...sions/molecule/digital_twin/digital_twin/intended/configs/digital-twin-enforce-eapi-2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ management api http-commands
protocol https
no shutdown
!
vrf default
vrf MGMT
no shutdown
!
vrf MGMT
vrf default
no shutdown
!
interface Management1
Expand Down
49 changes: 27 additions & 22 deletions ...rista/avd/extensions/molecule/eos_cli_config_gen/documentation/devices/host1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,19 +961,19 @@ Provider eos-native is configured.
```eos
!
management api gnmi
transport grpc arFalse
transport grpc MGMT
ssl profile gnmi
vrf MGMT
ip access-group acl1
notification timestamp send-time
!
transport grpc arTrue
transport grpc arFalse
ip access-group acl1
authorization requests
notification timestamp send-time
!
transport grpc MGMT
ssl profile gnmi
vrf MGMT
transport grpc arTrue
ip access-group acl1
authorization requests
notification timestamp send-time
!
transport grpc mytransport
Expand Down Expand Up @@ -1083,18 +1083,8 @@ management api http-commands
protocol unix-socket
default-services
protocol https ssl profile SSL_PROFILE
no shutdown
!
vrf default
no shutdown
ip access-group ACL-API
ipv6 access-group ACL-API6
!
vrf MGMT
no shutdown
ip access-group ACL-API
protocol https certificate
-----BEGIN CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIFNjCCAx4CCQCVGSFu9M4dNDANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJD
QTELMAkGA1UECAwCQkMxEjAQBgNVBAcMCVZhbmNvdXZlcjEPMA0GA1UECgwGQXJp
c3RhMQwwCgYDVQQLDANBVkQxDjAMBgNVBAMMBWhvc3QxMB4XDTI0MTExMzE3NTAw
Expand Down Expand Up @@ -1124,8 +1114,8 @@ kc6u4R7x93bWtRedCtL8SroKgg3iSP+MNvjh7GRVrisKi1mHq37xBFbfcKWQ8Fux
xak6B5u7Dkwio2KGtQAzUTw8GNrG8ix6wYbCxRTorl0qtxWKqB1sqPkxVmo73PkO
sVbhuzXgHBzA4RNdl/qmwSKlL7pKfpQUm3jSzewJm224QTYODTF8KRpf
-----END CERTIFICATE-----
EOF
-----BEGIN PRIVATE KEY-----
EOF
-----BEGIN PRIVATE KEY-----
MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCc9nlFQ/+Lvp5s
9AJOkCaj60EierKWbcZ34Eg9xExoVoFTvmle1G56QgLygfhuwV91hB5ds6YRRPju
B4UQgYgxQfS12dn4ogSnD5hTLiQoS9ecC2mucj/fbazF98MUi2SBSlZg+ZMY7amT
Expand Down Expand Up @@ -1177,7 +1167,17 @@ xEnBkzW4rhGpE+D72RC0Z4wOurE+pLxJpHnPu3lqVmD8m/AaxUzGdiRWPCLkx2G1
lRIvIpbuqzZ1QzAdWwCX/5mgBk/xoI88N3EcxvgEJJhiXihYwW/630KkKETqnu64
9ZBLoqoLmPhKxDHZuwO7re9GxVZ1HQ==
-----END PRIVATE KEY-----
EOF
EOF
no shutdown
!
vrf MGMT
no shutdown
ip access-group ACL-API
!
vrf default
no shutdown
ip access-group ACL-API
ipv6 access-group ACL-API6
```

### Management API Models
Expand Down Expand Up @@ -13385,8 +13385,8 @@ mac security
mka session rekey-period 30
traffic unprotected allow
sci
l2-protocol ethernet-flow-control bypass
l2-protocol lldp bypass unauthorized
l2-protocol ethernet-flow-control bypass
!
profile A2
key 1234b 7 <removed>
Expand Down Expand Up @@ -14560,6 +14560,7 @@ Default maintenance unit profile: **UP1**

| BGP profile | Initiator route-map |
| ----------- | ------------------- |
| bgp2 | SystemGenerated |
| BP1 | RM-MAINTENANCE |
| BP2 | RM-MAINTENANCE2 |
| BP3 | RM-MAINTENANCE3 |
Expand All @@ -14578,7 +14579,7 @@ Default maintenance unit profile: **UP1**
| Unit | Interface groups | BGP groups | Unit profile | Quiesce |
| ---- | ---------------- | ---------- | ------------ | ------- |
| System | - | - | UP1 | No |
| UNIT1 | INTERFACE_GROUP_1 | BGP_GROUP_1<br/>BGP_GROUP_2 | UP1 | No |
| UNIT1 | inrerface_group<br/>INTERFACE_GROUP_1 | bgp_group<br/>BGP_GROUP_1<br/>BGP_GROUP_2 | UP1 | No |

#### Maintenance Device Configuration

Expand All @@ -14593,6 +14594,8 @@ maintenance
!
profile bgp BP3
initiator route-map RM-MAINTENANCE3 inout
!
profile bgp bgp2
profile bgp BP1 default
profile interface IP1 default
profile unit UP1 default
Expand All @@ -14613,7 +14616,9 @@ maintenance
unit UNIT1
group bgp BGP_GROUP_1
group bgp BGP_GROUP_2
group bgp bgp_group
group interface INTERFACE_GROUP_1
group interface inrerface_group
profile unit UP1
```

Expand Down
46 changes: 25 additions & 21 deletions ..._collections/arista/avd/extensions/molecule/eos_cli_config_gen/intended/configs/host1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1595,18 +1595,8 @@ management api http-commands
protocol unix-socket
default-services
protocol https ssl profile SSL_PROFILE
no shutdown
!
vrf default
no shutdown
ip access-group ACL-API
ipv6 access-group ACL-API6
!
vrf MGMT
no shutdown
ip access-group ACL-API
protocol https certificate
-----BEGIN CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIFNjCCAx4CCQCVGSFu9M4dNDANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJD
QTELMAkGA1UECAwCQkMxEjAQBgNVBAcMCVZhbmNvdXZlcjEPMA0GA1UECgwGQXJp
c3RhMQwwCgYDVQQLDANBVkQxDjAMBgNVBAMMBWhvc3QxMB4XDTI0MTExMzE3NTAw
Expand Down Expand Up @@ -1636,8 +1626,8 @@ kc6u4R7x93bWtRedCtL8SroKgg3iSP+MNvjh7GRVrisKi1mHq37xBFbfcKWQ8Fux
xak6B5u7Dkwio2KGtQAzUTw8GNrG8ix6wYbCxRTorl0qtxWKqB1sqPkxVmo73PkO
sVbhuzXgHBzA4RNdl/qmwSKlL7pKfpQUm3jSzewJm224QTYODTF8KRpf
-----END CERTIFICATE-----
EOF
-----BEGIN PRIVATE KEY-----
EOF
-----BEGIN PRIVATE KEY-----
MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCc9nlFQ/+Lvp5s
9AJOkCaj60EierKWbcZ34Eg9xExoVoFTvmle1G56QgLygfhuwV91hB5ds6YRRPju
B4UQgYgxQfS12dn4ogSnD5hTLiQoS9ecC2mucj/fbazF98MUi2SBSlZg+ZMY7amT
Expand Down Expand Up @@ -1689,7 +1679,17 @@ xEnBkzW4rhGpE+D72RC0Z4wOurE+pLxJpHnPu3lqVmD8m/AaxUzGdiRWPCLkx2G1
lRIvIpbuqzZ1QzAdWwCX/5mgBk/xoI88N3EcxvgEJJhiXihYwW/630KkKETqnu64
9ZBLoqoLmPhKxDHZuwO7re9GxVZ1HQ==
-----END PRIVATE KEY-----
EOF
EOF
no shutdown
!
vrf MGMT
no shutdown
ip access-group ACL-API
!
vrf default
no shutdown
ip access-group ACL-API
ipv6 access-group ACL-API6
!
management console
idle-timeout 15
Expand All @@ -1706,19 +1706,19 @@ management defaults
secret hash md5
!
management api gnmi
transport grpc arFalse
transport grpc MGMT
ssl profile gnmi
vrf MGMT
ip access-group acl1
notification timestamp send-time
!
transport grpc arTrue
transport grpc arFalse
ip access-group acl1
authorization requests
notification timestamp send-time
!
transport grpc MGMT
ssl profile gnmi
vrf MGMT
transport grpc arTrue
ip access-group acl1
authorization requests
notification timestamp send-time
!
transport grpc mytransport
Expand Down Expand Up @@ -2091,8 +2091,8 @@ mac security
mka session rekey-period 30
traffic unprotected allow
sci
l2-protocol ethernet-flow-control bypass
l2-protocol lldp bypass unauthorized
l2-protocol ethernet-flow-control bypass
!
profile A2
key 1234b 7 12485744465E5A53
Expand Down Expand Up @@ -5102,6 +5102,8 @@ maintenance
!
profile bgp BP3
initiator route-map RM-MAINTENANCE3 inout
!
profile bgp bgp2
profile bgp BP1 default
profile interface IP1 default
profile unit UP1 default
Expand All @@ -5122,7 +5124,9 @@ maintenance
unit UNIT1
group bgp BGP_GROUP_1
group bgp BGP_GROUP_2
group bgp bgp_group
group interface INTERFACE_GROUP_1
group interface inrerface_group
profile unit UP1
!
monitor session myMonitoringSession1 source Ethernet1 ipv6 access-group ipv6ACL
Expand Down
3 changes: 3 additions & 0 deletions ...ista/avd/extensions/molecule/eos_cli_config_gen/inventory/host_vars/host1/maintenance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ maintenance:
shutdown:
max_delay: 300
bgp_profiles:
- name: bgp2
- name: BP1
initiator:
route_map_inout: RM-MAINTENANCE
Expand All @@ -32,9 +33,11 @@ maintenance:
profile: UP1
groups:
bgp_groups:
- bgp_group
- BGP_GROUP_1
- BGP_GROUP_2
interface_groups:
- inrerface_group
- INTERFACE_GROUP_1
# Adding a unit with no profile for issue/2488
- name: System
2 changes: 1 addition & 1 deletion ...molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ vrf instance TEST
!
management cvx
no shutdown
server host 192.168.254.253
server host 192.168.254.254
server host 192.168.254.255
server host 192.168.254.253
source-interface Loopback0
!
interface Loopback0
Expand Down
2 changes: 1 addition & 1 deletion ...molecule/eos_designs_unit_tests/intended/configs/OVERLAY_ROUTING_PROTOCOL_CVX_L3LEAF2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ vrf instance TEST
!
management cvx
no shutdown
server host 192.168.254.253
server host 192.168.254.254
server host 192.168.254.255
server host 192.168.254.253
source-interface Loopback0
!
interface Loopback0
Expand Down
8 changes: 4 additions & 4 deletions .../avd/extensions/molecule/eos_designs_unit_tests/intended/configs/management-eapi-vrfs.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ management api http-commands
protocol https
no shutdown
!
vrf inband_mgmt_1
no shutdown
ip access-group ACL_EAPI_IPv4_3
!
vrf MGMT
no shutdown
ip access-group ACL_EAPI_IPv4_4
Expand All @@ -40,6 +36,10 @@ management api http-commands
vrf VRF_Enable_3
no shutdown
ipv6 access-group ACL_EAPI_IPv6_1
!
vrf inband_mgmt_1
no shutdown
ip access-group ACL_EAPI_IPv4_3
!
interface Loopback0
description ROUTER_ID
Expand Down
4 changes: 2 additions & 2 deletions ...lections/arista/avd/roles/eos_cli_config_gen/docs/tables/management-api-gnmi.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/mac-security.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ mac security
{% if mac_security.fips_restrictions is arista.avd.defined(true) %}
fips restrictions
{% endif %}
{% for profile in mac_security.profiles | arista.avd.natural_sort(sort_key='name') %}
{% for profile in mac_security.profiles | arista.avd.natural_sort(sort_key='name', ignore_case=false) %}
!
profile {{ profile.name }}
{% if profile.cipher is arista.avd.defined %}
Expand Down Expand Up @@ -42,12 +42,12 @@ mac security
{% if profile.sci is arista.avd.defined(true) %}
sci
{% endif %}
{% if profile.l2_protocols.ethernet_flow_control.mode is arista.avd.defined %}
l2-protocol ethernet-flow-control {{ profile.l2_protocols.ethernet_flow_control.mode }}
{% endif %}
{% if profile.l2_protocols.lldp.mode is arista.avd.defined %}
l2-protocol lldp {{ profile.l2_protocols.lldp.mode }}
{% endif %}
{% if profile.l2_protocols.ethernet_flow_control.mode is arista.avd.defined %}
l2-protocol ethernet-flow-control {{ profile.l2_protocols.ethernet_flow_control.mode }}
{% endif %}
{% if profile.replay_protection.disabled is arista.avd.defined(true) %}
replay protection disabled
{% endif %}
Expand Down
Loading