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

Jump to bottom

Feat(eos_cli_config_gen): Add support for sub-route-map and continue in route-maps #1850

Merged
merged 13 commits into from
Aug 16, 2022
Merged

Feat(eos_cli_config_gen): Add support for sub-route-map and continue in route-maps #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
395ffa2
refresh facts
emilarista Jun 1, 2022
9d265c5
more updates
emilarista Jun 1, 2022
2b83e70
small change
emilarista Jun 3, 2022
4975a46
add readme updates
emilarista Jun 3, 2022
93155b7
dummy update to trigger CI
emilarista Jun 15, 2022
948622a
split match and set in doc + refresh facts
emilarista Jun 28, 2022
a06af3e
Update ansible_collections/arista/avd/roles/eos_cli_config_gen/templa…
emilarista Aug 10, 2022
7e708aa
updated doc template with new data model
emilarista Aug 11, 2022
ebaf4da
small template correction
emilarista Aug 11, 2022
ae72cf0
updated v4 molecule example
emilarista Aug 11, 2022
29602ae
refreshed facts
emilarista Aug 11, 2022
b92646f
Update ansible_collections/arista/avd/roles/eos_cli_config_gen/README.md
tgodaA Aug 16, 2022
09020f3
Update ansible_collections/arista/avd/roles/eos_cli_config_gen/README…
tgodaA Aug 16, 2022
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
56 changes: 36 additions & 20 deletions ...ions/arista/avd/molecule/eos_cli_config_gen/documentation/devices/route-maps.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,41 +93,44 @@ interface Management1

#### RM-10.2.3.4-SET-NEXT-HOP-OUT

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | set ip next-hop 10.2.3.4 |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | - | ip next-hop 10.2.3.4 | - | - |

#### RM-CONN-BL-BGP

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | deny | match ip address prefix-list PL-MLAG |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | deny | ip address prefix-list PL-MLAG | - | - | - |
| 20 | permit | ip address prefix-list PL-SUBRM | - | RM-HIDE-ASPATH-IN | - |
| 30 | permit | ip address prefix-list PL-CONTINUE | - | - | 40 |
| 40 | permit | ip address prefix-list PL-CONTINUE | - | - | Next Sequence |
| 50 | permit | - | - | - | - |

#### RM-HIDE-ASPATH-IN

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | set as-path match all replacement auto |
| 10 | permit | set community 65000:1 additive |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | - | as-path match all replacement auto<br>community 65000:1 additive | - | - |

#### RM-HIDE-ASPATH-OUT

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | deny | match community LIST-COM |
| 20 | permit | set as-path match all replacement auto |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | deny | community LIST-COM | - | - | - |
| 20 | permit | - | as-path match all replacement auto | - | - |

#### RM-MLAG-PEER-IN

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | set origin incomplete |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | - | origin incomplete | - | - |

#### RM-STATIC-2-BGP

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | set tag 65100 |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | - | tag 65100 | - | - |

### Route-maps Device Configuration

Expand All @@ -140,6 +143,19 @@ route-map RM-CONN-BL-BGP deny 10
match ip address prefix-list PL-MLAG
!
route-map RM-CONN-BL-BGP permit 20
description sub-route-map test
match ip address prefix-list PL-SUBRM
sub-route-map RM-HIDE-ASPATH-IN
!
route-map RM-CONN-BL-BGP permit 30
match ip address prefix-list PL-CONTINUE
continue 40
!
route-map RM-CONN-BL-BGP permit 40
match ip address prefix-list PL-CONTINUE
continue
!
route-map RM-CONN-BL-BGP permit 50
!
route-map RM-HIDE-ASPATH-IN permit 10
set as-path match all replacement auto
Expand Down
12 changes: 6 additions & 6 deletions ...ta/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-vrf-lite.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,15 +295,15 @@ ip prefix-list PL-BGP-DEFAULT-RED-OUT-C1

