Skip to content

Make the minigraph_facts module backward compatible #2597

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

Merged
wangxin merged 1 commit into from
Dec 1, 2020
Merged

Make the minigraph_facts module backward compatible #2597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions ansible/library/minigraph_facts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import ipaddr as ipaddress
from collections import defaultdict
from natsort import natsorted
from sonic_py_common import multi_asic

from lxml import etree as ET
from lxml.etree import QName
Expand Down Expand Up @@ -61,7 +60,12 @@ def parse_png(png, hname):
console_port = ''
mgmt_dev = ''
mgmt_port = ''
namespace_list = multi_asic.get_namespace_list()
try:
from sonic_py_common import multi_asic
namespace_list = multi_asic.get_namespace_list()
except ImportError:
namespace_list = ['']

for child in png:
if child.tag == str(QName(ns, "DeviceInterfaceLinks")):
for link in child.findall(str(QName(ns, "DeviceLinkBase"))):
Expand Down Expand Up @@ -165,7 +169,7 @@ def parse_dpg(dpg, hname):
else:
intf['mask'] = str(prefix_len)
intf.update({'attachto': intfname, 'prefixlen': int(prefix_len)})

# TODO: remove peer_addr after dependency removed
ipaddr_val = int(ipn.ip)
peer_addr_val = None
Expand All @@ -179,7 +183,7 @@ def parse_dpg(dpg, hname):
peer_addr_val = ipaddr_val + 1
else:
peer_addr_val = ipaddr_val - 1

if peer_addr_val is not None:
intf['peer_addr'] = ipaddress.IPAddress(peer_addr_val)
intfs.append(intf)
Expand Down