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

[minigraph.py]: Prefer parsing device type from <ElementType> (#6184)

Browse Source 
* Parse device type from <ElementType> first in <PngDec>
* Fall back to <Device> type attribute if no <ElementType> is found

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
This commit is contained in:
Lawrence Lee 2020-12-15 10:20:44 -08:00 committed by GitHub
parent a6aaffd2ad
commit 290f66bbb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,8 +83,6 @@ def parse_device(device):
hwsku = None hwsku = None
name = None name = None
deployment_id = None deployment_id = None
if str(QName(ns3, "type")) in device.attrib:
d_type = device.attrib[str(QName(ns3, "type"))]
for node in device: for node in device:
if node.tag == str(QName(ns, "Address")): if node.tag == str(QName(ns, "Address")):
@ -99,6 +97,12 @@ def parse_device(device):
hwsku = node.text hwsku = node.text
elif node.tag == str(QName(ns, "DeploymentId")): elif node.tag == str(QName(ns, "DeploymentId")):
deployment_id = node.text deployment_id = node.text
elif node.tag == str(QName(ns, "ElementType")):
d_type = node.text
if d_type is None and str(QName(ns3, "type")) in device.attrib:
d_type = device.attrib[str(QName(ns3, "type"))]
return (lo_prefix, lo_prefix_v6, mgmt_prefix, name, hwsku, d_type, deployment_id) return (lo_prefix, lo_prefix_v6, mgmt_prefix, name, hwsku, d_type, deployment_id)
def parse_png(png, hname): def parse_png(png, hname):

3
src/sonic-config-engine/tests/simple-sample-graph-case.xml
View File

@ -266,7 +266,8 @@
</DeviceLinkBase> </DeviceLinkBase>
</DeviceInterfaceLinks> </DeviceInterfaceLinks>
<Devices> <Devices>
<Device i:type="ToRRouter"> <Device xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution" i:type="a:ToRRouter">
<ElementType>ToRRouter</ElementType>
<Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux"> <Address xmlns:d5p1="Microsoft.Search.Autopilot.NetMux">
<d5p1:IPPrefix>26.1.1.10/32</d5p1:IPPrefix> <d5p1:IPPrefix>26.1.1.10/32</d5p1:IPPrefix>
</Address> </Address>