#### RM-BGP-AGG-APPLY-SET

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | set local-preference 50 |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | - | local-preference 50 | - | - |

#### RM-BGP-EXPORT-DEFAULT-BLUE-C1

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | match ip address prefix-list PL-BGP-DEFAULT-BLUE-C1 |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | ip address prefix-list PL-BGP-DEFAULT-BLUE-C1 | - | - | - |

### Route-maps Device Configuration

Expand Down
13 changes: 13 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/route-maps.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,19 @@ route-map RM-CONN-BL-BGP deny 10
match ip address prefix-list PL-MLAG
!
route-map RM-CONN-BL-BGP permit 20
description sub-route-map test
match ip address prefix-list PL-SUBRM
sub-route-map RM-HIDE-ASPATH-IN
!
route-map RM-CONN-BL-BGP permit 30
match ip address prefix-list PL-CONTINUE
continue 40
!
route-map RM-CONN-BL-BGP permit 40
match ip address prefix-list PL-CONTINUE
continue
!
route-map RM-CONN-BL-BGP permit 50
!
route-map RM-HIDE-ASPATH-IN permit 10
set as-path match all replacement auto
Expand Down
19 changes: 19 additions & 0 deletions ...ble_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/route-maps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,25 @@ route_maps:
- ip address prefix-list PL-MLAG
20:
type: permit
description: sub-route-map test
sub_route_map: RM-HIDE-ASPATH-IN
match:
- ip address prefix-list PL-SUBRM
30:
type: permit
continue:
enabled: true
sequence_number: 40
match:
- ip address prefix-list PL-CONTINUE
40:
type: permit
continue:
enabled: true
match:
- ip address prefix-list PL-CONTINUE
50:
type: permit
RM-STATIC-2-BGP:
sequence_numbers:
10:
Expand Down
55 changes: 35 additions & 20 deletions ...arista/avd/molecule/eos_cli_config_gen_v4.0/documentation/devices/route-maps.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,41 +93,44 @@ interface Management1

#### RM-10.2.3.4-SET-NEXT-HOP-OUT

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | set ip next-hop 10.2.3.4 |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | - | ip next-hop 10.2.3.4 | - | - |

#### RM-CONN-BL-BGP

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | deny | match ip address prefix-list PL-MLAG |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | deny | ip address prefix-list PL-MLAG | - | - | - |
| 20 | permit | ip address prefix-list PL-SUBRM | - | RM-HIDE-ASPATH-IN | - |
| 30 | permit | ip address prefix-list PL-CONTINUE | - | - | 40 |
| 40 | permit | ip address prefix-list PL-CONTINUE | - | - | Next Sequence |
| 50 | permit | - | - | - | - |

#### RM-HIDE-ASPATH-IN

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | set as-path match all replacement auto |
| 10 | permit | set community 65000:1 additive |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | - | as-path match all replacement auto<br>community 65000:1 additive | - | - |

#### RM-HIDE-ASPATH-OUT

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | deny | match community LIST-COM |
| 20 | permit | set as-path match all replacement auto |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | deny | community LIST-COM | - | - | - |
| 20 | permit | - | as-path match all replacement auto | - | - |

#### RM-MLAG-PEER-IN

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | set origin incomplete |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | - | origin incomplete | - | - |

#### RM-STATIC-2-BGP

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | set tag 65100 |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | - | tag 65100 | - | - |

### Route-maps Device Configuration

Expand All @@ -140,6 +143,18 @@ route-map RM-CONN-BL-BGP deny 10
match ip address prefix-list PL-MLAG
!
route-map RM-CONN-BL-BGP permit 20
match ip address prefix-list PL-SUBRM
sub-route-map RM-HIDE-ASPATH-IN
!
route-map RM-CONN-BL-BGP permit 30
match ip address prefix-list PL-CONTINUE
continue 40
!
route-map RM-CONN-BL-BGP permit 40
match ip address prefix-list PL-CONTINUE
continue
!
route-map RM-CONN-BL-BGP permit 50
!
route-map RM-HIDE-ASPATH-IN permit 10
set as-path match all replacement auto
Expand Down
12 changes: 6 additions & 6 deletions ...d/molecule/eos_cli_config_gen_v4.0/documentation/devices/router-bgp-vrf-lite.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,15 +276,15 @@ ip prefix-list PL-BGP-DEFAULT-RED-OUT-C1

