@@ -1002,7 +1002,6 @@ def parse_meta(meta, hname):
10021002 dhcp_servers = []
10031003 dhcpv6_servers = []
10041004 ntp_servers = []
1005- dns_nameservers = []
10061005 tacacs_servers = []
10071006 mgmt_routes = []
10081007 erspan_dst = []
@@ -1033,8 +1032,6 @@ def parse_meta(meta, hname):
10331032 dhcp_servers = value_group
10341033 elif name == "NtpResources" :
10351034 ntp_servers = value_group
1036- elif name == "DnsNameserverResources" :
1037- dns_nameservers = value_group
10381035 elif name == "SyslogResources" :
10391036 syslog_servers = value_group
10401037 elif name == "TacacsServer" :
@@ -1073,7 +1070,7 @@ def parse_meta(meta, hname):
10731070 qos_profile = value
10741071 elif name == "RackMgmtMap" :
10751072 rack_mgmt_map = value
1076- 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
1073+ 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
10771074
10781075
10791076def parse_linkmeta (meta , hname ):
@@ -1500,7 +1497,6 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
15001497 dhcp_servers = []
15011498 dhcpv6_servers = []
15021499 ntp_servers = []
1503- dns_nameservers = []
15041500 tacacs_servers = []
15051501 mgmt_routes = []
15061502 erspan_dst = []
@@ -1556,7 +1552,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
15561552 elif child .tag == str (QName (ns , "UngDec" )):
15571553 (u_neighbors , u_devices , _ , _ , _ , _ , _ , _ ) = parse_png (child , hostname , None )
15581554 elif child .tag == str (QName (ns , "MetadataDeclaration" )):
1559- (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 )
1555+ (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 )
15601556 elif child .tag == str (QName (ns , "LinkMetadataDeclaration" )):
15611557 linkmetas = parse_linkmeta (child , hostname )
15621558 elif child .tag == str (QName (ns , "DeviceInfos" )):
@@ -2014,7 +2010,6 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
20142010 results ['DHCP_SERVER' ] = dict ((item , {}) for item in dhcp_servers )
20152011 results ['DHCP_RELAY' ] = dhcp_relay_table
20162012 results ['NTP_SERVER' ] = dict ((item , {}) for item in ntp_servers )
2017- results ['DNS_NAMESERVER' ] = dict ((item , {}) for item in dns_nameservers )
20182013 results ['TACPLUS_SERVER' ] = dict ((item , {'priority' : '1' , 'tcp_port' : '49' }) for item in tacacs_servers )
20192014 if len (acl_table_types ) > 0 :
20202015 results ['ACL_TABLE_TYPE' ] = acl_table_types
0 commit comments