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.

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

Feat(eos_cli_config_gen): Add switchport 'tap' and 'tool' mode config to the ethernet and port-channel interfaces #4174

Merged
merged 54 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
7f0beef
Feat(eos_cli_config_gen): Add switchport 'tap' and 'tool' mode config…
Shivani-gslab Jul 2, 2024
9f9928b
Removing feature_header_legth from switchport.tap.encapsulation
Shivani-gslab Jul 2, 2024
333fbfc
Multiple fixes as per review comments
Shivani-gslab Jul 12, 2024
a51a587
Fixing comments
Shivani-gslab Jul 16, 2024
7e79986
Fix test-case for protocol
Shivani-gslab Jul 22, 2024
86c2d87
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 22, 2024
846d641
Fixing coverage
Shivani-gslab Jul 22, 2024
81ef7a1
Merge branch 'devel' into switchport_tap_tool
Shivani-gslab Aug 5, 2024
1bedd6b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 5, 2024
53b649d
Fixing template
Shivani-gslab Aug 7, 2024
e1c2fe3
Adding feature_header_lentgh and re_encapsulation_ethernet_header for…
Shivani-gslab Aug 7, 2024
b0c4f22
Merge branch 'devel' into switchport_tap_tool
Aug 14, 2024
af4cb43
Merge branch 'devel' into switchport_tap_tool
Shivani-gslab Sep 30, 2024
a3def43
Merge branch 'devel' into switchport_tap_tool
Shivani-gslab Oct 14, 2024
e1ab14c
Fixing tap.identity
Shivani-gslab Oct 14, 2024
00e7b53
Fixing order
Shivani-gslab Oct 14, 2024
cdc426c
Merge branch 'devel' into switchport_tap_tool
Shivani-gslab Oct 21, 2024
48a5683
Added outer tap/tool defined check
Shivani-gslab Oct 21, 2024
3f85b2d
Merge branch 'devel' into switchport_tap_tool
carlbuchmann Oct 28, 2024
9ec4b0a
Merge branch 'devel' into switchport_tap_tool
Shivani-gslab Nov 6, 2024
932bdd8
Merge branch 'devel' into switchport_tap_tool
Shivani-gslab Nov 7, 2024
008dcef
Moving host_vars
Shivani-gslab Nov 7, 2024
239cced
Merge branch 'devel' into switchport_tap_tool
Shivani-gslab Nov 11, 2024
cbe2146
Merge branch 'devel' into switchport_tap_tool
Shivani-gslab Nov 13, 2024
738913c
Fix the config ordering
Shivani-gslab Nov 18, 2024
82c06f6
Remove from tap.amc_address.dest
Shivani-gslab Nov 18, 2024
0d4e41a
Merge branch 'devel' into switchport_tap_tool
Shivani-gslab Nov 18, 2024
922ad6d
Refactor model for switchport.tap.encapsulation.gre
Shivani-gslab Nov 21, 2024
570a70c
Fix reencapsulation ethernet in code
Shivani-gslab Nov 22, 2024
f758c03
Fix the strip command
Shivani-gslab Nov 22, 2024
fde7e9e
Add strip key to protocol as required
Shivani-gslab Nov 25, 2024
f7dc4f9
Changing src and dest key to source/destination
Shivani-gslab Nov 26, 2024
772e6b5
Fixing review comments
Shivani-gslab Nov 26, 2024
a266ea0
Merge branch 'devel' into switchport_tap_tool
gmuloc Nov 27, 2024
e617c98
Fixing molecule sub-interfaces and schema description
Shivani-gslab Nov 28, 2024
a0013c4
Merge branch 'devel' into switchport_tap_tool
Shivani-gslab Nov 28, 2024
7f699c9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 28, 2024
2514797
fix spelling
Shivani-gslab Nov 28, 2024
419c9e4
fixing protocol range
Shivani-gslab Dec 4, 2024
6fbb40c
Merge branch 'devel' into switchport_tap_tool
gmuloc Dec 4, 2024
54cf282
Update description for feature header
Shivani-gslab Dec 5, 2024
0b95c1d
fix order and add description for gre strip
Shivani-gslab Dec 10, 2024
5c0aa16
Merge branch 'devel' into switchport_tap_tool
Shivani-gslab Dec 10, 2024
4c90f96
Merge branch 'devel' into switchport_tap_tool
gmuloc Dec 10, 2024
b4aa8ea
Merge branch 'devel' into switchport_tap_tool
gmuloc Dec 11, 2024
793fbc0
Apply suggestions
Shivani-gslab Dec 12, 2024
6124820
pre-commit
Shivani-gslab Dec 12, 2024
dfe4839
Merge branch 'devel' into switchport_tap_tool
gmuloc Dec 12, 2024
d25216b
Merge branch 'devel' into switchport_tap_tool
gmuloc Dec 13, 2024
79364ae
Updated tests
Shivani-gslab Dec 16, 2024
b4daa89
Merge branch 'devel' into switchport_tap_tool
Shivani-gslab Dec 16, 2024
d07d1de
Fixing CI
Shivani-gslab Dec 16, 2024
936ca2a
Merge branch 'devel' into switchport_tap_tool
Shivani-gslab Dec 16, 2024
c8608ef
Merge branch 'devel' into switchport_tap_tool
ClausHolbechArista Dec 17, 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
Original file line number Diff line number Diff line change
Expand Up @@ -4749,6 +4749,51 @@ interface Ethernet81/2
interface Ethernet81/10
description isis_port_channel_member
channel-group 110 mode active
!
interface Ethernet82
description Switchport_tap_tool
switchport tap native vlan 10
switchport tap identity 3 inner 5
switchport tap mac-address dest 01:00:00:00:00:00 src 01:23:45:67:89:ab
switchport tap mpls pop all
gmuloc marked this conversation as resolved.
Show resolved Hide resolved
switchport tap encapsulation gre protocol 0x1 strip
switchport tap encapsulation gre protocol 0x2 feature header length 3 strip
switchport tap encapsulation gre protocol 0x3 feature header length 2 strip re-encapsulation ethernet
switchport tap encapsulation gre protocol 0x4 strip re-encapsulation ethernet
switchport tap encapsulation gre strip
gmuloc marked this conversation as resolved.
Show resolved Hide resolved
switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0 strip
switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 strip
switchport tap encapsulation gre destination 2.1.1.2 protocol 0x10 strip
switchport tap encapsulation gre destination 2.1.1.2 protocol 0x11 feature header length 2 strip re-encapsulation ethernet
switchport tap encapsulation gre destination 2.1.1.2 protocol 0x12 strip re-encapsulation ethernet
switchport tap encapsulation gre destination 2.1.1.3 source 2.1.1.4 strip
switchport tool mpls pop all
gmuloc marked this conversation as resolved.
Show resolved Hide resolved
switchport tool encapsulation vn-tag strip
switchport tool encapsulation dot1br strip
switchport tap allowed vlan 25
switchport tool allowed vlan 23
switchport tool identity qinq
switchport tool identity dot1q source dzgre port
switchport tap truncation 150
switchport tool truncation
switchport tap default group g1 group g2 group g3
switchport tap default nexthop-group nexthop_g1 nexthop_g2 nexthop_g3
switchport tap default interface ethernet4
switchport tap default interface port-channel10
switchport tool group set group1 group2 group3
switchport tool dot1q remove outer 1
switchport tool dzgre preserve
!
interface Ethernet83
description Test_tap_tool
switchport tap identity 5
switchport tap mac-address dest 01:00:00:00:00:00
switchport tap encapsulation vxlan strip
switchport tap encapsulation gre strip
switchport tool identity dot1q
switchport tool identity qinq source dzgre policy inner port
switchport tap truncation
switchport tool truncation 160
```

### Port-Channel Interfaces
Expand Down Expand Up @@ -5102,7 +5147,7 @@ interface Port-Channel16
isis authentication mode md5
isis authentication key 0 <removed>
spanning-tree guard none
switchport backup-link Port-Channel100.102 prefer vlan 20
switchport backup-link Port-Channel100 prefer vlan 20
gmuloc marked this conversation as resolved.
Show resolved Hide resolved
!
interface Port-Channel17
description PBR Description
Expand Down Expand Up @@ -5492,6 +5537,48 @@ interface Port-Channel131.10
interface Port-Channel132
profile test-interface-profile
description Test_port-channel_interface-profile
!
interface Port-Channel133
description Test1_switchport_tap_tool
switchport tap native vlan 10
switchport tap identity 3
switchport tap mac-address dest 01:00:00:00:00:00 src 01:23:45:67:89:ab
switchport tap mpls pop all
switchport tap encapsulation gre protocol 0x2 feature header length 3 strip
ClausHolbechArista marked this conversation as resolved.
Show resolved Hide resolved
switchport tap encapsulation gre protocol 0x3 feature header length 2 strip re-encapsulation ethernet
switchport tap encapsulation gre protocol 0x10 strip
switchport tap encapsulation gre strip
ClausHolbechArista marked this conversation as resolved.
Show resolved Hide resolved
switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0 strip
switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 strip
switchport tap encapsulation gre destination 1.1.1.3 source 1.1.1.4 strip
switchport tap encapsulation gre destination 2.1.1.2 protocol 0x1 strip
switchport tap encapsulation gre destination 2.1.1.2 protocol 0x2 feature header length 2 strip re-encapsulation ethernet
switchport tool mpls pop all
switchport tool encapsulation vn-tag strip
switchport tool encapsulation dot1br strip
switchport tap allowed vlan 25
switchport tool allowed vlan 23
switchport tool identity qinq
switchport tool identity qinq source dzgre port inner policy
switchport tap truncation
switchport tool truncation 160
switchport tap default group g1 group g2 group g3
switchport tap default nexthop-group nexthop_g1 nexthop_g2 nexthop_g3
switchport tap default interface ethernet4
switchport tap default interface port-channel10
switchport tool group set group1 group2 group3
switchport tool dot1q remove outer 1-2
switchport tool dzgre preserve
ClausHolbechArista marked this conversation as resolved.
Show resolved Hide resolved
!
interface Port-Channel134
description Test2_switchport_tap_tool
switchport tap identity 3 inner 10
switchport tap mac-address dest 01:00:00:00:00:00
switchport tap encapsulation vxlan strip
switchport tool identity dot1q
switchport tool identity dot1q source dzgre policy
switchport tap truncation 120
switchport tool truncation
ClausHolbechArista marked this conversation as resolved.
Show resolved Hide resolved
```

