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.

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

Jump to bottom

[DNS] yang model for static DNS #13834

Merged
merged 1 commit into from
Feb 19, 2023
Merged

[DNS] yang model for static DNS #13834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 16 additions & 2 deletions src/sonic-yang-models/doc/Configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ Table of Contents
* [LOGGER](#logger)
* [WRED_PROFILE](#wred_profile)
* [PASSWORD_HARDENING](#password_hardening)
* [SYSTEM_DEFAULTS table](#systemdefaults-table)
* [RADIUS](#radius)
* [SYSTEM_DEFAULTS table](#systemdefaults-table)
* [RADIUS](#radius)
* [Static DNS](#static-dns)
* [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 @@ -2096,6 +2097,19 @@ The RADIUS and RADIUS_SERVER tables define RADIUS configuration parameters. RADI
}
```

### Static DNS

The DNS_NAMESERVER table introduces static DNS nameservers configuration.

```json
{
"DNS_NAMESERVER": {
"1.1.1.1": {},
"fe80:1000:2000:3000::1": {}
},
}
```

#### 5.2.3 Update value directly in db memory

For Developers
Expand Down
1 change: 1 addition & 0 deletions src/sonic-yang-models/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ def run(self):
'./yang-models/sonic-device_neighbor_metadata.yang',
'./yang-models/sonic-dhcp-server.yang',
'./yang-models/sonic-dhcpv6-relay.yang',
'./yang-models/sonic-dns.yang',
'./yang-models/sonic-events-bgp.yang',
'./yang-models/sonic-events-common.yang',
'./yang-models/sonic-events-dhcp-relay.yang',
Expand Down
4 changes: 4 additions & 0 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 @@ -8,6 +8,10 @@
"192.0.0.8": {},
"192.0.0.8": {}
},
"DNS_NAMESERVER": {
"1.1.1.1": {},
"fe80:1000:2000:3000::1": {}
},
"BUFFER_POOL": {
"ingress_lossy_pool": {
"mode": "static",
Expand Down
13 changes: 13 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/dns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"DNS_NAMESERVER_TEST" : {
"desc": "DNS nameserver configuration in DNS_NAMESERVER table."
},
"DNS_NAMESERVER_TEST_INVALID_IP" : {
"desc": "DNS nameserver configuration with invalid IP value in DNS_NAMESERVER table.",
"eStr": "Invalid value"
},
"DNS_NAMESERVER_TEST_MAX_IP_NUMBER" : {
"desc": "DNS nameserver configuration exceeds the maximum IPs in DNS_NAMESERVER table.",
"eStr": "Too many elements."
}
}
47 changes: 47 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/dns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"DNS_NAMESERVER_TEST": {
"sonic-dns:sonic-dns": {
"sonic-dns:DNS_NAMESERVER": {
"DNS_NAMESERVER_LIST": [
{
"ip": "192.168.1.1"
},
{
"ip": "fe80:1000:2000:3000::1"
}
]
}
}
},
"DNS_NAMESERVER_TEST_INVALID_IP": {
"sonic-dns:sonic-dns": {
"sonic-dns:DNS_NAMESERVER": {
"DNS_NAMESERVER_LIST": [
{
"ip": "1.x.2.x"
}
]
}
}
},
"DNS_NAMESERVER_TEST_MAX_IP_NUMBER": {
"sonic-dns:sonic-dns": {
"sonic-dns:DNS_NAMESERVER": {
"DNS_NAMESERVER_LIST": [
{
"ip": "192.168.1.1"
},
{
"ip": "fe80:1000:2000:3000::2"
},
{
"ip": "192.168.1.3"
},
{
"ip": "fe80:1000:2000:3000::4"
}
]
}
}
}
}
45 changes: 45 additions & 0 deletions src/sonic-yang-models/yang-models/sonic-dns.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
module sonic-dns {

namespace "http://github.com/sonic-net/sonic-dns";
yang-version 1.1;
prefix dns;

import ietf-inet-types {
prefix inet;
}

organization
"SONiC";

contact
"SONiC";

description "DNS YANG module for SONiC OS";

revision 2023-02-14 {
description "Initial version";
}

container sonic-dns {

container DNS_NAMESERVER {

description "DNS_NAMESERVER part of config_db.json";

list DNS_NAMESERVER_LIST {
max-elements 3;
description "List of nameservers IPs";

key "ip";

leaf ip {
description "IP as DHCP_SERVER";
type inet:ip-address;
}
} /* end of list DNS_NAMESERVER_LIST */

} /* end of container DNS_NAMESERVER */

} /* end of container sonic-dns */

} /* end of module sonic-dns */