Skip to content

[YANG] Add srv6 yang model and unit tests #21175

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
lguohan merged 18 commits into from
Jan 13, 2025
Merged

[YANG] Add srv6 yang model and unit tests #21175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
778d1ac
add srv6 yang model and unit tests
BYGX-wcr Dec 13, 2024
9e7c88b
add vrf back to srv6 yang model and fix syntax error
BYGX-wcr Dec 16, 2024
5d2606f
Merge branch 'master' into srv6-yang
BYGX-wcr Dec 17, 2024
59ff34d
add default val for dscp_mode and change vrf to be union type
BYGX-wcr Dec 17, 2024
ac80f3a
fix unintentional invalid ip strings
BYGX-wcr Dec 18, 2024
84f9093
fix messy UT cases
BYGX-wcr Dec 18, 2024
1c8fbbb
remove unncessary error-message
BYGX-wcr Dec 18, 2024
dff2bc9
Merge branch 'master' into srv6-yang
BYGX-wcr Dec 22, 2024
f8ea98f
Update YANG model to use the new two table schemas and add additional…
BYGX-wcr Dec 27, 2024
c27a49b
fix mismatched field name
BYGX-wcr Dec 27, 2024
7e498e1
fix broken test case and fix broken must condition
BYGX-wcr Dec 27, 2024
32157bb
check the impact of ordering must condition
BYGX-wcr Dec 27, 2024
7c811a6
adjust the XPath expression for prefix matching
BYGX-wcr Dec 28, 2024
a2d2c50
update the YANG model to use the vrf as key for SRV6_MY_SIDS table
BYGX-wcr Jan 2, 2025
7fe7f6a
replace vrf with locator in the key combo of SRV6_MY_SIDS
BYGX-wcr Jan 4, 2025
e9b505d
update srv6 yang model to stay consistent with HLD
BYGX-wcr Jan 6, 2025
3e1f62c
fix unmatched field name in test_config/srv6 .json
BYGX-wcr Jan 7, 2025
df7cd27
sonic-yang-models: update the srv6 example in configuration.md
BYGX-wcr Jan 8, 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
26 changes: 26 additions & 0 deletions src/sonic-yang-models/doc/Configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# SONiC Configuration Database Manual


**Table of Contents**

