matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[sonic-cfggen]: Fix minigraph DhcpRelays parsing issue (#2154)

Browse Source 
* Check that we have dhcprelays text before using it

* Add additional variable to avoid extracting node again and again
This commit is contained in:
pavel-shirshov 2018-10-15 18:28:58 -07:00 committed by GitHub
parent e2ffb589ed
commit bcea4b3fa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sonic-config-engine/minigraph.py
View File

@ -211,8 +211,9 @@ def parse_dpg(dpg, hname):
# If this VLAN requires a DHCP relay agent, it will contain a <DhcpRelays> element # If this VLAN requires a DHCP relay agent, it will contain a <DhcpRelays> element
# containing a list of DHCP server IPs # containing a list of DHCP server IPs
if vintf.find(str(QName(ns, "DhcpRelays"))) is not None: vintf_node = vintf.find(str(QName(ns, "DhcpRelays")))
vintfdhcpservers = vintf.find(str(QName(ns, "DhcpRelays"))).text if vintf_node is not None and vintf_node.text is not None:
vintfdhcpservers = vintf_node.text
vdhcpserver_list = vintfdhcpservers.split(';') vdhcpserver_list = vintfdhcpservers.split(';')
vlan_attributes['dhcp_servers'] = vdhcpserver_list vlan_attributes['dhcp_servers'] = vdhcpserver_list