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

[minigraph_facts] retrieving dhcp server list from vlan configuration instead of DhcpResources #526

Merged
merged 2 commits into from
Mar 21, 2018
Merged

[minigraph_facts] retrieving dhcp server list from vlan configuration instead of DhcpResources #526

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d196b79
[minigraph_facts] stop getting dhcp server list from DhcpResources
yxieca Mar 20, 2018
92c55f0
[minigraph_facts] Get dhcp server list from Vlan configuration
yxieca Mar 20, 2018
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
16 changes: 8 additions & 8 deletions ansible/library/minigraph_facts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,15 @@ def parse_dpg(dpg, hname):

vlanintfs = child.find(str(QName(ns, "VlanInterfaces")))
vlan_intfs = []
dhcp_servers = []
vlans = {}
for vintf in vlanintfs.findall(str(QName(ns, "VlanInterface"))):
vintfname = vintf.find(str(QName(ns, "Name"))).text
vlanid = vintf.find(str(QName(ns, "VlanID"))).text
vintfmbr = vintf.find(str(QName(ns, "AttachTo"))).text
vmbr_list = vintfmbr.split(';')
vlandhcpservers = vintf.find(str(QName(ns, "DhcpRelays"))).text
dhcp_servers = vlandhcpservers.split(";")
for i, member in enumerate(vmbr_list):
vmbr_list[i] = port_alias_map[member]
ports[port_alias_map[member]] = {'name': port_alias_map[member], 'alias': member}
Expand All @@ -246,7 +249,7 @@ def parse_dpg(dpg, hname):
if acl_intfs:
acls[aclname] = acl_intfs

return intfs, lo_intfs, mgmt_intf, vlans, pcs, acls
return intfs, lo_intfs, mgmt_intf, vlans, pcs, acls, dhcp_servers
return None, None, None, None, None, None

def parse_cpg(cpg, hname):
Expand Down Expand Up @@ -301,7 +304,6 @@ def parse_cpg(cpg, hname):

def parse_meta(meta, hname):
syslog_servers = []
dhcp_servers = []
ntp_servers = []
mgmt_routes = []
deployment_id = None
Expand All @@ -313,17 +315,15 @@ def parse_meta(meta, hname):
name = device_property.find(str(QName(ns1, "Name"))).text
value = device_property.find(str(QName(ns1, "Value"))).text
value_group = value.split(';') if value and value != "" else []
if name == "DhcpResources":
dhcp_servers = value_group
elif name == "NtpResources":
if name == "NtpResources":
ntp_servers = value_group
elif name == "SyslogResources":
syslog_servers = value_group
elif name == "ForcedMgmtRoutes":
mgmt_routes = value_group
elif name == "DeploymentId":
deployment_id = value
return syslog_servers, dhcp_servers, ntp_servers, mgmt_routes, deployment_id
return syslog_servers, ntp_servers, mgmt_routes, deployment_id


def get_console_info(devices, dev, port):
Expand Down Expand Up @@ -496,15 +496,15 @@ def parse_xml(filename, hostname):

for child in root:
if child.tag == str(QName(ns, "DpgDec")):
(intfs, lo_intfs, mgmt_intf, vlans, pcs, acls) = parse_dpg(child, hostname)
(intfs, lo_intfs, mgmt_intf, vlans, pcs, acls, dhcp_servers) = parse_dpg(child, hostname)
elif child.tag == str(QName(ns, "CpgDec")):
(bgp_sessions, bgp_asn, bgp_peers_with_range) = parse_cpg(child, hostname)
elif child.tag == str(QName(ns, "PngDec")):
(neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port) = parse_png(child, hostname)
elif child.tag == str(QName(ns, "UngDec")):
(u_neighbors, u_devices, _, _, _, _) = parse_png(child, hostname)
elif child.tag == str(QName(ns, "MetadataDeclaration")):
(syslog_servers, dhcp_servers, ntp_servers, mgmt_routes, deployment_id) = parse_meta(child, hostname)
(syslog_servers, ntp_servers, mgmt_routes, deployment_id) = parse_meta(child, hostname)

# Create port index map. Since we currently output a mix of NGS names
# and SONiC mapped names, we include both in this map.
Expand Down