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

Refactor(eos_cli_config_gen): Rearrange eos_cli_config_gen commands to match with EOS sequence - Part 5 #4549

Merged
merged 18 commits into from
Oct 11, 2024
Merged

Refactor(eos_cli_config_gen): Rearrange eos_cli_config_gen commands to match with EOS sequence - Part 5 #4549

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9e00a1e
Add changes to interface_ip_nat.j2
Oct 1, 2024
dd50d1b
Rearrange router-ospf cli.
Oct 4, 2024
ab3bfc0
Run other molecules
Oct 4, 2024
4d7e9fe
Fix CI.
Oct 4, 2024
72b4c10
Address review comment.
Oct 8, 2024
bf8bd89
Merge branch 'devel' into refactor/eos_cli_sequence4
ClausHolbechArista Oct 9, 2024
240e30c
Address comment, do not sort ACL rules.
Oct 9, 2024
c692e2b
Add check for network_prefix.area in j2
Oct 9, 2024
c32f88a
Add sorting to no_passive_int
Oct 9, 2024
e0d39c1
Fix CI.
Oct 9, 2024
b05f440
Merge branch 'devel' into refactor/eos_cli_sequence4
ClausHolbechArista Oct 10, 2024
9fc2cc8
Reorder interface nat entries
ClausHolbechArista Oct 10, 2024
51c84e0
update molecule
ClausHolbechArista Oct 10, 2024
98da77d
Fixing order
Oct 10, 2024
945f32f
Merge branch 'devel' into refactor/eos_cli_sequence4
ClausHolbechArista Oct 10, 2024
3832732
Merge branch 'devel' into refactor/eos_cli_sequence4
ClausHolbechArista Oct 10, 2024
f222fea
Merge branch 'devel' into refactor/eos_cli_sequence4
ClausHolbechArista Oct 11, 2024
a5e8d78
Merge branch 'devel' into refactor/eos_cli_sequence4
ClausHolbechArista Oct 11, 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
4 changes: 2 additions & 2 deletions ...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,10 +658,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.100.1
router ospf 100
router-id 172.16.1.1
passive-interface default
no passive-interface Vlan4093
no passive-interface Ethernet52/1
max-lsa 12000
no passive-interface Vlan4093
redistribute connected
max-lsa 12000
```

## Multicast
Expand Down
4 changes: 2 additions & 2 deletions ...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,10 +658,10 @@ ip route vrf MGMT 0.0.0.0/0 172.16.100.1
router ospf 100
router-id 172.16.1.2
passive-interface default
no passive-interface Vlan4093
no passive-interface Ethernet52/1
max-lsa 12000
no passive-interface Vlan4093
redistribute connected
max-lsa 12000
```