#### RM-BGP-AGG-APPLY-SET

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | set local-preference 50 |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | - | local-preference 50 | - | - |

#### RM-BGP-EXPORT-DEFAULT-BLUE-C1

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | match ip address prefix-list PL-BGP-DEFAULT-BLUE-C1 |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | ip address prefix-list PL-BGP-DEFAULT-BLUE-C1 | - | - | - |

### Route-maps Device Configuration

Expand Down
12 changes: 12 additions & 0 deletions ...e_collections/arista/avd/molecule/eos_cli_config_gen_v4.0/intended/configs/route-maps.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ route-map RM-CONN-BL-BGP deny 10
match ip address prefix-list PL-MLAG
!
route-map RM-CONN-BL-BGP permit 20
match ip address prefix-list PL-SUBRM
sub-route-map RM-HIDE-ASPATH-IN
!
route-map RM-CONN-BL-BGP permit 30
match ip address prefix-list PL-CONTINUE
continue 40
!
route-map RM-CONN-BL-BGP permit 40
match ip address prefix-list PL-CONTINUE
continue
!
route-map RM-CONN-BL-BGP permit 50
!
route-map RM-HIDE-ASPATH-IN permit 10
set as-path match all replacement auto
Expand Down
18 changes: 18 additions & 0 deletions ...ollections/arista/avd/molecule/eos_cli_config_gen_v4.0/inventory/host_vars/route-maps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,24 @@ route_maps:
- ip address prefix-list PL-MLAG
- sequence: 20
type: permit
sub_route_map: RM-HIDE-ASPATH-IN
match:
- ip address prefix-list PL-SUBRM
- sequence: 30
type: permit
continue:
enabled: true
sequence_number: 40
match:
- ip address prefix-list PL-CONTINUE
- sequence: 40
type: permit
continue:
enabled: true
match:
- ip address prefix-list PL-CONTINUE
- sequence: 50
type: permit
- name: RM-STATIC-2-BGP
sequence_numbers:
- sequence: 10
Expand Down
12 changes: 6 additions & 6 deletions ...ons/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,15 +872,15 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY

#### RM-CONN-2-BGP

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY | - | - | - |

#### RM-MLAG-PEER-IN

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | set origin incomplete |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | - | origin incomplete | - | - |

### Route-maps Device Configuration

Expand Down
12 changes: 6 additions & 6 deletions ...ons/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,15 +872,15 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY

#### RM-CONN-2-BGP

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY | - | - | - |

#### RM-MLAG-PEER-IN

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | set origin incomplete |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | - | origin incomplete | - | - |

### Route-maps Device Configuration

Expand Down
6 changes: 3 additions & 3 deletions ...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF1A.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,9 +725,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY

#### RM-CONN-2-BGP

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY | - | - | - |

### Route-maps Device Configuration

Expand Down
12 changes: 6 additions & 6 deletions ...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1158,15 +1158,15 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY

#### RM-CONN-2-BGP

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY | - | - | - |

#### RM-MLAG-PEER-IN

| Sequence | Type | Match and/or Set |
| -------- | ---- | ---------------- |
| 10 | permit | set origin incomplete |
| Sequence | Type | Match | Set | Sub-Route-Map | Continue |
| -------- | ---- | ----- | --- | ------------- | -------- |
| 10 | permit | - | origin incomplete | - | - |

### Route-maps Device Configuration

Expand Down
Loading