Skip to content

[Yang-models] Modify mirror yang model src_port to match CONFIG_DB #13578

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 2 commits into from
Feb 16, 2023
Merged

[Yang-models] Modify mirror yang model src_port to match CONFIG_DB #13578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cefab0
[Yang-models] Modify mirror yang model src_port to match CONFIG_DB
rupesh-k Feb 1, 2023
9461a5c
Modify src_port max size to 2048
rupesh-k Feb 15, 2023
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
6 changes: 1 addition & 5 deletions src/sonic-yang-models/tests/files/sample_config_db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,11 +1933,7 @@
"direction": "RX",
"type": "SPAN",
"dst_port": "Ethernet2",
"src_port": [
"Ethernet3",
"Ethernet4"
]

"src_port": "Ethernet3,Ethernet4"
}
},

Expand Down
8 changes: 0 additions & 8 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 @@ -72,10 +72,6 @@
"MIRROR_ERSPAN_ENTRY_VALID_SRC_PORTCHANNEL": {
"desc": "Configuring ERSPAN entry with valid source portchannel"
},
"MIRROR_ERSPAN_ENTRY_INVALID_SRC_PORT": {
"desc": "Configuring ERSPAN entry with invalid source port",
"eStrKey" : "InvalidValue"
},
"MIRROR_SPAN_ENTRY_WITH_VALID_VALUES": {
"desc": "Configuring SPAN entry with valid source and destination ports"
},
Expand All @@ -90,10 +86,6 @@
"MIRROR_SPAN_ENTRY_VALID_DST_PORT_CPU": {
"desc": "Configuring SPAN entry with valid destination port CPU"
},
"MIRROR_SPAN_ENTRY_INVALID_SRC_PORT": {
"desc": "Configuring SPAN entry with invalid destination ports",
"eStrKey" : "InvalidValue"
},
"MIRROR_SPAN_ENTRY_INVALID_DIRECTION": {
"desc": "Configuring SPAN entry with invalid direction",
"eStrKey": "InvalidValue"
Expand Down
64 changes: 3 additions & 61 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 @@ -316,9 +316,7 @@
"gre_type": "0x1234",
"dscp": "10",
"ttl": "63",
"src_port": [
"Ethernet0"
]
"src_port": "Ethernet0"
}
]
}
Expand Down Expand Up @@ -346,29 +344,7 @@
"gre_type": "0x1234",
"dscp": "10",
"ttl": "63",
"src_port": [
"PortChannel5"
]
}
]
}
}
},
"MIRROR_ERSPAN_ENTRY_INVALID_SRC_PORT": {
"sonic-mirror-session:sonic-mirror-session": {
"MIRROR_SESSION": {
"MIRROR_SESSION_LIST": [
{
"name": "erspan",
"type": "ERSPAN",
"dst_ip": "11.1.1.1",
"src_ip": "10.1.1.1",
"gre_type": "0x1234",
"dscp": "10",
"ttl": "63",
"src_port": [
"Ethernet0"
]
"src_port": "PortChannel5"
}
]
}
Expand Down Expand Up @@ -415,10 +391,7 @@
"name": "span",
"type": "SPAN",
"dst_port": "Ethernet0",
"src_port": [
"Ethernet4",
"Ethernet8"
],
"src_port": "Ethernet4,Ethernet8",
"direction": "RX"
}
]
Expand Down Expand Up @@ -479,37 +452,6 @@
}
}
},
"MIRROR_SPAN_ENTRY_INVALID_SRC_PORT": {
"sonic-port:sonic-port": {
"sonic-port:PORT": {
"PORT_LIST": [
{
"admin_status": "up",
"alias": "eth0",
"description": "Ethernet0",
"lanes": "1",
"mtu": 9000,
"name": "Ethernet0",
"speed": 25000
}
]
}
},
"sonic-mirror-session:sonic-mirror-session": {
"MIRROR_SESSION": {
"MIRROR_SESSION_LIST": [
{
"name": "span",
"type": "SPAN",
"dst_port": "Ethernet0",
"src_port": [
"Ethernet4"
]
}
]
}
}
},
"MIRROR_SPAN_ENTRY_INVALID_DIRECTION": {
"sonic-port:sonic-port": {
"sonic-port:PORT": {
Expand Down
11 changes: 3 additions & 8 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 @@ -154,14 +154,9 @@ module sonic-mirror-session {
"Destination port configuration for port mirroring(SPAN).";
}

leaf-list src_port {
type union {
type leafref {
path "/port:sonic-port/port:PORT/port:PORT_LIST/port:name";
}
type leafref {
path "/lag:sonic-portchannel/lag:PORTCHANNEL/lag:PORTCHANNEL_LIST/lag:name";
}
leaf src_port {
type string {
length 1..2048;
}
description
"Source port configuration for mirroring. Can be configured for both SPAN/ERSPAN.
Expand Down