## Multicast
Expand Down
4 changes: 2 additions & 2 deletions ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,9 @@ ntp server vrf MGMT time.google.com prefer
router ospf 100
router-id 172.16.1.1
passive-interface default
no passive-interface Vlan4093
no passive-interface Ethernet52/1
max-lsa 12000
no passive-interface Vlan4093
redistribute connected
max-lsa 12000
!
end
4 changes: 2 additions & 2 deletions ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,9 @@ ntp server vrf MGMT time.google.com prefer
router ospf 100
router-id 172.16.1.2
passive-interface default
no passive-interface Vlan4093
no passive-interface Ethernet52/1
max-lsa 12000
no passive-interface Vlan4093
redistribute connected
max-lsa 12000
!
end
16 changes: 8 additions & 8 deletions ...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,14 @@ interface Ethernet60
ip nat source static 3.0.0.6 22 4.0.0.6 23 protocol tcp group 2 comment Comment Test
ip nat source static 3.0.0.7 access-list ACL21 4.0.0.7
ip nat source ingress static 3.0.0.8 4.0.0.8
ip nat destination static 1.0.0.1 2.0.0.1
ip nat destination static 1.0.0.2 22 2.0.0.2
ip nat destination static 1.0.0.3 22 2.0.0.3 23
ip nat destination static 1.0.0.4 22 2.0.0.4 23 protocol udp
ip nat destination static 1.0.0.5 22 2.0.0.5 23 protocol tcp group 1
ip nat destination static 1.0.0.6 22 2.0.0.6 23 protocol tcp group 2 comment Comment Test
ip nat destination static 1.0.0.7 access-list ACL21 2.0.0.7
ip nat destination egress static 239.0.0.1 239.0.0.2
ip nat source dynamic access-list ACL11 pool POOL11
ip nat source dynamic access-list ACL12 pool POOL11 comment POOL11 shared with ACL11/12
ip nat source dynamic access-list ACL13 pool POOL13 priority 10
Expand All @@ -982,14 +990,6 @@ interface Ethernet60
ip nat source dynamic access-list ACL17 overload priority 10 comment Priority_10
ip nat source dynamic access-list ACL18 pool POOL18 address-only priority 10 comment Priority_10
ip nat source dynamic access-list ACL19 pool POOL19 full-cone priority 10 comment Priority_10
ip nat destination static 1.0.0.1 2.0.0.1
ip nat destination static 1.0.0.2 22 2.0.0.2
ip nat destination static 1.0.0.3 22 2.0.0.3 23
ip nat destination static 1.0.0.4 22 2.0.0.4 23 protocol udp
ip nat destination static 1.0.0.5 22 2.0.0.5 23 protocol tcp group 1
ip nat destination static 1.0.0.6 22 2.0.0.6 23 protocol tcp group 2 comment Comment Test
ip nat destination static 1.0.0.7 access-list ACL21 2.0.0.7
ip nat destination egress static 239.0.0.1 239.0.0.2
ip nat destination dynamic access-list ACL1 pool POOL1
ip nat destination dynamic access-list ACL2 pool POOL1 comment POOL1 shared with ACL1/2
ip nat destination dynamic access-list ACL3 pool POOL3 priority 10
Expand Down
16 changes: 8 additions & 8 deletions ...lections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ip-nat.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,14 @@ ip nat profile NAT-PROFILE-NO-VRF-2
ip nat source static 3.0.0.6 22 4.0.0.6 23 protocol tcp group 2 comment Comment Test
ip nat source static 3.0.0.7 access-list ACL21 4.0.0.7
ip nat source ingress static 3.0.0.8 4.0.0.8
ip nat destination static 1.0.0.1 2.0.0.1
ip nat destination static 1.0.0.2 22 2.0.0.2
ip nat destination static 1.0.0.2 23 2.0.0.3 23
ip nat destination static 1.0.0.4 22 2.0.0.4 23 protocol udp
ip nat destination static 1.0.0.5 22 2.0.0.5 23 protocol tcp group 1
ip nat destination static 1.0.0.6 22 2.0.0.6 23 protocol tcp group 2 comment Comment Test
ip nat destination static 1.0.0.7 access-list ACL21 2.0.0.7
ip nat destination egress static 239.0.0.1 239.0.0.2
ip nat source dynamic access-list ACL11 pool POOL11
ip nat source dynamic access-list ACL12 pool POOL11 comment POOL11 shared with ACL11/12
ip nat source dynamic access-list ACL13 pool POOL13 priority 10
Expand All @@ -180,14 +188,6 @@ ip nat profile NAT-PROFILE-NO-VRF-2
ip nat source dynamic access-list ACL17 overload priority 10 comment Priority_10
ip nat source dynamic access-list ACL18 pool POOL18 address-only priority 10 comment Priority_10
ip nat source dynamic access-list ACL19 pool POOL19 full-cone priority 10 comment Priority_10
ip nat destination static 1.0.0.1 2.0.0.1
ip nat destination static 1.0.0.2 22 2.0.0.2
ip nat destination static 1.0.0.2 23 2.0.0.3 23
ip nat destination static 1.0.0.4 22 2.0.0.4 23 protocol udp
ip nat destination static 1.0.0.5 22 2.0.0.5 23 protocol tcp group 1
ip nat destination static 1.0.0.6 22 2.0.0.6 23 protocol tcp group 2 comment Comment Test
ip nat destination static 1.0.0.7 access-list ACL21 2.0.0.7
ip nat destination egress static 239.0.0.1 239.0.0.2
ip nat destination dynamic access-list ACL1 pool POOL1
ip nat destination dynamic access-list ACL2 pool POOL1 comment POOL1 shared with ACL1/2
ip nat destination dynamic access-list ACL3 pool POOL3 priority 10
Expand Down
2 changes: 1 addition & 1 deletion ...vd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,8 +784,8 @@ interface Port-Channel130
description IP NAT Testing
switchport
ip nat source static 3.0.0.1 4.0.0.1
ip nat source dynamic access-list ACL2 pool POOL2
ip nat destination static 1.0.0.1 2.0.0.1
ip nat source dynamic access-list ACL2 pool POOL2
ip nat destination dynamic access-list ACL1 pool POOL1
!
interface Port-Channel131
Expand Down
36 changes: 18 additions & 18 deletions ...ons/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-ospf.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,35 +232,35 @@ interface Vlan24
!
router ospf 100
router-id 192.168.255.3
auto-cost reference-bandwidth 100
bfd default
bfd adjacency state any
distance ospf intra-area 50
distance ospf external 60
distance ospf inter-area 70
passive-interface default
no passive-interface Ethernet1
no passive-interface Ethernet2
no passive-interface Vlan4093
redistribute bgp
redistribute connected
redistribute static
distribute-list route-map RM-OSPF-DIST-IN in
network 198.51.100.0/24 area 0.0.0.1
network 203.0.113.0/24 area 0.0.0.2
bfd default
bfd adjacency state any
distribute-list route-map RM-OSPF-DIST-IN in
max-lsa 12000
default-information originate
redistribute static
redistribute connected
redistribute bgp
auto-cost reference-bandwidth 100
maximum-paths 10
default-information originate
mpls ldp sync default
!
router ospf 101 vrf CUSTOMER01
log-adjacency-changes detail
router-id 1.0.1.1
passive-interface default
no passive-interface Ethernet2.101
log-adjacency-changes detail
timers spf delay initial 100 200 300
timers lsa rx min interval 100
timers lsa tx delay initial 100 200 300
timers spf delay initial 100 200 300
summary-address 10.0.0.0/8
summary-address 20.0.0.0/8 tag 10
summary-address 30.0.0.0/8 attribute-map RM-OSPF_SUMMARY
Expand All @@ -269,28 +269,28 @@ router ospf 101 vrf CUSTOMER01