* [Introduction](#introduction)
Expand Down Expand Up @@ -92,6 +93,7 @@
* [RADIUS](#radius)
* [Static DNS](#static-dns)
* [ASIC_SENSORS](#asic_sensors)
* [SRv6](#srv6)
* [For Developers](#for-developers)
* [Generating Application Config by Jinja2 Template](#generating-application-config-by-jinja2-template)
* [Incremental Configuration by Subscribing to ConfigDB](#incremental-configuration-by-subscribing-to-configdb)
Expand Down Expand Up @@ -2884,6 +2886,30 @@ The DNS_NAMESERVER table introduces static DNS nameservers configuration.
}
```

### SRv6

The **SRV6_MY_SIDS** and **SRV6_MY_LOCATORS** tables introduce Segment Routing over IPv6 configuration.
An example is as follows:
```
{
"SRV6_MY_LOCATORS" : {
"loc1" : {
"prefix" : "FCBB:BBBB:20::"
}
}
"SRV6_MY_SIDS" : {
"loc1|FCBB:BBBB:20::" : {
"action": "uN"
},
"loc1|FCBB:BBBB:20:F1::" : {
"action": "uDT46",
"decap_vrf": "default",
"decap_dscp_mode": "pipe"
}
}
}
```

### FIPS

The FIPS table introduces FIPS configuration.
Expand Down
36 changes: 36 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/srv6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"SRV6_VALID": {
"desc": "Valid config"
},
"SRV6_MY_LOCATOR_INVALID_FUNC_LEN": {
"desc": "A locator configured with invalid func_len",
"eStrKey" : "Must"
},
"SRV6_MY_LOCATOR_INVALID_VRF": {
"desc": "A locator configured with an invalid VRF name",
"eStrKey" : "InvalidValue",
"eStr": ["vrf"]
},
"SRV6_MY_SID_INVALID_LOCATOR": {
"desc": "A SID configured with invalid locator identifier",
"eStrKey" : "LeafRef"
},
"SRV6_MY_SID_INVALID_IP_ADDR": {
"desc": "A SID configured with invalid IPv6 address",
"eStrKey" : "Pattern"
},
"SRV6_MY_SID_UNMATCHED_IP_ADDR": {
"desc": "A SID configured with an IPv6 Address that does not match with the prefix of the locator",
"eStrKey" : "Must"
},
"SRV6_MY_SID_INVALID_ACTION": {
"desc": "A SID configured with invalid action",
"eStrKey" : "InvalidValue",
"eStr": ["action"]
},
"SRV6_MY_SID_DSCP_MODE_WITH_UN": {
"desc": "A SID configured with dscp_mode and uN action",
"eStrKey" : "When",
"eStr": ["action"]
}
}
213 changes: 213 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/srv6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
{
"SRV6_VALID": {
"sonic-srv6:sonic-srv6": {
"sonic-srv6:SRV6_MY_LOCATORS": {
"SRV6_MY_LOCATORS_LIST": [
{
"locator_name": "MAIN",
"prefix": "FCBB:BBBB:20::"
}
]
},
"sonic-srv6:SRV6_MY_SIDS": {
"SRV6_MY_SIDS_LIST": [
{
"ip_address": "FCBB:BBBB:20::",
"locator": "MAIN",
"action": "uN"
},
{
"ip_address": "FCBB:BBBB:20:F1::",
"locator": "MAIN",
"action": "uDT46"
}
]
}
}
},
"SRV6_MY_LOCATOR_INVALID_FUNC_LEN": {
"sonic-srv6:sonic-srv6": {
"sonic-srv6:SRV6_MY_LOCATORS": {
"SRV6_MY_LOCATORS_LIST": [
{
"locator_name": "MAIN",
"prefix": "FCBB:BBBB:20::",
"func_len": 127
}
]
},
"sonic-srv6:SRV6_MY_SIDS": {
"SRV6_MY_SIDS_LIST": [
{
"ip_address": "FCBB:BBBB:20::",
"locator": "MAIN",
"action": "uN"
},
{
"ip_address": "FCBB:BBBB:20:F1::",
"locator": "MAIN",
"action": "uDT46"
}
]
}
}
},
"SRV6_MY_LOCATOR_INVALID_VRF": {
"sonic-srv6:sonic-srv6": {
"sonic-srv6:SRV6_MY_LOCATORS": {
"SRV6_MY_LOCATORS_LIST": [
{
"locator_name": "MAIN",
"prefix": "FCBB:BBBB:20::",
"vrf": "Vrf1"
}
]
},
"sonic-srv6:SRV6_MY_SIDS": {
"SRV6_MY_SIDS_LIST": [
{
"ip_address": "FCBB:BBBB:20::",
"locator": "MAIN",
"action": "uN"
},
{
"ip_address": "FCBB:BBBB:20:F1::",
"locator": "MAIN",
"action": "uDT46"
}
]
}
}
},
"SRV6_MY_SID_INVALID_LOCATOR": {
"sonic-srv6:sonic-srv6": {
"sonic-srv6:SRV6_MY_LOCATORS": {
"SRV6_MY_LOCATORS_LIST": [
{
"locator_name": "MAIN",
"prefix": "FCBB:BBBB:20::"
}
]
},
"sonic-srv6:SRV6_MY_SIDS": {
"SRV6_MY_SIDS_LIST": [
{
"ip_address": "FCBB:BBBB:20::",
"locator": "None",
"action": "uN"
},
{
"ip_address": "FCBB:BBBB:20:F1::",
"locator": "MAIN",
"action": "uDT46"
}
]
}
}
},
"SRV6_MY_SID_INVALID_IP_ADDR": {
"sonic-srv6:sonic-srv6": {
"sonic-srv6:SRV6_MY_LOCATORS": {
"SRV6_MY_LOCATORS_LIST": [
{
"locator_name": "MAIN",
"prefix": "FCBB:BBBB:20::"
}
]
},
"sonic-srv6:SRV6_MY_SIDS": {
"SRV6_MY_SIDS_LIST": [
{
"ip_address": "FCBB:BBBB:200001::",
"locator": "MAIN",
"action": "uN"
},
{
"ip_address": "FCBB:BBBB:20:F1::",
"locator": "MAIN",
"action": "uDT46"
}
]
}
}
},
"SRV6_MY_SID_UNMATCHED_IP_ADDR": {
"sonic-srv6:sonic-srv6": {
"sonic-srv6:SRV6_MY_LOCATORS": {
"SRV6_MY_LOCATORS_LIST": [
{
"locator_name": "MAIN",
"prefix": "FCBB:BBBB:20::"
}
]
},
"sonic-srv6:SRV6_MY_SIDS": {
"SRV6_MY_SIDS_LIST": [
{
"ip_address": "FCBB:BBBB:21::",
"locator": "MAIN",
"action": "uN"
},
{
"ip_address": "FCBB:BBBB:20:F1::",
"locator": "MAIN",
"action": "uDT46"
}
]
}
}
},
"SRV6_MY_SID_INVALID_ACTION": {
"sonic-srv6:sonic-srv6": {
"sonic-srv6:SRV6_MY_LOCATORS": {
"SRV6_MY_LOCATORS_LIST": [
{
"locator_name": "MAIN",
"prefix": "FCBB:BBBB:20::"
}
]
},
"sonic-srv6:SRV6_MY_SIDS": {
"SRV6_MY_SIDS_LIST": [
{
"ip_address": "FCBB:BBBB:20::",
"locator": "MAIN",
"action": "uA"
},
{
"ip_address": "FCBB:BBBB:20:F1::",
"locator": "MAIN",
"action": "uDT46"
}
]
}
}
},
"SRV6_MY_SID_DSCP_MODE_WITH_UN": {
"sonic-srv6:sonic-srv6": {
"sonic-srv6:SRV6_MY_LOCATORS": {
"SRV6_MY_LOCATORS_LIST": [
{
"locator_name": "MAIN",
"prefix": "FCBB:BBBB:20::"
}
]
},
"sonic-srv6:SRV6_MY_SIDS": {
"SRV6_MY_SIDS_LIST": [
{
"ip_address": "FCBB:BBBB:20::",
"locator": "MAIN",
"action": "uN",
"decap_dscp_mode": "uniform"
},
{
"ip_address": "FCBB:BBBB:20:F1::",
"locator": "MAIN",
"action": "uDT46"
}
]
}
}
}
}
Loading