[Buffer] Added cable length config to buffer config template for EdgeZoneAggregator (#14280)
Why I did it SONiC currently does not identify 'EdgeZoneAggregator' neighbor. As a result, the buffer profile attached to those interfaces uses the default cable length which could cause ingress packet drops due to insufficient headroom. Hence, there is a need to update the buffer templates to identify such neighbors and assign the same cable length as used by the T1. How I did it Modified the buffer template to identify EdgeZoneAggregator as a neighbor device type and assign it the same cable length as a T1/leaf router. How to verify it Unit tests pass, and manually checked on a 7260 to see the changes take effect. Signed-off-by: dojha <devojha@microsoft.com>
This commit is contained in:
Dev Ojha
GitHub
parent
96817c4357
commit
de17f72d9a
@ -53,6 +53,9 @@ def
|
||||
{%- if DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] %}
|
||||
{%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] %}
|
||||
{%- set neighbor_role = neighbor.type %}
|
||||
{%- if 'edgezoneaggregator' == neighbor_role | lower %}
|
||||
{%- set neighbor_role = 'LeafRouter' %}
|
||||
{%- endif %}
|
||||
{%- if 'asic' == neighbor_role | lower %}
|
||||
{%- set roles1 = 'internal' %}
|
||||
{%- if 'internal' not in ports2cable %}
|
||||
|
||||
1048
src/sonic-config-engine/tests/sample-arista-7060-t0-minigraph.xml
Normal file
1048
src/sonic-config-engine/tests/sample-arista-7060-t0-minigraph.xml
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,440 @@
|
||||
{
|
||||
"CABLE_LENGTH": {
|
||||
"AZURE": {
|
||||
"Ethernet8": "5m",
|
||||
"Ethernet2": "5m",
|
||||
"Ethernet0": "5m",
|
||||
"Ethernet6": "5m",
|
||||
"Ethernet4": "5m",
|
||||
"Ethernet108": "5m",
|
||||
"Ethernet100": "5m",
|
||||
"Ethernet104": "5m",
|
||||
"Ethernet106": "5m",
|
||||
"Ethernet58": "5m",
|
||||
"Ethernet126": "5m",
|
||||
"Ethernet96": "5m",
|
||||
"Ethernet124": "40m",
|
||||
"Ethernet122": "5m",
|
||||
"Ethernet92": "5m",
|
||||
"Ethernet120": "40m",
|
||||
"Ethernet50": "5m",
|
||||
"Ethernet52": "5m",
|
||||
"Ethernet54": "5m",
|
||||
"Ethernet56": "5m",
|
||||
"Ethernet76": "5m",
|
||||
"Ethernet74": "5m",
|
||||
"Ethernet18": "5m",
|
||||
"Ethernet70": "5m",
|
||||
"Ethernet32": "5m",
|
||||
"Ethernet72": "5m",
|
||||
"Ethernet16": "5m",
|
||||
"Ethernet36": "5m",
|
||||
"Ethernet78": "5m",
|
||||
"Ethernet60": "5m",
|
||||
"Ethernet28": "5m",
|
||||
"Ethernet62": "5m",
|
||||
"Ethernet14": "5m",
|
||||
"Ethernet88": "5m",
|
||||
"Ethernet118": "5m",
|
||||
"Ethernet24": "5m",
|
||||
"Ethernet116": "40m",
|
||||
"Ethernet82": "5m",
|
||||
"Ethernet114": "5m",
|
||||
"Ethernet80": "5m",
|
||||
"Ethernet112": "40m",
|
||||
"Ethernet86": "5m",
|
||||
"Ethernet110": "5m",
|
||||
"Ethernet84": "5m",
|
||||
"Ethernet48": "5m",
|
||||
"Ethernet10": "5m",
|
||||
"Ethernet44": "5m",
|
||||
"Ethernet42": "5m",
|
||||
"Ethernet40": "5m",
|
||||
"Ethernet64": "5m",
|
||||
"Ethernet66": "5m",
|
||||
"Ethernet12": "5m",
|
||||
"Ethernet46": "5m",
|
||||
"Ethernet20": "5m",
|
||||
"Ethernet22": "5m",
|
||||
"Ethernet68": "5m"
|
||||
}
|
||||
},
|
||||
|
||||
"BUFFER_POOL": {
|
||||
"ingress_lossless_pool": {
|
||||
"size": "10875072",
|
||||
"type": "ingress",
|
||||
"mode": "dynamic",
|
||||
"xoff": "4194112"
|
||||
},
|
||||
"egress_lossy_pool": {
|
||||
"size": "9243812",
|
||||
"type": "egress",
|
||||
"mode": "dynamic"
|
||||
},
|
||||
"egress_lossless_pool": {
|
||||
"size": "15982720",
|
||||
"type": "egress",
|
||||
"mode": "static"
|
||||
}
|
||||
},
|
||||
"BUFFER_PROFILE": {
|
||||
"ingress_lossy_profile": {
|
||||
"pool":"ingress_lossless_pool",
|
||||
"size":"0",
|
||||
"dynamic_th":"3"
|
||||
},
|
||||
"egress_lossless_profile": {
|
||||
"pool":"egress_lossless_pool",
|
||||
"size":"1518",
|
||||
"static_th":"15982720"
|
||||
},
|
||||
"egress_lossy_profile": {
|
||||
"pool":"egress_lossy_pool",
|
||||
"size":"1518",
|
||||
"dynamic_th":"3"
|
||||
}
|
||||
},
|
||||
|
||||
"BUFFER_PG": {
|
||||
"Ethernet8|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet4|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet68|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet96|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet124|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet92|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet120|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet52|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet56|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet76|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet72|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet32|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet16|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet36|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet12|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet28|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet88|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet116|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet80|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet112|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet84|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet48|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet44|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet40|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet64|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet60|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet20|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet24|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
}
|
||||
},
|
||||
|
||||
"BUFFER_QUEUE": {
|
||||
"Ethernet8|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet4|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet68|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet96|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet124|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet92|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet120|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet52|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet56|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet76|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet72|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet32|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet16|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet36|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet12|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet28|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet88|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet116|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet80|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet112|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet84|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet48|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet44|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet40|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet64|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet60|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet20|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet24|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet8|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet4|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet68|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet96|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet124|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet92|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet120|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet52|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet56|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet76|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet72|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet32|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet16|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet36|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet12|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet28|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet88|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet116|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet80|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet112|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet84|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet48|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet44|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet40|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet64|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet60|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet20|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet24|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet8|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet4|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet68|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet96|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet124|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet92|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet120|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet52|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet56|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet76|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet72|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet32|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet16|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet36|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet12|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet28|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet88|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet116|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet80|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet112|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet84|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet48|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet44|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet40|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet64|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet60|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet20|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet24|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,440 @@
|
||||
{
|
||||
"CABLE_LENGTH": {
|
||||
"AZURE": {
|
||||
"Ethernet8": "5m",
|
||||
"Ethernet2": "5m",
|
||||
"Ethernet0": "5m",
|
||||
"Ethernet6": "5m",
|
||||
"Ethernet4": "5m",
|
||||
"Ethernet108": "5m",
|
||||
"Ethernet100": "5m",
|
||||
"Ethernet104": "5m",
|
||||
"Ethernet106": "5m",
|
||||
"Ethernet58": "5m",
|
||||
"Ethernet126": "5m",
|
||||
"Ethernet96": "5m",
|
||||
"Ethernet124": "40m",
|
||||
"Ethernet122": "5m",
|
||||
"Ethernet92": "5m",
|
||||
"Ethernet120": "40m",
|
||||
"Ethernet50": "5m",
|
||||
"Ethernet52": "5m",
|
||||
"Ethernet54": "5m",
|
||||
"Ethernet56": "5m",
|
||||
"Ethernet76": "5m",
|
||||
"Ethernet74": "5m",
|
||||
"Ethernet18": "5m",
|
||||
"Ethernet70": "5m",
|
||||
"Ethernet32": "5m",
|
||||
"Ethernet72": "5m",
|
||||
"Ethernet16": "5m",
|
||||
"Ethernet36": "5m",
|
||||
"Ethernet78": "5m",
|
||||
"Ethernet60": "5m",
|
||||
"Ethernet28": "5m",
|
||||
"Ethernet62": "5m",
|
||||
"Ethernet14": "5m",
|
||||
"Ethernet88": "5m",
|
||||
"Ethernet118": "5m",
|
||||
"Ethernet24": "5m",
|
||||
"Ethernet116": "40m",
|
||||
"Ethernet82": "5m",
|
||||
"Ethernet114": "5m",
|
||||
"Ethernet80": "5m",
|
||||
"Ethernet112": "40m",
|
||||
"Ethernet86": "5m",
|
||||
"Ethernet110": "5m",
|
||||
"Ethernet84": "5m",
|
||||
"Ethernet48": "5m",
|
||||
"Ethernet10": "5m",
|
||||
"Ethernet44": "5m",
|
||||
"Ethernet42": "5m",
|
||||
"Ethernet40": "5m",
|
||||
"Ethernet64": "5m",
|
||||
"Ethernet66": "5m",
|
||||
"Ethernet12": "5m",
|
||||
"Ethernet46": "5m",
|
||||
"Ethernet20": "5m",
|
||||
"Ethernet22": "5m",
|
||||
"Ethernet68": "5m"
|
||||
}
|
||||
},
|
||||
|
||||
"BUFFER_POOL": {
|
||||
"ingress_lossless_pool": {
|
||||
"size": "10875072",
|
||||
"type": "ingress",
|
||||
"mode": "dynamic",
|
||||
"xoff": "4194112"
|
||||
},
|
||||
"egress_lossy_pool": {
|
||||
"size": "9243812",
|
||||
"type": "egress",
|
||||
"mode": "dynamic"
|
||||
},
|
||||
"egress_lossless_pool": {
|
||||
"size": "15982720",
|
||||
"type": "egress",
|
||||
"mode": "static"
|
||||
}
|
||||
},
|
||||
"BUFFER_PROFILE": {
|
||||
"ingress_lossy_profile": {
|
||||
"pool":"ingress_lossless_pool",
|
||||
"size":"0",
|
||||
"dynamic_th":"3"
|
||||
},
|
||||
"egress_lossless_profile": {
|
||||
"pool":"egress_lossless_pool",
|
||||
"size":"1518",
|
||||
"static_th":"15982720"
|
||||
},
|
||||
"egress_lossy_profile": {
|
||||
"pool":"egress_lossy_pool",
|
||||
"size":"1518",
|
||||
"dynamic_th":"3"
|
||||
}
|
||||
},
|
||||
|
||||
"BUFFER_PG": {
|
||||
"Ethernet8|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet4|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet68|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet96|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet124|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet92|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet120|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet52|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet56|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet76|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet72|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet32|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet16|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet36|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet12|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet28|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet88|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet116|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet80|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet112|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet84|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet48|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet44|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet40|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet64|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet60|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet20|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
},
|
||||
"Ethernet24|0": {
|
||||
"profile" : "ingress_lossy_profile"
|
||||
}
|
||||
},
|
||||
|
||||
"BUFFER_QUEUE": {
|
||||
"Ethernet8|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet4|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet68|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet96|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet124|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet92|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet120|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet52|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet56|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet76|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet72|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet32|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet16|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet36|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet12|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet28|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet88|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet116|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet80|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet112|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet84|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet48|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet44|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet40|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet64|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet60|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet20|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet24|3-4": {
|
||||
"profile" : "egress_lossless_profile"
|
||||
},
|
||||
"Ethernet8|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet4|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet68|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet96|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet124|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet92|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet120|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet52|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet56|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet76|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet72|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet32|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet16|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet36|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet12|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet28|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet88|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet116|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet80|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet112|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet84|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet48|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet44|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet40|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet64|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet60|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet20|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet24|0-2": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet8|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet4|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet68|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet96|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet124|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet92|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet120|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet52|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet56|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet76|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet72|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet32|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet16|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet36|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet12|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet28|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet88|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet116|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet80|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet112|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet84|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet48|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet44|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet40|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet64|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet60|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet20|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
},
|
||||
"Ethernet24|5-6": {
|
||||
"profile" : "egress_lossy_profile"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -139,7 +139,7 @@ class TestJ2Files(TestCase):
|
||||
self.run_script(argument, output_file=self.output_file)
|
||||
self.assertTrue(utils.cmp(os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, 'mvrf_interfaces_nomgmt'), self.output_file))
|
||||
|
||||
|
||||
|
||||
def test_ports_json(self):
|
||||
ports_template = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-orchagent', 'ports.json.j2')
|
||||
argument = ['-m', self.simple_minigraph, '-p', self.t0_port_config, '-t', ports_template]
|
||||
@ -223,7 +223,7 @@ class TestJ2Files(TestCase):
|
||||
output_json = json.loads(output)
|
||||
|
||||
self.assertTrue(json.dumps(sample_output_json, sort_keys=True) == json.dumps(output_json, sort_keys=True))
|
||||
|
||||
|
||||
def test_l1_ports_template(self):
|
||||
argument = ['-k', '32x1000Gb', '--preset', 'l1', '-p', self.l1_l3_port_config]
|
||||
output = self.run_script(argument)
|
||||
@ -345,7 +345,7 @@ class TestJ2Files(TestCase):
|
||||
# cleanup
|
||||
qos_config_file_new = os.path.join(dir_path, 'qos_config.j2')
|
||||
os.remove(qos_config_file_new)
|
||||
|
||||
|
||||
self.remove_machine_conf(file_exist, dir_exist)
|
||||
|
||||
sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, expected)
|
||||
@ -529,7 +529,7 @@ class TestJ2Files(TestCase):
|
||||
ipinip_file = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-orchagent', 'ipinip.json.j2')
|
||||
argument = ['-m', self.multi_asic_minigraph, '-p', self.multi_asic_port_config, '-t', ipinip_file, '-n', 'asic0']
|
||||
print(argument)
|
||||
self.run_script(argument, output_file=self.output_file)
|
||||
self.run_script(argument, output_file=self.output_file)
|
||||
sample_output_file = os.path.join(self.test_dir, 'multi_npu_data', utils.PYvX_DIR, 'ipinip.json')
|
||||
assert utils.cmp(sample_output_file, self.output_file), self.run_diff(sample_output_file, self.output_file)
|
||||
|
||||
@ -636,6 +636,11 @@ class TestJ2Files(TestCase):
|
||||
self.run_script(argument, output_file=self.output_file)
|
||||
assert utils.cmp(sample_output_file, self.output_file), self.run_diff(sample_output_file, self.output_file)
|
||||
|
||||
|
||||
def test_buffers_edgezone_aggregator_render_template(self):
|
||||
self._test_buffers_render_template('arista', 'x86_64-arista_7060_cx32s', 'Arista-7060CX-32S-D48C8', 'sample-arista-7060-t0-minigraph.xml', 'buffers.json.j2', 'buffer-arista7060-t0.json')
|
||||
|
||||
|
||||
def tearDown(self):
|
||||
os.environ["CFGGEN_UNIT_TESTING"] = ""
|
||||
try:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user