Skip to content

Commit c77013b

Browse files
ganglyusonic-otn
authored andcommitted
Remove DNS configuration from minigraph schema (sonic-net#15727)
#### Why I did it We should not modify minigraph schema. #### How I did it Update minigraph.py and remove unit test. #### How to verify it Run sonic-config-engine unit test.
1 parent 0403f9b commit c77013b

7 files changed

Lines changed: 2 additions & 45 deletions

File tree

src/sonic-config-engine/minigraph.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,6 @@ def parse_meta(meta, hname):
993993
dhcp_servers = []
994994
dhcpv6_servers = []
995995
ntp_servers = []
996-
dns_nameservers = []
997996
tacacs_servers = []
998997
mgmt_routes = []
999998
erspan_dst = []
@@ -1024,8 +1023,6 @@ def parse_meta(meta, hname):
10241023
dhcp_servers = value_group
10251024
elif name == "NtpResources":
10261025
ntp_servers = value_group
1027-
elif name == "DnsNameserverResources":
1028-
dns_nameservers = value_group
10291026
elif name == "SyslogResources":
10301027
syslog_servers = value_group
10311028
elif name == "TacacsServer":
@@ -1064,7 +1061,7 @@ def parse_meta(meta, hname):
10641061
qos_profile = value
10651062
elif name == "RackMgmtMap":
10661063
rack_mgmt_map = value
1067-
return syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, dns_nameservers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, switch_id, switch_type, max_cores, kube_data, macsec_profile, downstream_redundancy_types, redundancy_type, qos_profile, rack_mgmt_map
1064+
return syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, switch_id, switch_type, max_cores, kube_data, macsec_profile, downstream_redundancy_types, redundancy_type, qos_profile, rack_mgmt_map
10681065

10691066

10701067
def parse_linkmeta(meta, hname):
@@ -1491,7 +1488,6 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
14911488
dhcp_servers = []
14921489
dhcpv6_servers = []
14931490
ntp_servers = []
1494-
dns_nameservers = []
14951491
tacacs_servers = []
14961492
mgmt_routes = []
14971493
erspan_dst = []
@@ -1547,7 +1543,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
15471543
elif child.tag == str(QName(ns, "UngDec")):
15481544
(u_neighbors, u_devices, _, _, _, _, _, _) = parse_png(child, hostname, None)
15491545
elif child.tag == str(QName(ns, "MetadataDeclaration")):
1550-
(syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, dns_nameservers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, switch_id, switch_type, max_cores, kube_data, macsec_profile, downstream_redundancy_types, redundancy_type, qos_profile, rack_mgmt_map) = parse_meta(child, hostname)
1546+
(syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, switch_id, switch_type, max_cores, kube_data, macsec_profile, downstream_redundancy_types, redundancy_type, qos_profile, rack_mgmt_map) = parse_meta(child, hostname)
15511547
elif child.tag == str(QName(ns, "LinkMetadataDeclaration")):
15521548
linkmetas = parse_linkmeta(child, hostname)
15531549
elif child.tag == str(QName(ns, "DeviceInfos")):
@@ -2003,7 +1999,6 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
20031999
results['DHCP_SERVER'] = dict((item, {}) for item in dhcp_servers)
20042000
results['DHCP_RELAY'] = dhcp_relay_table
20052001
results['NTP_SERVER'] = dict((item, {}) for item in ntp_servers)
2006-
results['DNS_NAMESERVER'] = dict((item, {}) for item in dns_nameservers)
20072002
results['TACPLUS_SERVER'] = dict((item, {'priority': '1', 'tcp_port': '49'}) for item in tacacs_servers)
20082003
if len(acl_table_types) > 0:
20092004
results['ACL_TABLE_TYPE'] = acl_table_types

src/sonic-config-engine/tests/multi_npu_data/sample-minigraph.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,11 +1425,6 @@
14251425
<a:Reference i:nil="true"/>
14261426
<a:Value>17.39.1.129;17.39.1.130</a:Value>
14271427
</a:DeviceProperty>
1428-
<a:DeviceProperty>
1429-
<a:Name>DnsNameserverResources</a:Name>
1430-
<a:Reference i:nil="true"/>
1431-
<a:Value>1.1.1.1;8.8.8.8</a:Value>
1432-
</a:DeviceProperty>
14331428
<a:DeviceProperty>
14341429
<a:Name>SnmpResources</a:Name>
14351430
<a:Reference i:nil="true"/>

src/sonic-config-engine/tests/simple-sample-graph-case.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -500,12 +500,6 @@
500500
10.0.10.1;10.0.10.2
501501
</a:Value>
502502
</a:DeviceProperty>
503-
<a:DeviceProperty>
504-
<a:Name>DnsNameserverResources</a:Name>
505-
<a:Value>
506-
1.1.1.1;8.8.8.8
507-
</a:Value>
508-
</a:DeviceProperty>
509503
<a:DeviceProperty>
510504
<a:Name>SnmpResources</a:Name>
511505
<a:Value>

src/sonic-config-engine/tests/simple-sample-graph-metadata.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,6 @@
236236
10.0.10.1;10.0.10.2
237237
</a:Value>
238238
</a:DeviceProperty>
239-
<a:DeviceProperty>
240-
<a:Name>DnsNameserverResources</a:Name>
241-
<a:Value>
242-
20.2.2.2;30.3.3.3
243-
</a:Value>
244-
</a:DeviceProperty>
245239
<a:DeviceProperty>
246240
<a:Name>SnmpResources</a:Name>
247241
<a:Value>

src/sonic-config-engine/tests/test_cfggen.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -696,11 +696,6 @@ def test_metadata_ntp(self):
696696
output = self.run_script(argument)
697697
self.assertEqual(utils.to_dict(output.strip()), utils.to_dict("{'10.0.10.1': {}, '10.0.10.2': {}}"))
698698

699-
def test_metadata_dns_nameserver(self):
700-
argument = ['-m', self.sample_graph_metadata, '-p', self.port_config, '-v', "DNS_NAMESERVER"]
701-
output = self.run_script(argument)
702-
self.assertEqual(utils.to_dict(output.strip()), utils.to_dict("{'20.2.2.2': {}, '30.3.3.3': {}}"))
703-
704699
def test_minigraph_vnet(self, **kwargs):
705700
graph_file = kwargs.get('graph_file', self.sample_graph_simple)
706701
argument = ['-m', graph_file, '-p', self.port_config, '-v', "VNET"]

src/sonic-config-engine/tests/test_minigraph_case.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -277,11 +277,6 @@ def test_metadata_ntp(self):
277277
output = self.run_script(argument)
278278
self.assertEqual(output.strip(), "{'10.0.10.1': {}, '10.0.10.2': {}}")
279279

280-
def test_metadata_dns_nameserver(self):
281-
argument = ['-m', self.sample_graph, '-p', self.port_config, '-v', "DNS_NAMESERVER"]
282-
output = self.run_script(argument)
283-
self.assertEqual(output.strip(), "{'1.1.1.1': {}, '8.8.8.8': {}}")
284-
285280
def test_minigraph_vnet(self):
286281
argument = ['-m', self.sample_graph, '-p', self.port_config, '-v', "VNET"]
287282
output = self.run_script(argument)

src/sonic-config-engine/tests/test_multinpu_cfggen.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -150,17 +150,6 @@ def test_metadata_ntp(self):
150150
print("Log:asic{} sku {}".format(asic,output))
151151
self.assertDictEqual(output, {})
152152

153-
def test_metadata_dns_nameserver(self):
154-
argument = ['-m', self.sample_graph, '-p', self.sample_port_config, '--var-json', "DNS_NAMESERVER"]
155-
output = json.loads(self.run_script(argument))
156-
self.assertDictEqual(output, {'1.1.1.1': {}, '8.8.8.8': {}})
157-
#DNS_NAMESERVER data is present only in the host config
158-
argument = ['-m', self.sample_graph, '--var-json', "DNS_NAMESERVER"]
159-
for asic in range(NUM_ASIC):
160-
output = json.loads(self.run_script_for_asic(argument, asic, self.port_config[asic]))
161-
print("Log:asic{} sku {}".format(asic,output))
162-
self.assertDictEqual(output, {})
163-
164153
def test_mgmt_port(self):
165154
argument = ['-m', self.sample_graph, '-p', self.sample_port_config, '--var-json', "MGMT_PORT"]
166155
output = json.loads(self.run_script(argument))

0 commit comments

Comments
 (0)