### Loopback Interfaces
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1773,7 +1773,7 @@ interface Port-Channel16
isis authentication mode md5
isis authentication key 0 password
spanning-tree guard none
switchport backup-link Port-Channel100.102 prefer vlan 20
switchport backup-link Port-Channel100 prefer vlan 20
!
interface Port-Channel17
description PBR Description
Expand Down Expand Up @@ -2164,6 +2164,48 @@ interface Port-Channel132
profile test-interface-profile
description Test_port-channel_interface-profile
!
interface Port-Channel133
description Test1_switchport_tap_tool
switchport tap native vlan 10
switchport tap identity 3
switchport tap mac-address dest 01:00:00:00:00:00 src 01:23:45:67:89:ab
switchport tap mpls pop all
switchport tap encapsulation gre protocol 0x2 feature header length 3 strip
switchport tap encapsulation gre protocol 0x3 feature header length 2 strip re-encapsulation ethernet
switchport tap encapsulation gre protocol 0x10 strip
switchport tap encapsulation gre strip
switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0 strip
switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 strip
switchport tap encapsulation gre destination 1.1.1.3 source 1.1.1.4 strip
switchport tap encapsulation gre destination 2.1.1.2 protocol 0x1 strip
switchport tap encapsulation gre destination 2.1.1.2 protocol 0x2 feature header length 2 strip re-encapsulation ethernet
switchport tool mpls pop all
switchport tool encapsulation vn-tag strip
switchport tool encapsulation dot1br strip
switchport tap allowed vlan 25
switchport tool allowed vlan 23
switchport tool identity qinq
switchport tool identity qinq source dzgre port inner policy
switchport tap truncation
switchport tool truncation 160
switchport tap default group g1 group g2 group g3
switchport tap default nexthop-group nexthop_g1 nexthop_g2 nexthop_g3
switchport tap default interface ethernet4
switchport tap default interface port-channel10
switchport tool group set group1 group2 group3
switchport tool dot1q remove outer 1-2
switchport tool dzgre preserve
!
interface Port-Channel134
description Test2_switchport_tap_tool
switchport tap identity 3 inner 10
switchport tap mac-address dest 01:00:00:00:00:00
switchport tap encapsulation vxlan strip
switchport tool identity dot1q
switchport tool identity dot1q source dzgre policy
switchport tap truncation 120
switchport tool truncation
!
interface Dps1
description Test DPS Interface
shutdown
Expand Down Expand Up @@ -3141,6 +3183,51 @@ interface Ethernet81/10
description isis_port_channel_member
channel-group 110 mode active
!
interface Ethernet82
description Switchport_tap_tool
switchport tap native vlan 10
switchport tap identity 3 inner 5
switchport tap mac-address dest 01:00:00:00:00:00 src 01:23:45:67:89:ab
switchport tap mpls pop all
switchport tap encapsulation gre protocol 0x1 strip
switchport tap encapsulation gre protocol 0x2 feature header length 3 strip
switchport tap encapsulation gre protocol 0x3 feature header length 2 strip re-encapsulation ethernet
switchport tap encapsulation gre protocol 0x4 strip re-encapsulation ethernet
switchport tap encapsulation gre strip
switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 protocol 0x0 strip
switchport tap encapsulation gre destination 1.1.1.1 source 1.1.1.2 strip
switchport tap encapsulation gre destination 2.1.1.2 protocol 0x10 strip
switchport tap encapsulation gre destination 2.1.1.2 protocol 0x11 feature header length 2 strip re-encapsulation ethernet
switchport tap encapsulation gre destination 2.1.1.2 protocol 0x12 strip re-encapsulation ethernet
switchport tap encapsulation gre destination 2.1.1.3 source 2.1.1.4 strip
switchport tool mpls pop all
switchport tool encapsulation vn-tag strip
switchport tool encapsulation dot1br strip
switchport tap allowed vlan 25
switchport tool allowed vlan 23
switchport tool identity qinq
switchport tool identity dot1q source dzgre port
switchport tap truncation 150
switchport tool truncation
switchport tap default group g1 group g2 group g3
switchport tap default nexthop-group nexthop_g1 nexthop_g2 nexthop_g3
switchport tap default interface ethernet4
switchport tap default interface port-channel10
switchport tool group set group1 group2 group3
switchport tool dot1q remove outer 1
switchport tool dzgre preserve
!
interface Ethernet83
description Test_tap_tool
switchport tap identity 5
switchport tap mac-address dest 01:00:00:00:00:00
switchport tap encapsulation vxlan strip
switchport tap encapsulation gre strip
switchport tool identity dot1q
switchport tool identity qinq source dzgre policy inner port
switchport tap truncation
switchport tool truncation 160
!
interface Loopback0
description EVPN_Overlay_Peering
ip address 192.168.255.3/32
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1651,6 +1651,7 @@ ethernet_interfaces:
inner_vlan: 11
network:
encapsulation: client inner

