add dns nameservers to config

Author: iljarotar

configdb/configdb.go

@@ -16,8 +16,9 @@ type ConfigDB struct {
 	ACLTables          map[string]ACLTable       `json:"ACL_TABLE,omitempty"`
 	Breakouts          map[string]BreakoutConfig `json:"BREAKOUT_CFG,omitempty"`
 	DeviceMetadata     `json:"DEVICE_METADATA"`
-	Features           map[string]Feature   `json:"FEATURE,omitempty"`
-	Interfaces         map[string]Interface `json:"INTERFACE,omitempty"`
+	DNSNameservers     map[string]DNSNameserver `json:"DNS_NAMESERVER,omitempty"`
+	Features           map[string]Feature       `json:"FEATURE,omitempty"`
+	Interfaces         map[string]Interface     `json:"INTERFACE,omitempty"`
 	LLDP               `json:"LLDP"`
 	LoopbackInterface  map[string]struct{}       `json:"LOOPBACK_INTERFACE,omitempty"`
 	MCLAGDomains       map[string]MCLAGDomain    `json:"MCLAG_DOMAIN,omitempty"`
@@ -59,6 +60,7 @@ func GenerateConfigDB(input *values.Values, platform *p.Platform, currentDeviceM
 		ACLTables:      tables,
 		Breakouts:      breakouts,
 		DeviceMetadata: *deviceMetadata,
+		DNSNameservers: getDNSNameservers(input.Nameservers),
 		Features: map[string]Feature{
 			"dhcp_relay": {
 				AutoRestart: FeatureModeEnabled,
@@ -207,6 +209,14 @@ func getDeviceMetadata(input *values.Values, currentMetadata DeviceMetadata) (*D
 	}, nil
 }
 
+func getDNSNameservers(nameservers []string) map[string]DNSNameserver {
+	dnsNameservers := make(map[string]DNSNameserver)
+	for _, n := range nameservers {
+		dnsNameservers[n] = DNSNameserver{}
+	}
+	return dnsNameservers
+}
+
 func getInterfaces(ports []values.Port, bgpPorts []string) map[string]Interface {
 	interfaces := make(map[string]Interface)
 

configdb/fields.go

@@ -36,6 +36,8 @@ type DeviceMetadata struct {
 	Localhost Metadata `json:"localhost"`
 }
 
+type DNSNameserver struct{}
+
 type DockerRoutingConfigMode string
 
 const (

tests/1/expected.json

@@ -148,6 +148,10 @@
       "type": "LeafRouter"
     }
   },
+  "DNS_NAMESERVER": {
+    "1.1.1.1": {},
+    "8.8.8.8": {}
+  },
   "FEATURE": {
     "dhcp_relay": {
       "auto_restart": "enabled",

tests/1/sonic-config.yaml

@@ -33,6 +33,10 @@ mgmtif_gateway: 10.7.10.1
 mgmtif_ip: 10.7.10.2
 mgmt_vrf: false
 
+nameservers:
+  - 1.1.1.1
+  - 8.8.8.8
+
 ntpservers:
   - 0.europe.pool.ntp.org
   - 1.europe.pool.ntp.org

tests/2/expected.json

@@ -148,6 +148,10 @@
       "type": "LeafRouter"
     }
   },
+  "DNS_NAMESERVER": {
+    "1.1.1.1": {},
+    "8.8.8.8": {}
+  },
   "FEATURE": {
     "dhcp_relay": {
       "auto_restart": "enabled",

tests/2/sonic-config.yaml

@@ -16,6 +16,10 @@ mgmtif_gateway: 10.7.10.1
 mgmtif_ip: 10.7.10.2
 mgmt_vrf: false
 
+nameservers:
+  - 1.1.1.1
+  - 8.8.8.8
+
 ntpservers:
   - 0.europe.pool.ntp.org
   - 1.europe.pool.ntp.org

tests/3/expected.json

@@ -214,6 +214,10 @@
       "type": "LeafRouter"
     }
   },
+  "DNS_NAMESERVER": {
+    "1.1.1.1": {},
+    "8.8.8.8": {}
+  },
   "FEATURE": {
     "dhcp_relay": {
       "auto_restart": "enabled",

tests/3/sonic-config.yaml

@@ -34,6 +34,10 @@ mgmtif_gateway: 10.7.10.1
 mgmtif_ip: 10.7.10.2
 mgmt_vrf: false
 
+nameservers:
+  - 1.1.1.1
+  - 8.8.8.8
+
 ntpservers:
   - 0.europe.pool.ntp.org
   - 1.europe.pool.ntp.org

values/values.go

@@ -64,6 +64,7 @@ type Values struct {
 	MgmtIfGateway           string                  `yaml:"mgmtif_gateway,omitempty"`
 	MgmtIfIP                string                  `yaml:"mgmtif_ip,omitempty"`
 	MgmtVRF                 bool                    `yaml:"mgmt_vrf,omitempty"`
+	Nameservers             []string                `yaml:"nameservers,omitempty"`
 	NTPServers              []string                `yaml:"ntpservers,omitempty"`
 	PortChannels            []PortChannel           `yaml:"portchannels,omitempty"`
 	PortChannelsDefaultMTU  int                     `yaml:"portchannels_default_mtu,omitempty"`