Skip to content

Update dhcpv6-relay yang model #14144

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
yxieca merged 6 commits into from
Mar 15, 2023
Merged

Update dhcpv6-relay yang model #14144

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
5b8dc73
Add interface-id
kellyyeh Mar 7, 2023
94e8619
Add unit test and update config md
kellyyeh Mar 8, 2023
9040653
Resolve conflict
kellyyeh Mar 13, 2023
1be6c2e
Merge branch 'master' of https://github.com/kellyyeh/sonic-buildimage…
kellyyeh Mar 13, 2023
6ccf45d
Update option
kellyyeh Mar 13, 2023
7f4b6a4
Update option
kellyyeh Mar 14, 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
19 changes: 18 additions & 1 deletion src/sonic-yang-models/doc/Configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ Table of Contents
* [Data Plane L3 Interfaces](#data-plane-l3-interfaces)
* [DEFAULT_LOSSLESS_BUFFER_PARAMETER](#DEFAULT_LOSSLESS_BUFFER_PARAMETER)
* [Device Metadata](#device-metadata)
* [Device neighbor metada](#device-neighbor-metada)
* [Device neighbor metada](#device-neighbor-metada)
* [DHCP_RELAY](#dhcp_relay)
* [DSCP_TO_TC_MAP](#dscp_to_tc_map)
* [FG_NHG](#fg_nhg)
* [FG_NHG_MEMBER](#fg_nhg_member)
Expand Down Expand Up @@ -894,6 +895,22 @@ instance is supported in SONiC.

```

### DHCP_RELAY

```
{
"DHCP_RELAY": {
"dhcpv6_servers": [
"fc02:2000::1",
"fc02:2000::2",
"fc02:2000::3",
"fc02:2000::4"
],
"rfc6939_support": "true",
"interface_id": "true"
}

```

### DSCP_TO_TC_MAP
```
Expand Down
6 changes: 4 additions & 2 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 @@ -1805,13 +1805,15 @@
"dhcpv6_servers": [
"2a04:5555:41::11"
],
"rfc6939_support": "true"
"rfc6939_support": "true",
"interface_id": "true"
},
"Vlan777": {
"dhcpv6_servers": [
"2a04:5555:41::11"
],
"rfc6939_support": "true"
"rfc6939_support": "true",
"interface_id": "true"
}
},
"SCHEDULER": {
Expand Down
4 changes: 4 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/dhcpv6_relay.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,9 @@
},
"DHCPV6_SERVER_VALID_FORMAT": {
"desc": "Add dhcpv6_server in correct format."
},
"DHCPv6_OPTION_WITH_INVALID_BOOLEAN_TYPE": {
"desc": "Add dhcpv6 option with invalid option boolean types.",
"eStrKey": "Pattern"
}
}
16 changes: 15 additions & 1 deletion src/sonic-yang-models/tests/yang_model_tests/tests_config/dhcpv6_relay.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,25 @@
"2001:1::2"
],
"rfc6939_support": "true",

"name": "Vlan400",
"interface_id": "true",
"name": "Vlan400"
}
]
}
}
},
"DHCPv6_OPTION_WITH_INVALID_BOOLEAN_TYPE": {
"sonic-dhcpv6-relay:sonic-dhcpv6-relay": {
"sonic-dhcpv6-relay:DHCP_RELAY": {
"DHCP_RELAY_LIST": [
{
"name": "Vlan500",
"rfc6939_support": "False",
"interface_id": "False"
}
]
}
}
}
}
27 changes: 18 additions & 9 deletions src/sonic-yang-models/yang-models/sonic-dhcpv6-relay.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,24 @@ module sonic-dhcpv6-relay {
type string;
}

leaf-list dhcpv6_servers {
description "Configure the dhcp v6 servers";
type inet:ipv6-address;
}

leaf rfc6939_support {
description "Set rfc6939 for the relay";
type boolean;
}
leaf-list dhcpv6_servers {
description "Configure the dhcp v6 servers";
type inet:ipv6-address;
}

leaf rfc6939_support {
description "Set rfc6939 for the relay";
type string {
pattern "false|true";
}
}

leaf interface_id {
description "Enable interface ID insertion in relayed messages";
type string {
pattern "false|true";
}
}
}
/* end of VLAN_LIST */
}
Expand Down