- name: Ethernet70
description: dot1x_aaa_unresponsive
shutdown: false
Expand All @@ -1669,6 +1670,7 @@ ethernet_interfaces:
traffic_allow: true
apply_alternate: true
mac_based_access_list: true

- name: Ethernet71
description: dot1x_aaa_unresponsive1
shutdown: false
Expand All @@ -1685,6 +1687,7 @@ ethernet_interfaces:
time_duration: 10
time_duration_unit: hours
mac_based_access_list: true

- name: Ethernet72
description: dot1x_aaa_unresponsive2
shutdown: false
Expand Down Expand Up @@ -1840,3 +1843,108 @@ ethernet_interfaces:
spanning_tree_portfast: edge
lldp:
ztp_vlan: 112

- name: Ethernet82
description: Switchport_tap_tool
switchport:
tap:
allowed_vlan: 25
default:
groups:
- g2
- g1
- g3
nexthop_groups:
- nexthop_g1
- nexthop_g3
- nexthop_g2
interfaces:
- port-channel10
- ethernet4
identity:
id: 3
inner_vlan: 5
mpls_pop_all: true
native_vlan: 10
truncation:
enabled: true
size: 150
mac_address:
destination: 01:00:00:00:00:00
source: 01:23:45:67:89:ab
encapsulation:
gre:
strip: true
destinations:
- destination: 1.1.1.1
source: 1.1.1.2
protocols:
- protocol: "0x0"
strip: true
strip: true
- destination: 2.1.1.2
protocols:
- protocol: "0x10"
strip: true
- protocol: "0x11"
feature_header_length: 2
re_encapsulation_ethernet_header: true
strip: true
- protocol: "0x12"
re_encapsulation_ethernet_header: true
strip: true
- destination: 2.1.1.3
source: 2.1.1.4
strip: true
protocols:
- protocol: "0x1"
strip: true
- protocol: "0x2"
feature_header_length: 3
strip: true
- protocol: "0x3"
feature_header_length: 2
re_encapsulation_ethernet_header: true
strip: true
- protocol: "0x4"
re_encapsulation_ethernet_header: true
strip: true
tool:
mpls_pop_all: true
encapsulation:
dot1br_strip: true
vn_tag_strip: true
allowed_vlan: 23
identity:
tag: qinq
dot1q_dzgre_source: port
truncation:
enabled: true
groups:
- group1
- group2
- group3
dot1q_remove_outer_vlan_tag: 1
dzgre_preserve: true

- name: Ethernet83
description: Test_tap_tool
switchport:
tap:
identity:
id: 5
mac_address:
destination: 01:00:00:00:00:00
encapsulation:
vxlan_strip: true
gre:
strip: true
truncation:
enabled: true
tool:
identity:
tag: dot1q
qinq_dzgre_source: policy inner port
truncation:
enabled: true
size: 160
Loading
Loading