!
router ospf 200 vrf ospf_zone
log-adjacency-changes detail
router-id 192.168.254.1
redistribute bgp include leaked route-map rm-ospf-bgp
redistribute connected include leaked route-map rm-ospf-connected
redistribute static include leaked route-map rm-ospf-static
area 0.0.0.2 filter 1.1.1.0/24
area 0.0.0.2 filter 2.2.2.0/24
area 3 filter prefix-list PL-OSPF-FILTERING
max-lsa 5
log-adjacency-changes detail
timers lsa rx min interval 100
default-information originate always metric 100 metric-type 1
redistribute static include leaked route-map rm-ospf-static
redistribute connected include leaked route-map rm-ospf-connected
redistribute bgp include leaked route-map rm-ospf-bgp
!
router ospf 300
redistribute static route-map rm-ospf-static
redistribute connected route-map rm-ospf-connected
redistribute bgp route-map rm-ospf-bgp
redistribute connected route-map rm-ospf-connected
redistribute static route-map rm-ospf-static
max-metric router-lsa
!
router ospf 400
redistribute static include leaked
redistribute connected include leaked
redistribute bgp include leaked
redistribute connected include leaked
redistribute static include leaked
max-metric router-lsa external-lsa include-stub on-startup wait-for-bgp summary-lsa
!
router ospf 500
Expand Down
2 changes: 1 addition & 1 deletion ...arista/avd/molecule/eos_cli_config_gen/documentation/devices/vlan-interfaces.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,8 @@ interface Vlan44
interface Vlan50
description IP NAT Testing
ip nat source static 3.0.0.1 4.0.0.1
ip nat source dynamic access-list ACL2 pool POOL2
ip nat destination static 1.0.0.1 2.0.0.1
ip nat source dynamic access-list ACL2 pool POOL2
ip nat destination dynamic access-list ACL1 pool POOL1
isis authentication mode text rx-disabled level-2
isis authentication key 0 password level-2
Expand Down
16 changes: 8 additions & 8 deletions ...llections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,14 @@ interface Ethernet60
ip nat source static 3.0.0.6 22 4.0.0.6 23 protocol tcp group 2 comment Comment Test
ip nat source static 3.0.0.7 access-list ACL21 4.0.0.7
ip nat source ingress static 3.0.0.8 4.0.0.8
ip nat destination static 1.0.0.1 2.0.0.1
Vibhu-gslab marked this conversation as resolved.
Show resolved Hide resolved
ip nat destination static 1.0.0.2 22 2.0.0.2
ip nat destination static 1.0.0.3 22 2.0.0.3 23
ip nat destination static 1.0.0.4 22 2.0.0.4 23 protocol udp
ip nat destination static 1.0.0.5 22 2.0.0.5 23 protocol tcp group 1
ip nat destination static 1.0.0.6 22 2.0.0.6 23 protocol tcp group 2 comment Comment Test
ip nat destination static 1.0.0.7 access-list ACL21 2.0.0.7
ip nat destination egress static 239.0.0.1 239.0.0.2
ip nat source dynamic access-list ACL11 pool POOL11
ip nat source dynamic access-list ACL12 pool POOL11 comment POOL11 shared with ACL11/12
ip nat source dynamic access-list ACL13 pool POOL13 priority 10
Expand All @@ -598,14 +606,6 @@ interface Ethernet60
ip nat source dynamic access-list ACL17 overload priority 10 comment Priority_10
ip nat source dynamic access-list ACL18 pool POOL18 address-only priority 10 comment Priority_10
ip nat source dynamic access-list ACL19 pool POOL19 full-cone priority 10 comment Priority_10
ip nat destination static 1.0.0.1 2.0.0.1
ip nat destination static 1.0.0.2 22 2.0.0.2
ip nat destination static 1.0.0.3 22 2.0.0.3 23
ip nat destination static 1.0.0.4 22 2.0.0.4 23 protocol udp
ip nat destination static 1.0.0.5 22 2.0.0.5 23 protocol tcp group 1
ip nat destination static 1.0.0.6 22 2.0.0.6 23 protocol tcp group 2 comment Comment Test
ip nat destination static 1.0.0.7 access-list ACL21 2.0.0.7
ip nat destination egress static 239.0.0.1 239.0.0.2
ip nat destination dynamic access-list ACL1 pool POOL1
ip nat destination dynamic access-list ACL2 pool POOL1 comment POOL1 shared with ACL1/2
ip nat destination dynamic access-list ACL3 pool POOL3 priority 10
Expand Down
16 changes: 8 additions & 8 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ip-nat.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ ip nat profile NAT-PROFILE-NO-VRF-2
ip nat source static 3.0.0.6 22 4.0.0.6 23 protocol tcp group 2 comment Comment Test
ip nat source static 3.0.0.7 access-list ACL21 4.0.0.7
ip nat source ingress static 3.0.0.8 4.0.0.8
ip nat destination static 1.0.0.1 2.0.0.1
ClausHolbechArista marked this conversation as resolved.
Show resolved Hide resolved
ip nat destination static 1.0.0.2 22 2.0.0.2
ip nat destination static 1.0.0.2 23 2.0.0.3 23
ip nat destination static 1.0.0.4 22 2.0.0.4 23 protocol udp
ip nat destination static 1.0.0.5 22 2.0.0.5 23 protocol tcp group 1
ip nat destination static 1.0.0.6 22 2.0.0.6 23 protocol tcp group 2 comment Comment Test
ip nat destination static 1.0.0.7 access-list ACL21 2.0.0.7
ip nat destination egress static 239.0.0.1 239.0.0.2
ip nat source dynamic access-list ACL11 pool POOL11
ip nat source dynamic access-list ACL12 pool POOL11 comment POOL11 shared with ACL11/12
ip nat source dynamic access-list ACL13 pool POOL13 priority 10
Expand All @@ -31,14 +39,6 @@ ip nat profile NAT-PROFILE-NO-VRF-2
ip nat source dynamic access-list ACL17 overload priority 10 comment Priority_10
ip nat source dynamic access-list ACL18 pool POOL18 address-only priority 10 comment Priority_10
ip nat source dynamic access-list ACL19 pool POOL19 full-cone priority 10 comment Priority_10
ip nat destination static 1.0.0.1 2.0.0.1
ip nat destination static 1.0.0.2 22 2.0.0.2
ip nat destination static 1.0.0.2 23 2.0.0.3 23
ip nat destination static 1.0.0.4 22 2.0.0.4 23 protocol udp
ip nat destination static 1.0.0.5 22 2.0.0.5 23 protocol tcp group 1
ip nat destination static 1.0.0.6 22 2.0.0.6 23 protocol tcp group 2 comment Comment Test
ip nat destination static 1.0.0.7 access-list ACL21 2.0.0.7
ip nat destination egress static 239.0.0.1 239.0.0.2
ip nat destination dynamic access-list ACL1 pool POOL1
ip nat destination dynamic access-list ACL2 pool POOL1 comment POOL1 shared with ACL1/2
ip nat destination dynamic access-list ACL3 pool POOL3 priority 10
Expand Down
2 changes: 1 addition & 1 deletion ...tions/arista/avd/molecule/eos_cli_config_gen/intended/configs/port-channel-interfaces.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,8 @@ interface Port-Channel130
description IP NAT Testing
switchport
ip nat source static 3.0.0.1 4.0.0.1
ip nat source dynamic access-list ACL2 pool POOL2
ip nat destination static 1.0.0.1 2.0.0.1
ip nat source dynamic access-list ACL2 pool POOL2
ip nat destination dynamic access-list ACL1 pool POOL1
!
interface Port-Channel131
Expand Down
36 changes: 18 additions & 18 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-ospf.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,35 +32,35 @@ interface Vlan24
!
router ospf 100
router-id 192.168.255.3
auto-cost reference-bandwidth 100
bfd default
bfd adjacency state any
distance ospf intra-area 50
distance ospf external 60
distance ospf inter-area 70
passive-interface default
no passive-interface Ethernet1
no passive-interface Ethernet2
no passive-interface Vlan4093
redistribute bgp
redistribute connected
redistribute static
distribute-list route-map RM-OSPF-DIST-IN in
network 198.51.100.0/24 area 0.0.0.1
network 203.0.113.0/24 area 0.0.0.2
bfd default
bfd adjacency state any
distribute-list route-map RM-OSPF-DIST-IN in
max-lsa 12000
default-information originate
redistribute static
redistribute connected
redistribute bgp
auto-cost reference-bandwidth 100
maximum-paths 10
default-information originate
mpls ldp sync default
!
router ospf 101 vrf CUSTOMER01
log-adjacency-changes detail
router-id 1.0.1.1
passive-interface default
no passive-interface Ethernet2.101
log-adjacency-changes detail
timers spf delay initial 100 200 300
timers lsa rx min interval 100
timers lsa tx delay initial 100 200 300
timers spf delay initial 100 200 300
summary-address 10.0.0.0/8
summary-address 20.0.0.0/8 tag 10
summary-address 30.0.0.0/8 attribute-map RM-OSPF_SUMMARY
Expand All @@ -69,28 +69,28 @@ router ospf 101 vrf CUSTOMER01

