diff --git a/ansible/library/minigraph_facts.py b/ansible/library/minigraph_facts.py index 4629978dd24..28e52e90f64 100644 --- a/ansible/library/minigraph_facts.py +++ b/ansible/library/minigraph_facts.py @@ -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 @@ -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"))): @@ -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 @@ -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)