Skip to content

Updated the YANG model for ERSPAN mirror sessions #22882

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
qiluo-msft merged 6 commits into from
Jul 3, 2025
Merged

Updated the YANG model for ERSPAN mirror sessions #22882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
921d268
Changed type of 'src_ip' and 'dst_ip' for mirror session to ip-address.
mramezani95 Jun 7, 2025
88c655b
Added the condition that src_ip and dst_ip must have the same IP vers…
mramezani95 Jun 24, 2025
74ba8f2
Added missing semicolons.
mramezani95 Jun 24, 2025
24d36ee
Updated the expected error message.
mramezani95 Jun 25, 2025
10b2074
Fixed an error when running tests.
mramezani95 Jun 25, 2025
9e72232
Modified the conditions for 'dst_ip' and 'src_ip' since IPv6 addresse…
mramezani95 Jun 27, 2025
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
7 changes: 5 additions & 2 deletions src/sonic-yang-models/tests/yang_model_tests/tests/mirror_session.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,24 @@
"MIRROR_ERSPAN_ENTRY_WITH_VALID_DEC_VALUES_2": {
"desc": "Configuring ERSPAN entry with valid decimal values."
},
"MIRROR_ERSPAN_ENTRY_WITH_VALID_IPV6_SRC_AND_DST_IP": {
"desc": "Configuring ERSPAN entry with valid IPv6 source and destination IPs."
},
"MIRROR_ERSPAN_ENTRY_WRONG_TYPE": {
"desc": "Configuring ERSPAN entry with invalid type",
"eStrKey": "InvalidValue"
},
"MIRROR_ERSPAN_ENTRY_WRONG_DST_IP": {
"desc": "Configuring ERSPAN entry with invalid dst_ip",
"eStrKey" : "Pattern"
"eStr" : "src_ip and dst_ip must have the same IP version."
},
"MIRROR_ERSPAN_ENTRY_WRONG_DST_IP_TYPE": {
"desc": "Configuring ERSPAN entry with invalid dst_ip",
"eStrKey" : "When"
},
"MIRROR_ERSPAN_ENTRY_WRONG_SRC_IP": {
"desc": "Configuring ERSPAN entry with invalid src_ip",
"eStrKey" : "Pattern"
"eStr" : "src_ip and dst_ip must have the same IP version."
},
"MIRROR_ERSPAN_ENTRY_WRONG_SRC_IP_TYPE": {
"desc": "Configuring ERSPAN entry with invalid src_ip",
Expand Down
19 changes: 19 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/mirror_session.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,25 @@
}
}
},
"MIRROR_ERSPAN_ENTRY_WITH_VALID_IPV6_SRC_AND_DST_IP": {
"sonic-mirror-session:sonic-mirror-session": {
"MIRROR_SESSION": {
"MIRROR_SESSION_LIST": [
{
"name": "erspan",
"type": "ERSPAN",
"dst_ip": "1001::1",
"src_ip": "2002::2",
"gre_type": "0x1234",
"dscp": "10",
"ttl": "64",
"queue": "0",
"direction": "RX"
}
]
}
}
},
"MIRROR_ERSPAN_ENTRY_WRONG_TYPE": {
"sonic-mirror-session:sonic-mirror-session": {
"MIRROR_SESSION": {
Expand Down
10 changes: 8 additions & 2 deletions src/sonic-yang-models/yang-models/sonic-mirror-session.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,21 @@ module sonic-mirror-session {

leaf src_ip {
when "current()/../type = 'ERSPAN'";
type inet:ipv4-address;
must "(contains(current(), ':') and contains(../dst_ip, ':')) or (not(contains(current(), ':')) and not(contains(../dst_ip, ':')))" {
error-message "src_ip and dst_ip must have the same IP version.";
}
type inet:ip-address;
description
"ERSPAN source ip. This IP will be set as source ip in
outer header of mirrored frame ";
}

leaf dst_ip {
when "current()/../type = 'ERSPAN'";
type inet:ipv4-address;
must "(contains(current(), ':') and contains(../src_ip, ':')) or (not(contains(current(), ':')) and not(contains(../src_ip, ':')))" {
error-message "src_ip and dst_ip must have the same IP version.";
}
type inet:ip-address;
description
"ERSPAN destination ip. Mirrored frames will be routed to this destination.
This IP will be set as destination ip in outer header of mirrored frame ";
Expand Down
Loading