!
router ospf 200 vrf ospf_zone
log-adjacency-changes detail
router-id 192.168.254.1
redistribute bgp include leaked route-map rm-ospf-bgp
redistribute connected include leaked route-map rm-ospf-connected
redistribute static include leaked route-map rm-ospf-static
area 0.0.0.2 filter 1.1.1.0/24
area 0.0.0.2 filter 2.2.2.0/24
area 3 filter prefix-list PL-OSPF-FILTERING
max-lsa 5
log-adjacency-changes detail
timers lsa rx min interval 100
default-information originate always metric 100 metric-type 1
redistribute static include leaked route-map rm-ospf-static
redistribute connected include leaked route-map rm-ospf-connected
redistribute bgp include leaked route-map rm-ospf-bgp
!
router ospf 300
redistribute static route-map rm-ospf-static
redistribute connected route-map rm-ospf-connected
redistribute bgp route-map rm-ospf-bgp
redistribute connected route-map rm-ospf-connected
redistribute static route-map rm-ospf-static
max-metric router-lsa
!
router ospf 400
redistribute static include leaked
redistribute connected include leaked
redistribute bgp include leaked
redistribute connected include leaked
redistribute static include leaked
max-metric router-lsa external-lsa include-stub on-startup wait-for-bgp summary-lsa
!
router ospf 500
Expand Down
2 changes: 1 addition & 1 deletion ...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/vlan-interfaces.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ interface Vlan44
interface Vlan50
description IP NAT Testing
ip nat source static 3.0.0.1 4.0.0.1
ip nat source dynamic access-list ACL2 pool POOL2
ip nat destination static 1.0.0.1 2.0.0.1
ip nat source dynamic access-list ACL2 pool POOL2
ip nat destination dynamic access-list ACL1 pool POOL1
isis authentication mode text rx-disabled level-2
isis authentication key 0 password level-2
Expand Down
4 changes: 2 additions & 2 deletions ...tions/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,10 +413,10 @@ ip route vrf MGMT 0.0.0.0/0 172.31.0.1
router ospf 100
router-id 192.168.255.1
passive-interface default
no passive-interface Vlan4094
no passive-interface Ethernet5
max-lsa 12000
no passive-interface Vlan4094
redistribute connected
max-lsa 12000
```

## Multicast
Expand Down
Loading
Loading