From c7ad1d2bad4c2291cf7d12f988cac4278fac2aa1 Mon Sep 17 00:00:00 2001 From: bingwang Date: Thu, 7 Apr 2022 03:52:13 -0700 Subject: [PATCH 01/15] Add extra lossless queues Signed-off-by: bingwang --- .../Arista-7050CX3-32S-C32/buffers.json.j2 | 3 +- .../Arista-7050CX3-32S-D48C8/buffers.json.j2 | 39 + .../Arista-7260CX3-C64/buffers.json.j2 | 40 + .../Arista-7260CX3-D108C8/buffers.json.j2 | 4 +- .../Arista-7260CX3-Q64/buffers.json.j2 | 4 +- files/build_templates/buffers_config.j2 | 10 + .../py3/buffer-arista7050cx3-dualtor.json | 537 ++++++++++ .../py3/buffer-arista7260-dualtor.json | 987 ++++++++++++++++++ .../py3/buffer-arista7260-t1.json | 571 ++++++++++ src/sonic-config-engine/tests/test_j2files.py | 20 + 10 files changed, 2207 insertions(+), 8 deletions(-) mode change 100644 => 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 mode change 100644 => 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 mode change 100644 => 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 deleted file mode 100644 index 1083a6210fc9..000000000000 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 +++ /dev/null @@ -1,2 +0,0 @@ -{%- set default_topo = 't0' %} -{%- include 'buffers_config.j2' %} diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 new file mode 120000 index 000000000000..3ad16ba265d9 --- /dev/null +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 @@ -0,0 +1 @@ +../Arista-7050CX3-32S-D48C8/buffers.json.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 index 1083a6210fc9..8aa696c1a978 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 @@ -1,2 +1,41 @@ {%- set default_topo = 't0' %} + +{% if DEVICE_METADATA is defined and 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} +{%- macro generate_extra_lossless_buffers(port_names, port_names_require_extra_buffer) %} + "BUFFER_QUEUE": { +{% for port in port_names %} +{% if port in port_names_require_extra_buffer %} + "{{ port }}|0-1": { + "profile" : "egress_lossy_profile" + }, + "{{ port }}|2-4": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|5": { + "profile" : "egress_lossy_profile" + }, + "{{ port }}|6": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|7": { + "profile" : "egress_lossy_profile" + }{% if not loop.last %},{% endif %} + +{% else %} + "{{ port }}|0-2": { + "profile" : "egress_lossy_profile" + }, + "{{ port }}|3-4": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|5-7": { + "profile" : "egress_lossy_profile" + }{% if not loop.last %},{% endif %} + +{% endif %} +{% endfor %} + } +{% endmacro %} +{% endif %} + {%- include 'buffers_config.j2' %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2 index b67cf577ab75..37308650fe19 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2 @@ -1,3 +1,43 @@ {%- set default_topo = 't1' %} + +{% if DEVICE_METADATA is defined and 'type' in DEVICE_METADATA['localhost'] and +(DEVICE_METADATA['localhost']['type'] == 'LeafRouter' or DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %} +{%- macro generate_extra_lossless_buffers(port_names, port_names_require_extra_buffer) %} + "BUFFER_QUEUE": { +{% for port in port_names %} +{% if port in port_names_require_extra_buffer %} + "{{ port }}|0-1": { + "profile" : "egress_lossy_profile" + }, + "{{ port }}|2-4": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|5": { + "profile" : "egress_lossy_profile" + }, + "{{ port }}|6": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|7": { + "profile" : "egress_lossy_profile" + }{% if not loop.last %},{% endif %} + +{% else %} + "{{ port }}|0-2": { + "profile" : "egress_lossy_profile" + }, + "{{ port }}|3-4": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|5-7": { + "profile" : "egress_lossy_profile" + }{% if not loop.last %},{% endif %} + +{% endif %} +{% endfor %} + } +{% endmacro %} +{% endif %} + {%- include 'buffers_config.j2' %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 deleted file mode 100644 index e6e9e844469b..000000000000 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 +++ /dev/null @@ -1,3 +0,0 @@ -{%- set default_topo = 't0' %} -{%- include 'buffers_config.j2' %} - diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 new file mode 120000 index 000000000000..8bb64856b782 --- /dev/null +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 @@ -0,0 +1 @@ +../Arista-7260CX3-C64/buffers.json.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 deleted file mode 100644 index b67cf577ab75..000000000000 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 +++ /dev/null @@ -1,3 +0,0 @@ -{%- set default_topo = 't1' %} -{%- include 'buffers_config.j2' %} - diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 new file mode 120000 index 000000000000..8bb64856b782 --- /dev/null +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 @@ -0,0 +1 @@ +../Arista-7260CX3-C64/buffers.json.j2 \ No newline at end of file diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index a67316af5f3d..94c7c23238d5 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -128,6 +128,14 @@ def {%- endfor %} {%- set port_names_active = port_names_list_active | join(',') %} +{%- set port_names_list_extra_queues = [] %} +{%- for port in PORT_ACTIVE %} + {% if (generate_extra_lossless_buffers is defined) and ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'ToRRouter') or + ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'LeafRouter') %} + {%- if port_names_list_extra_queues.append(port) %}{%- endif %} + {% endif %} +{%- endfor %} + {%- set port_names_list_inactive = [] %} {%- for port in PORT_INACTIVE %} {%- if port_names_list_inactive.append(port) %}{%- endif %} @@ -182,6 +190,8 @@ def {{ defs.generate_queue_buffers(port_names_active) }} {% elif defs.generate_queue_buffers_with_inactive_ports is defined %} {{ defs.generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) }} +{% elif generate_extra_lossless_buffers is defined %} +{{ generate_extra_lossless_buffers(port_names_list_active, port_names_list_extra_queues) }} {% else %} "BUFFER_QUEUE": { {% for port in PORT_ACTIVE %} diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json new file mode 100644 index 000000000000..212e6a0db7f4 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json @@ -0,0 +1,537 @@ + + { + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "300m", + "Ethernet2": "300m", + "Ethernet4": "300m", + "Ethernet6": "300m", + "Ethernet8": "300m", + "Ethernet10": "300m", + "Ethernet12": "300m", + "Ethernet14": "300m", + "Ethernet16": "300m", + "Ethernet18": "300m", + "Ethernet20": "300m", + "Ethernet22": "300m", + "Ethernet24": "300m", + "Ethernet28": "300m", + "Ethernet32": "300m", + "Ethernet36": "300m", + "Ethernet40": "300m", + "Ethernet42": "300m", + "Ethernet44": "300m", + "Ethernet46": "300m", + "Ethernet48": "300m", + "Ethernet50": "300m", + "Ethernet52": "300m", + "Ethernet54": "300m", + "Ethernet56": "300m", + "Ethernet58": "300m", + "Ethernet60": "300m", + "Ethernet62": "300m", + "Ethernet64": "300m", + "Ethernet66": "300m", + "Ethernet68": "300m", + "Ethernet70": "300m", + "Ethernet72": "300m", + "Ethernet74": "300m", + "Ethernet76": "300m", + "Ethernet78": "300m", + "Ethernet80": "300m", + "Ethernet82": "300m", + "Ethernet84": "300m", + "Ethernet86": "300m", + "Ethernet88": "300m", + "Ethernet92": "300m", + "Ethernet96": "300m", + "Ethernet100": "300m", + "Ethernet104": "300m", + "Ethernet106": "300m", + "Ethernet108": "300m", + "Ethernet110": "300m", + "Ethernet112": "300m", + "Ethernet114": "300m", + "Ethernet116": "300m", + "Ethernet118": "300m", + "Ethernet120": "300m", + "Ethernet122": "300m", + "Ethernet124": "300m", + "Ethernet126": "300m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "32669440", + "type": "ingress", + "mode": "dynamic", + "xoff": "2058240" + }, + "egress_lossy_pool": { + "size": "24192256", + "type": "egress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "32340992", + "type": "egress", + "mode": "static" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"0", + "static_th":"32340992" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1792", + "dynamic_th":"-1" + } + }, + "BUFFER_PG": { + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet28|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet36|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet92|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet100|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet4|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet12|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet20|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet44|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet52|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet60|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet68|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet76|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet84|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet108|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet116|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet124|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "Ethernet24|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet24|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet24|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet24|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet24|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet28|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet28|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet28|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet28|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet28|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet32|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet32|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet32|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet32|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet32|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet36|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet36|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet36|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet36|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet36|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet88|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet88|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet88|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet88|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet88|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet92|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet92|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet92|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet92|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet92|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet96|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet96|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet96|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet96|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet96|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet100|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet100|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet100|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet100|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet100|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet0|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet4|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet8|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet12|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet16|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet20|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet40|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet44|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet48|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet52|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet56|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet60|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet64|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet68|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet72|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet76|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet80|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet84|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet104|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet108|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet112|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet116|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet120|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet124|5-7": { + "profile" : "egress_lossy_profile" + } + } + +} diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json new file mode 100644 index 000000000000..c90500e2d9ca --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json @@ -0,0 +1,987 @@ + + { + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "300m", + "Ethernet2": "300m", + "Ethernet4": "300m", + "Ethernet6": "300m", + "Ethernet8": "300m", + "Ethernet10": "300m", + "Ethernet12": "300m", + "Ethernet14": "300m", + "Ethernet16": "300m", + "Ethernet18": "300m", + "Ethernet20": "300m", + "Ethernet22": "300m", + "Ethernet24": "300m", + "Ethernet26": "300m", + "Ethernet28": "300m", + "Ethernet30": "300m", + "Ethernet32": "300m", + "Ethernet34": "300m", + "Ethernet36": "300m", + "Ethernet38": "300m", + "Ethernet40": "300m", + "Ethernet42": "300m", + "Ethernet44": "300m", + "Ethernet46": "300m", + "Ethernet48": "300m", + "Ethernet52": "300m", + "Ethernet56": "300m", + "Ethernet60": "300m", + "Ethernet64": "300m", + "Ethernet68": "300m", + "Ethernet72": "300m", + "Ethernet76": "300m", + "Ethernet80": "300m", + "Ethernet82": "300m", + "Ethernet84": "300m", + "Ethernet86": "300m", + "Ethernet88": "300m", + "Ethernet90": "300m", + "Ethernet92": "300m", + "Ethernet94": "300m", + "Ethernet96": "300m", + "Ethernet98": "300m", + "Ethernet100": "300m", + "Ethernet102": "300m", + "Ethernet104": "300m", + "Ethernet106": "300m", + "Ethernet108": "300m", + "Ethernet110": "300m", + "Ethernet112": "300m", + "Ethernet114": "300m", + "Ethernet116": "300m", + "Ethernet118": "300m", + "Ethernet120": "300m", + "Ethernet122": "300m", + "Ethernet124": "300m", + "Ethernet126": "300m", + "Ethernet128": "300m", + "Ethernet130": "300m", + "Ethernet132": "300m", + "Ethernet134": "300m", + "Ethernet136": "300m", + "Ethernet138": "300m", + "Ethernet140": "300m", + "Ethernet142": "300m", + "Ethernet144": "300m", + "Ethernet146": "300m", + "Ethernet148": "300m", + "Ethernet150": "300m", + "Ethernet152": "300m", + "Ethernet154": "300m", + "Ethernet156": "300m", + "Ethernet158": "300m", + "Ethernet160": "300m", + "Ethernet162": "300m", + "Ethernet164": "300m", + "Ethernet166": "300m", + "Ethernet168": "300m", + "Ethernet170": "300m", + "Ethernet172": "300m", + "Ethernet174": "300m", + "Ethernet176": "300m", + "Ethernet178": "300m", + "Ethernet180": "300m", + "Ethernet182": "300m", + "Ethernet184": "300m", + "Ethernet186": "300m", + "Ethernet188": "300m", + "Ethernet190": "300m", + "Ethernet192": "300m", + "Ethernet194": "300m", + "Ethernet196": "300m", + "Ethernet198": "300m", + "Ethernet200": "300m", + "Ethernet202": "300m", + "Ethernet204": "300m", + "Ethernet206": "300m", + "Ethernet208": "300m", + "Ethernet210": "300m", + "Ethernet212": "300m", + "Ethernet214": "300m", + "Ethernet216": "300m", + "Ethernet218": "300m", + "Ethernet220": "300m", + "Ethernet222": "300m", + "Ethernet224": "300m", + "Ethernet226": "300m", + "Ethernet228": "300m", + "Ethernet230": "300m", + "Ethernet232": "300m", + "Ethernet234": "300m", + "Ethernet236": "300m", + "Ethernet238": "300m", + "Ethernet240": "300m", + "Ethernet242": "300m", + "Ethernet244": "300m", + "Ethernet246": "300m", + "Ethernet248": "300m", + "Ethernet250": "300m", + "Ethernet252": "300m", + "Ethernet254": "300m", + "Ethernet256": "300m", + "Ethernet260": "300m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "33329088", + "type": "ingress", + "mode": "dynamic", + "xoff": "7827456" + }, + "egress_lossy_pool": { + "size": "26663272", + "type": "egress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "42349632", + "type": "egress", + "mode": "static" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "static_th":"44302336" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"0", + "static_th":"42349632" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1664", + "dynamic_th":"-1" + } + }, + "BUFFER_PG": { + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet52|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet60|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet68|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet76|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet4|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet12|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet20|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet28|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet36|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet44|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet84|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet92|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet100|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet108|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet116|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet124|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet128|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet132|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet140|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet144|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet148|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet152|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet156|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet160|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet164|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet168|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet172|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet176|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet180|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet184|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet188|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet192|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet196|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet200|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet204|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet208|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet212|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet216|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet220|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet224|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet228|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet232|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet236|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet240|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet244|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet248|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet252|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "Ethernet48|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet48|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet48|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet48|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet48|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet52|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet52|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet52|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet52|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet52|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet56|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet56|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet56|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet56|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet56|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet60|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet60|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet60|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet60|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet60|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet64|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet64|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet68|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet68|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet72|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet72|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet72|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet72|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet72|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet76|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet76|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet76|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet76|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet76|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet0|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet4|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet8|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet12|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet16|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet20|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet24|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet28|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet32|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet36|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet40|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet44|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet80|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet84|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet88|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet92|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet96|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet100|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet104|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet108|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet112|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet116|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet120|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet124|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet128|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet132|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet136|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet140|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet144|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet148|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet152|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet156|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet160|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet164|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet168|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet172|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet176|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet180|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet184|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet188|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet192|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet196|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet196|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet196|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet200|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet204|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet204|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet204|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet208|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet212|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet212|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet212|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet216|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet220|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet220|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet220|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet224|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet228|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet228|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet228|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet232|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet236|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet236|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet236|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet240|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet244|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet244|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet244|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet248|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet252|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet252|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet252|5-7": { + "profile" : "egress_lossy_profile" + } + } + +} diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json new file mode 100644 index 000000000000..f1786673564c --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json @@ -0,0 +1,571 @@ + + { + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "300m", + "Ethernet4": "300m", + "Ethernet8": "300m", + "Ethernet12": "300m", + "Ethernet16": "300m", + "Ethernet20": "300m", + "Ethernet24": "300m", + "Ethernet28": "300m", + "Ethernet32": "300m", + "Ethernet36": "300m", + "Ethernet40": "300m", + "Ethernet44": "300m", + "Ethernet48": "300m", + "Ethernet52": "300m", + "Ethernet56": "300m", + "Ethernet60": "300m", + "Ethernet64": "300m", + "Ethernet68": "300m", + "Ethernet72": "300m", + "Ethernet76": "300m", + "Ethernet80": "300m", + "Ethernet84": "300m", + "Ethernet88": "300m", + "Ethernet92": "300m", + "Ethernet96": "300m", + "Ethernet100": "300m", + "Ethernet104": "300m", + "Ethernet108": "300m", + "Ethernet112": "300m", + "Ethernet116": "300m", + "Ethernet120": "300m", + "Ethernet124": "300m", + "Ethernet128": "300m", + "Ethernet132": "300m", + "Ethernet136": "300m", + "Ethernet140": "300m", + "Ethernet144": "300m", + "Ethernet148": "300m", + "Ethernet152": "300m", + "Ethernet156": "300m", + "Ethernet160": "300m", + "Ethernet164": "300m", + "Ethernet168": "300m", + "Ethernet172": "300m", + "Ethernet176": "300m", + "Ethernet180": "300m", + "Ethernet184": "300m", + "Ethernet188": "300m", + "Ethernet192": "300m", + "Ethernet196": "300m", + "Ethernet200": "300m", + "Ethernet204": "300m", + "Ethernet208": "300m", + "Ethernet212": "300m", + "Ethernet216": "300m", + "Ethernet220": "300m", + "Ethernet224": "300m", + "Ethernet228": "300m", + "Ethernet232": "300m", + "Ethernet236": "300m", + "Ethernet240": "300m", + "Ethernet244": "300m", + "Ethernet248": "300m", + "Ethernet252": "300m", + "Ethernet256": "300m", + "Ethernet260": "300m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "33582016", + "type": "ingress", + "mode": "dynamic", + "xoff": "8965632" + }, + "egress_lossy_pool": { + "size": "26866112", + "type": "egress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "43481152", + "type": "egress", + "mode": "static" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "static_th":"44302336" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"0", + "static_th":"43481152" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1664", + "dynamic_th":"-1" + } + }, + "BUFFER_PG": { + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet4|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet144|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet148|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet20|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet152|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet156|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet68|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet168|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet176|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet84|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet180|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet184|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet188|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet200|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet208|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet212|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet216|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet220|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet232|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet240|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet244|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet248|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet252|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "Ethernet136|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet136|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet136|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet136|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet136|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet0|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet4|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet144|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet144|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet144|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet144|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet144|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet148|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet148|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet148|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet148|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet148|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet16|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet20|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet152|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet152|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet152|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet152|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet152|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet156|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet156|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet156|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet156|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet156|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet64|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet68|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet168|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet168|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet168|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet168|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet168|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet176|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet176|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet176|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet176|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet176|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet80|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet84|5-7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet180|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet180|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet180|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet180|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet180|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet184|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet184|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet184|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet184|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet184|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet188|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet188|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet188|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet188|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet188|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet200|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet200|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet200|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet200|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet200|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet208|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet208|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet208|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet208|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet208|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet212|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet212|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet212|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet212|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet212|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet216|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet216|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet216|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet216|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet216|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet220|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet220|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet220|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet220|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet220|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet232|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet232|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet232|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet232|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet232|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet240|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet240|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet240|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet240|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet240|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet244|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet244|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet244|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet244|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet244|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet248|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet248|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet248|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet248|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet248|7": { + "profile" : "egress_lossy_profile" + }, + "Ethernet252|0-1": { + "profile" : "egress_lossy_profile" + }, + "Ethernet252|2-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet252|5": { + "profile" : "egress_lossy_profile" + }, + "Ethernet252|6": { + "profile" : "egress_lossless_profile" + }, + "Ethernet252|7": { + "profile" : "egress_lossy_profile" + } + } + +} diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py index 52d4260dba77..61f0e5a3c129 100644 --- a/src/sonic-config-engine/tests/test_j2files.py +++ b/src/sonic-config-engine/tests/test_j2files.py @@ -349,6 +349,26 @@ def test_buffers_mellanox2410_render_template(self): def test_buffers_mellanox2410_dynamic_render_template(self): self._test_buffers_render_template('mellanox', 'x86_64-mlnx_msn2410-r0', 'ACS-MSN2410', 'sample-mellanox-2410-t1-minigraph.xml', 'buffers_dynamic.json.j2', 'buffers-mellanox2410-dynamic.json') + def test_extra_lossless_buffer_for_tunnel_remapping(self): + if utils.PYvX_DIR != 'py3': + # Skip on python2 as the change will not be backported to previous version + return + + TEST_DATA = [ + # (vendor, platform, sku, minigraph, buffer_template, sample_output ) + ('arista', 'x86_64-arista_7050cx3_32s', 'Arista-7050CX3-32S-D48C8', 'sample-arista-7050cx3-dualtor-minigraph.xml', 'buffers.json.j2', 'buffer-arista7050cx3-dualtor.json'), + ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-D108C8', 'sample-arista-7260-dualtor-minigraph.xml', 'buffers.json.j2', 'buffer-arista7260-dualtor.json'), + ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-C64', 'sample-arista-7260-t1-minigraph.xml', 'buffers.json.j2', 'buffer-arista7260-t1.json') + ] + + for test_data in TEST_DATA: + self._test_buffers_render_template(vendor=test_data[0], + platform=test_data[1], + sku=test_data[2], + minigraph=test_data[3], + buffer_template=test_data[4], + expected=test_data[5]) + def test_ipinip_multi_asic(self): 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 ' + ' > ' + self.output_file From e78d9704f97c06699eaef2a8093a6457e295b464 Mon Sep 17 00:00:00 2001 From: bingwang Date: Thu, 7 Apr 2022 11:20:32 +0000 Subject: [PATCH 02/15] Fix UT Signed-off-by: bingwang --- .../py3/buffer-arista7050cx3-dualtor.json | 70 ++--- .../py3/buffer-arista7260-dualtor.json | 250 +++++++++--------- .../py3/buffer-arista7260-t1.json | 46 ++-- 3 files changed, 183 insertions(+), 183 deletions(-) diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json index 212e6a0db7f4..8f768e8bddc1 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json @@ -2,61 +2,61 @@ { "CABLE_LENGTH": { "AZURE": { - "Ethernet0": "300m", + "Ethernet0": "5m", "Ethernet2": "300m", - "Ethernet4": "300m", + "Ethernet4": "5m", "Ethernet6": "300m", - "Ethernet8": "300m", + "Ethernet8": "5m", "Ethernet10": "300m", - "Ethernet12": "300m", + "Ethernet12": "5m", "Ethernet14": "300m", - "Ethernet16": "300m", + "Ethernet16": "5m", "Ethernet18": "300m", - "Ethernet20": "300m", + "Ethernet20": "5m", "Ethernet22": "300m", - "Ethernet24": "300m", - "Ethernet28": "300m", - "Ethernet32": "300m", - "Ethernet36": "300m", - "Ethernet40": "300m", + "Ethernet24": "40m", + "Ethernet28": "40m", + "Ethernet32": "40m", + "Ethernet36": "40m", + "Ethernet40": "5m", "Ethernet42": "300m", - "Ethernet44": "300m", + "Ethernet44": "5m", "Ethernet46": "300m", - "Ethernet48": "300m", + "Ethernet48": "5m", "Ethernet50": "300m", - "Ethernet52": "300m", + "Ethernet52": "5m", "Ethernet54": "300m", - "Ethernet56": "300m", + "Ethernet56": "5m", "Ethernet58": "300m", - "Ethernet60": "300m", + "Ethernet60": "5m", "Ethernet62": "300m", - "Ethernet64": "300m", + "Ethernet64": "5m", "Ethernet66": "300m", - "Ethernet68": "300m", + "Ethernet68": "5m", "Ethernet70": "300m", - "Ethernet72": "300m", + "Ethernet72": "5m", "Ethernet74": "300m", - "Ethernet76": "300m", + "Ethernet76": "5m", "Ethernet78": "300m", - "Ethernet80": "300m", + "Ethernet80": "5m", "Ethernet82": "300m", - "Ethernet84": "300m", + "Ethernet84": "5m", "Ethernet86": "300m", - "Ethernet88": "300m", - "Ethernet92": "300m", - "Ethernet96": "300m", - "Ethernet100": "300m", - "Ethernet104": "300m", + "Ethernet88": "40m", + "Ethernet92": "40m", + "Ethernet96": "40m", + "Ethernet100": "40m", + "Ethernet104": "5m", "Ethernet106": "300m", - "Ethernet108": "300m", + "Ethernet108": "5m", "Ethernet110": "300m", - "Ethernet112": "300m", + "Ethernet112": "5m", "Ethernet114": "300m", - "Ethernet116": "300m", + "Ethernet116": "5m", "Ethernet118": "300m", - "Ethernet120": "300m", + "Ethernet120": "5m", "Ethernet122": "300m", - "Ethernet124": "300m", + "Ethernet124": "5m", "Ethernet126": "300m" } }, @@ -81,17 +81,17 @@ }, "BUFFER_PROFILE": { "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "pool":"ingress_lossless_pool", "size":"0", "dynamic_th":"3" }, "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", + "pool":"egress_lossless_pool", "size":"0", "static_th":"32340992" }, "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", + "pool":"egress_lossy_pool", "size":"1792", "dynamic_th":"-1" } diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json index c90500e2d9ca..d5ffd8ad8df4 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json @@ -2,128 +2,128 @@ { "CABLE_LENGTH": { "AZURE": { - "Ethernet0": "300m", - "Ethernet2": "300m", - "Ethernet4": "300m", - "Ethernet6": "300m", - "Ethernet8": "300m", - "Ethernet10": "300m", - "Ethernet12": "300m", - "Ethernet14": "300m", - "Ethernet16": "300m", - "Ethernet18": "300m", - "Ethernet20": "300m", - "Ethernet22": "300m", - "Ethernet24": "300m", - "Ethernet26": "300m", - "Ethernet28": "300m", - "Ethernet30": "300m", - "Ethernet32": "300m", - "Ethernet34": "300m", - "Ethernet36": "300m", - "Ethernet38": "300m", - "Ethernet40": "300m", - "Ethernet42": "300m", - "Ethernet44": "300m", - "Ethernet46": "300m", - "Ethernet48": "300m", - "Ethernet52": "300m", - "Ethernet56": "300m", - "Ethernet60": "300m", - "Ethernet64": "300m", - "Ethernet68": "300m", - "Ethernet72": "300m", - "Ethernet76": "300m", - "Ethernet80": "300m", - "Ethernet82": "300m", - "Ethernet84": "300m", - "Ethernet86": "300m", - "Ethernet88": "300m", - "Ethernet90": "300m", - "Ethernet92": "300m", - "Ethernet94": "300m", - "Ethernet96": "300m", - "Ethernet98": "300m", - "Ethernet100": "300m", - "Ethernet102": "300m", - "Ethernet104": "300m", - "Ethernet106": "300m", - "Ethernet108": "300m", - "Ethernet110": "300m", - "Ethernet112": "300m", - "Ethernet114": "300m", - "Ethernet116": "300m", - "Ethernet118": "300m", - "Ethernet120": "300m", - "Ethernet122": "300m", - "Ethernet124": "300m", - "Ethernet126": "300m", - "Ethernet128": "300m", - "Ethernet130": "300m", - "Ethernet132": "300m", - "Ethernet134": "300m", - "Ethernet136": "300m", - "Ethernet138": "300m", - "Ethernet140": "300m", - "Ethernet142": "300m", - "Ethernet144": "300m", - "Ethernet146": "300m", - "Ethernet148": "300m", - "Ethernet150": "300m", - "Ethernet152": "300m", - "Ethernet154": "300m", - "Ethernet156": "300m", - "Ethernet158": "300m", - "Ethernet160": "300m", - "Ethernet162": "300m", - "Ethernet164": "300m", - "Ethernet166": "300m", - "Ethernet168": "300m", - "Ethernet170": "300m", - "Ethernet172": "300m", - "Ethernet174": "300m", - "Ethernet176": "300m", - "Ethernet178": "300m", - "Ethernet180": "300m", - "Ethernet182": "300m", - "Ethernet184": "300m", - "Ethernet186": "300m", - "Ethernet188": "300m", - "Ethernet190": "300m", - "Ethernet192": "300m", - "Ethernet194": "300m", - "Ethernet196": "300m", - "Ethernet198": "300m", - "Ethernet200": "300m", - "Ethernet202": "300m", - "Ethernet204": "300m", - "Ethernet206": "300m", - "Ethernet208": "300m", - "Ethernet210": "300m", - "Ethernet212": "300m", - "Ethernet214": "300m", - "Ethernet216": "300m", - "Ethernet218": "300m", - "Ethernet220": "300m", - "Ethernet222": "300m", - "Ethernet224": "300m", - "Ethernet226": "300m", - "Ethernet228": "300m", - "Ethernet230": "300m", - "Ethernet232": "300m", - "Ethernet234": "300m", - "Ethernet236": "300m", - "Ethernet238": "300m", - "Ethernet240": "300m", - "Ethernet242": "300m", - "Ethernet244": "300m", - "Ethernet246": "300m", - "Ethernet248": "300m", - "Ethernet250": "300m", - "Ethernet252": "300m", - "Ethernet254": "300m", - "Ethernet256": "300m", - "Ethernet260": "300m" + "Ethernet0": "5m", + "Ethernet2": "5m", + "Ethernet4": "5m", + "Ethernet6": "5m", + "Ethernet8": "5m", + "Ethernet10": "5m", + "Ethernet12": "5m", + "Ethernet14": "5m", + "Ethernet16": "5m", + "Ethernet18": "5m", + "Ethernet20": "5m", + "Ethernet22": "5m", + "Ethernet24": "5m", + "Ethernet26": "5m", + "Ethernet28": "5m", + "Ethernet30": "5m", + "Ethernet32": "5m", + "Ethernet34": "5m", + "Ethernet36": "5m", + "Ethernet38": "5m", + "Ethernet40": "5m", + "Ethernet42": "5m", + "Ethernet44": "5m", + "Ethernet46": "5m", + "Ethernet48": "40m", + "Ethernet52": "40m", + "Ethernet56": "40m", + "Ethernet60": "40m", + "Ethernet64": "40m", + "Ethernet68": "40m", + "Ethernet72": "40m", + "Ethernet76": "40m", + "Ethernet80": "5m", + "Ethernet82": "5m", + "Ethernet84": "5m", + "Ethernet86": "5m", + "Ethernet88": "5m", + "Ethernet90": "5m", + "Ethernet92": "5m", + "Ethernet94": "5m", + "Ethernet96": "5m", + "Ethernet98": "5m", + "Ethernet100": "5m", + "Ethernet102": "5m", + "Ethernet104": "5m", + "Ethernet106": "5m", + "Ethernet108": "5m", + "Ethernet110": "5m", + "Ethernet112": "5m", + "Ethernet114": "5m", + "Ethernet116": "5m", + "Ethernet118": "5m", + "Ethernet120": "5m", + "Ethernet122": "5m", + "Ethernet124": "5m", + "Ethernet126": "5m", + "Ethernet128": "5m", + "Ethernet130": "5m", + "Ethernet132": "5m", + "Ethernet134": "5m", + "Ethernet136": "5m", + "Ethernet138": "5m", + "Ethernet140": "5m", + "Ethernet142": "5m", + "Ethernet144": "5m", + "Ethernet146": "5m", + "Ethernet148": "5m", + "Ethernet150": "5m", + "Ethernet152": "5m", + "Ethernet154": "5m", + "Ethernet156": "5m", + "Ethernet158": "5m", + "Ethernet160": "5m", + "Ethernet162": "5m", + "Ethernet164": "5m", + "Ethernet166": "5m", + "Ethernet168": "5m", + "Ethernet170": "5m", + "Ethernet172": "5m", + "Ethernet174": "5m", + "Ethernet176": "5m", + "Ethernet178": "5m", + "Ethernet180": "5m", + "Ethernet182": "5m", + "Ethernet184": "5m", + "Ethernet186": "5m", + "Ethernet188": "5m", + "Ethernet190": "5m", + "Ethernet192": "5m", + "Ethernet194": "5m", + "Ethernet196": "5m", + "Ethernet198": "5m", + "Ethernet200": "5m", + "Ethernet202": "5m", + "Ethernet204": "5m", + "Ethernet206": "5m", + "Ethernet208": "5m", + "Ethernet210": "5m", + "Ethernet212": "5m", + "Ethernet214": "5m", + "Ethernet216": "5m", + "Ethernet218": "5m", + "Ethernet220": "5m", + "Ethernet222": "5m", + "Ethernet224": "5m", + "Ethernet226": "5m", + "Ethernet228": "5m", + "Ethernet230": "5m", + "Ethernet232": "5m", + "Ethernet234": "5m", + "Ethernet236": "5m", + "Ethernet238": "5m", + "Ethernet240": "5m", + "Ethernet242": "5m", + "Ethernet244": "5m", + "Ethernet246": "5m", + "Ethernet248": "5m", + "Ethernet250": "5m", + "Ethernet252": "5m", + "Ethernet254": "5m", + "Ethernet256": "5m", + "Ethernet260": "5m" } }, @@ -147,17 +147,17 @@ }, "BUFFER_PROFILE": { "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "pool":"ingress_lossless_pool", "size":"0", "static_th":"44302336" }, "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", + "pool":"egress_lossless_pool", "size":"0", "static_th":"42349632" }, "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", + "pool":"egress_lossy_pool", "size":"1664", "dynamic_th":"-1" } diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json index f1786673564c..1a8da26573d9 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json @@ -36,36 +36,36 @@ "Ethernet124": "300m", "Ethernet128": "300m", "Ethernet132": "300m", - "Ethernet136": "300m", + "Ethernet136": "40m", "Ethernet140": "300m", - "Ethernet144": "300m", - "Ethernet148": "300m", - "Ethernet152": "300m", - "Ethernet156": "300m", + "Ethernet144": "40m", + "Ethernet148": "40m", + "Ethernet152": "40m", + "Ethernet156": "40m", "Ethernet160": "300m", "Ethernet164": "300m", - "Ethernet168": "300m", + "Ethernet168": "40m", "Ethernet172": "300m", - "Ethernet176": "300m", - "Ethernet180": "300m", - "Ethernet184": "300m", - "Ethernet188": "300m", + "Ethernet176": "40m", + "Ethernet180": "40m", + "Ethernet184": "40m", + "Ethernet188": "40m", "Ethernet192": "300m", "Ethernet196": "300m", - "Ethernet200": "300m", + "Ethernet200": "40m", "Ethernet204": "300m", - "Ethernet208": "300m", - "Ethernet212": "300m", - "Ethernet216": "300m", - "Ethernet220": "300m", + "Ethernet208": "40m", + "Ethernet212": "40m", + "Ethernet216": "40m", + "Ethernet220": "40m", "Ethernet224": "300m", "Ethernet228": "300m", - "Ethernet232": "300m", + "Ethernet232": "40m", "Ethernet236": "300m", - "Ethernet240": "300m", - "Ethernet244": "300m", - "Ethernet248": "300m", - "Ethernet252": "300m", + "Ethernet240": "40m", + "Ethernet244": "40m", + "Ethernet248": "40m", + "Ethernet252": "40m", "Ethernet256": "300m", "Ethernet260": "300m" } @@ -91,17 +91,17 @@ }, "BUFFER_PROFILE": { "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "pool":"ingress_lossless_pool", "size":"0", "static_th":"44302336" }, "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", + "pool":"egress_lossless_pool", "size":"0", "static_th":"43481152" }, "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", + "pool":"egress_lossy_pool", "size":"1664", "dynamic_th":"-1" } From 1a2284f5cc77eeb43333ec75c8d71e049d70a47a Mon Sep 17 00:00:00 2001 From: bingwang Date: Mon, 25 Apr 2022 07:53:40 +0000 Subject: [PATCH 03/15] Rename macro Signed-off-by: bingwang --- .../Arista-7050CX3-32S-D48C8/buffers.json.j2 | 6 +++--- .../Arista-7260CX3-C64/buffers.json.j2 | 6 +++--- files/build_templates/buffers_config.j2 | 9 ++++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 index 8aa696c1a978..6c61963da05c 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 @@ -1,10 +1,10 @@ {%- set default_topo = 't0' %} {% if DEVICE_METADATA is defined and 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -{%- macro generate_extra_lossless_buffers(port_names, port_names_require_extra_buffer) %} +{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} "BUFFER_QUEUE": { -{% for port in port_names %} -{% if port in port_names_require_extra_buffer %} +{% for port in port_names.split(',') %} +{% if port in port_names_require_extra_buffer.split(',') %} "{{ port }}|0-1": { "profile" : "egress_lossy_profile" }, diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2 index 37308650fe19..caf315fb80b4 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2 @@ -2,10 +2,10 @@ {% if DEVICE_METADATA is defined and 'type' in DEVICE_METADATA['localhost'] and (DEVICE_METADATA['localhost']['type'] == 'LeafRouter' or DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %} -{%- macro generate_extra_lossless_buffers(port_names, port_names_require_extra_buffer) %} +{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} "BUFFER_QUEUE": { -{% for port in port_names %} -{% if port in port_names_require_extra_buffer %} +{% for port in port_names.split(',') %} +{% if port in port_names_require_extra_buffer.split(',') %} "{{ port }}|0-1": { "profile" : "egress_lossy_profile" }, diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index 94c7c23238d5..0d111558a0de 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -130,11 +130,12 @@ def {%- set port_names_list_extra_queues = [] %} {%- for port in PORT_ACTIVE %} - {% if (generate_extra_lossless_buffers is defined) and ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'ToRRouter') or + {% if (generate_queue_buffers_with_extra_lossless_queues is defined) and ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'ToRRouter') or ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'LeafRouter') %} {%- if port_names_list_extra_queues.append(port) %}{%- endif %} {% endif %} {%- endfor %} +{%- set port_names_extra_queues = port_names_list_extra_queues | join(',') %} {%- set port_names_list_inactive = [] %} {%- for port in PORT_INACTIVE %} @@ -190,8 +191,10 @@ def {{ defs.generate_queue_buffers(port_names_active) }} {% elif defs.generate_queue_buffers_with_inactive_ports is defined %} {{ defs.generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) }} -{% elif generate_extra_lossless_buffers is defined %} -{{ generate_extra_lossless_buffers(port_names_list_active, port_names_list_extra_queues) }} +{% elif generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined %} +{{ generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }} +{% elif generate_queue_buffers_with_extra_lossless_queues is defined %} +{{ generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues) }} {% else %} "BUFFER_QUEUE": { {% for port in PORT_ACTIVE %} From 239ce9a24ab4deeba97df2eb4e387d94496a87c1 Mon Sep 17 00:00:00 2001 From: bingwang Date: Mon, 25 Apr 2022 08:06:50 +0000 Subject: [PATCH 04/15] Update check condition Signed-off-by: bingwang --- files/build_templates/buffers_config.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index 0d111558a0de..b1eff37899dc 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -130,7 +130,8 @@ def {%- set port_names_list_extra_queues = [] %} {%- for port in PORT_ACTIVE %} - {% if (generate_queue_buffers_with_extra_lossless_queues is defined) and ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'ToRRouter') or + {% if (generate_queue_buffers_with_extra_lossless_queues is defined or generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined) and + ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'ToRRouter') or ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'LeafRouter') %} {%- if port_names_list_extra_queues.append(port) %}{%- endif %} {% endif %} From 798fe7cbb66b5f32254e1bc5af7efb903bfa87c2 Mon Sep 17 00:00:00 2001 From: bingwang Date: Tue, 26 Apr 2022 11:37:57 +0000 Subject: [PATCH 05/15] Address comments Signed-off-by: bingwang --- .../Arista-7050CX3-32S-C32/buffers.json.j2 | 3 +- .../buffers_defaults_t0.j2 | 6 +++ .../buffers_extra_queues.j2 | 1 + .../Arista-7050CX3-32S-D48C8/buffers.json.j2 | 39 ------------------ .../buffers_defaults_t0.j2 | 6 +++ .../buffers_extra_queues.j2 | 37 +++++++++++++++++ .../Arista-7260CX3-C64/buffers.json.j2 | 40 ------------------- .../Arista-7260CX3-C64/buffers_defaults_t1.j2 | 6 +++ .../buffers_extra_queues.j2 | 38 ++++++++++++++++++ .../Arista-7260CX3-D108C8/buffers.json.j2 | 4 +- .../buffers_defaults_t0.j2 | 6 +++ .../buffers_extra_queues.j2 | 1 + .../Arista-7260CX3-Q64/buffers.json.j2 | 4 +- .../Arista-7260CX3-Q64/buffers_defaults_t0.j2 | 2 +- .../Arista-7260CX3-Q64/buffers_defaults_t1.j2 | 6 +++ .../buffers_extra_queues.j2 | 1 + files/build_templates/buffers_config.j2 | 14 +++---- 17 files changed, 124 insertions(+), 90 deletions(-) mode change 120000 => 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 create mode 120000 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_extra_queues.j2 create mode 100644 device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 create mode 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 mode change 120000 => 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_extra_queues.j2 mode change 120000 => 100644 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 create mode 120000 device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_queues.j2 diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 deleted file mode 120000 index 3ad16ba265d9..000000000000 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 +++ /dev/null @@ -1 +0,0 @@ -../Arista-7050CX3-32S-D48C8/buffers.json.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 new file mode 100644 index 000000000000..1083a6210fc9 --- /dev/null +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers.json.j2 @@ -0,0 +1,2 @@ +{%- set default_topo = 't0' %} +{%- include 'buffers_config.j2' %} diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 index 6bea9e4a5be0..27962c427fa8 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 @@ -44,3 +44,9 @@ } }, {%- endmacro %} + +{% import 'buffers_extra_queues.j2' as defs with context %} + +{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} +{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} +{%- endmacro %} \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_extra_queues.j2 new file mode 120000 index 000000000000..2c4dff993ce9 --- /dev/null +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_extra_queues.j2 @@ -0,0 +1 @@ +../Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 index 6c61963da05c..1083a6210fc9 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers.json.j2 @@ -1,41 +1,2 @@ {%- set default_topo = 't0' %} - -{% if DEVICE_METADATA is defined and 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} - "BUFFER_QUEUE": { -{% for port in port_names.split(',') %} -{% if port in port_names_require_extra_buffer.split(',') %} - "{{ port }}|0-1": { - "profile" : "egress_lossy_profile" - }, - "{{ port }}|2-4": { - "profile" : "egress_lossless_profile" - }, - "{{ port }}|5": { - "profile" : "egress_lossy_profile" - }, - "{{ port }}|6": { - "profile" : "egress_lossless_profile" - }, - "{{ port }}|7": { - "profile" : "egress_lossy_profile" - }{% if not loop.last %},{% endif %} - -{% else %} - "{{ port }}|0-2": { - "profile" : "egress_lossy_profile" - }, - "{{ port }}|3-4": { - "profile" : "egress_lossless_profile" - }, - "{{ port }}|5-7": { - "profile" : "egress_lossy_profile" - }{% if not loop.last %},{% endif %} - -{% endif %} -{% endfor %} - } -{% endmacro %} -{% endif %} - {%- include 'buffers_config.j2' %} diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 index 6a524f980697..709d704e886c 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 @@ -45,3 +45,9 @@ } }, {%- endmacro %} + +{% import 'buffers_extra_queues.j2' as defs with context %} + +{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} +{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} +{%- endmacro %} \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 new file mode 100644 index 000000000000..8ec4ad46d667 --- /dev/null +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 @@ -0,0 +1,37 @@ +{% if DEVICE_METADATA is defined and 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} +{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} + "BUFFER_QUEUE": { +{% for port in port_names.split(',') %} +{% if port in port_names_require_extra_buffer.split(',') %} + "{{ port }}|0-1": { + "profile" : "egress_lossy_profile" + }, + "{{ port }}|2-4": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|5": { + "profile" : "egress_lossy_profile" + }, + "{{ port }}|6": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|7": { + "profile" : "egress_lossy_profile" + }{% if not loop.last %},{% endif %} + +{% else %} + "{{ port }}|0-2": { + "profile" : "egress_lossy_profile" + }, + "{{ port }}|3-4": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|5-7": { + "profile" : "egress_lossy_profile" + }{% if not loop.last %},{% endif %} + +{% endif %} +{% endfor %} + } +{% endmacro %} +{% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2 index caf315fb80b4..b67cf577ab75 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2 @@ -1,43 +1,3 @@ {%- set default_topo = 't1' %} - -{% if DEVICE_METADATA is defined and 'type' in DEVICE_METADATA['localhost'] and -(DEVICE_METADATA['localhost']['type'] == 'LeafRouter' or DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %} -{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} - "BUFFER_QUEUE": { -{% for port in port_names.split(',') %} -{% if port in port_names_require_extra_buffer.split(',') %} - "{{ port }}|0-1": { - "profile" : "egress_lossy_profile" - }, - "{{ port }}|2-4": { - "profile" : "egress_lossless_profile" - }, - "{{ port }}|5": { - "profile" : "egress_lossy_profile" - }, - "{{ port }}|6": { - "profile" : "egress_lossless_profile" - }, - "{{ port }}|7": { - "profile" : "egress_lossy_profile" - }{% if not loop.last %},{% endif %} - -{% else %} - "{{ port }}|0-2": { - "profile" : "egress_lossy_profile" - }, - "{{ port }}|3-4": { - "profile" : "egress_lossless_profile" - }, - "{{ port }}|5-7": { - "profile" : "egress_lossy_profile" - }{% if not loop.last %},{% endif %} - -{% endif %} -{% endfor %} - } -{% endmacro %} -{% endif %} - {%- include 'buffers_config.j2' %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 index 9294691c2f5d..0a5e7803e221 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 @@ -50,3 +50,9 @@ } }, {%- endmacro %} + +{% import 'buffers_extra_queues.j2' as defs with context %} + +{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} +{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} +{%- endmacro %} \ No newline at end of file diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 new file mode 100644 index 000000000000..3ad6c5b9bc9e --- /dev/null +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 @@ -0,0 +1,38 @@ +{% if DEVICE_METADATA is defined and 'type' in DEVICE_METADATA['localhost'] and +(DEVICE_METADATA['localhost']['type'] == 'LeafRouter' or DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %} +{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} + "BUFFER_QUEUE": { +{% for port in port_names.split(',') %} +{% if port in port_names_require_extra_buffer.split(',') %} + "{{ port }}|0-1": { + "profile" : "egress_lossy_profile" + }, + "{{ port }}|2-4": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|5": { + "profile" : "egress_lossy_profile" + }, + "{{ port }}|6": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|7": { + "profile" : "egress_lossy_profile" + }{% if not loop.last %},{% endif %} + +{% else %} + "{{ port }}|0-2": { + "profile" : "egress_lossy_profile" + }, + "{{ port }}|3-4": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|5-7": { + "profile" : "egress_lossy_profile" + }{% if not loop.last %},{% endif %} + +{% endif %} +{% endfor %} + } +{% endmacro %} +{% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 deleted file mode 120000 index 8bb64856b782..000000000000 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 +++ /dev/null @@ -1 +0,0 @@ -../Arista-7260CX3-C64/buffers.json.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 new file mode 100644 index 000000000000..e6e9e844469b --- /dev/null +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers.json.j2 @@ -0,0 +1,3 @@ +{%- set default_topo = 't0' %} +{%- include 'buffers_config.j2' %} + diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 index e4377bd47ab1..a19166ba701a 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 @@ -52,3 +52,9 @@ } }, {%- endmacro %} + +{% import 'buffers_extra_queues.j2' as defs with context %} + +{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} +{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} +{%- endmacro %} \ No newline at end of file diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_extra_queues.j2 new file mode 120000 index 000000000000..92b7e9ffbee5 --- /dev/null +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_extra_queues.j2 @@ -0,0 +1 @@ +../Arista-7260CX3-C64/buffers_extra_queues.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 deleted file mode 120000 index 8bb64856b782..000000000000 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 +++ /dev/null @@ -1 +0,0 @@ -../Arista-7260CX3-C64/buffers.json.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 new file mode 100644 index 000000000000..b67cf577ab75 --- /dev/null +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2 @@ -0,0 +1,3 @@ +{%- set default_topo = 't1' %} +{%- include 'buffers_config.j2' %} + diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 index 241f0c9a9d25..a72aa5156fb5 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 @@ -43,4 +43,4 @@ "dynamic_th":"-1" } }, -{%- endmacro %} +{%- endmacro %} \ No newline at end of file diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 index 23a969c8755e..da49de2ab66c 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 @@ -44,3 +44,9 @@ } }, {%- endmacro %} + +{% import 'buffers_extra_queues.j2' as defs with context %} + +{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} +{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} +{%- endmacro %} \ No newline at end of file diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_queues.j2 new file mode 120000 index 000000000000..92b7e9ffbee5 --- /dev/null +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_extra_queues.j2 @@ -0,0 +1 @@ +../Arista-7260CX3-C64/buffers_extra_queues.j2 \ No newline at end of file diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index b1eff37899dc..a8f8192c98d3 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -130,9 +130,9 @@ def {%- set port_names_list_extra_queues = [] %} {%- for port in PORT_ACTIVE %} - {% if (generate_queue_buffers_with_extra_lossless_queues is defined or generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined) and - ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'ToRRouter') or - ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'LeafRouter') %} + {% if (defs.generate_queue_buffers_with_extra_lossless_queues is defined or defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined) and + (('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'ToRRouter') or + ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'LeafRouter')) %} {%- if port_names_list_extra_queues.append(port) %}{%- endif %} {% endif %} {%- endfor %} @@ -192,10 +192,10 @@ def {{ defs.generate_queue_buffers(port_names_active) }} {% elif defs.generate_queue_buffers_with_inactive_ports is defined %} {{ defs.generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) }} -{% elif generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined %} -{{ generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }} -{% elif generate_queue_buffers_with_extra_lossless_queues is defined %} -{{ generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues) }} +{% elif defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined %} +{{ defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }} +{% elif defs.generate_queue_buffers_with_extra_lossless_queues is defined %} +{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues) }} {% else %} "BUFFER_QUEUE": { {% for port in PORT_ACTIVE %} From e2ea3f085de3042272c98a2e888ac4876f065319 Mon Sep 17 00:00:00 2001 From: bingwang Date: Tue, 26 Apr 2022 11:41:47 +0000 Subject: [PATCH 06/15] Add empty line at end of file Signed-off-by: bingwang --- .../Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 | 2 +- .../Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 | 2 +- .../Arista-7260CX3-C64/buffers_defaults_t0.j2 | 6 ++++++ .../Arista-7260CX3-C64/buffers_defaults_t1.j2 | 2 +- .../Arista-7260CX3-D108C8/buffers_defaults_t0.j2 | 2 +- .../Arista-7260CX3-Q64/buffers_defaults_t0.j2 | 8 +++++++- .../Arista-7260CX3-Q64/buffers_defaults_t1.j2 | 2 +- 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 index 27962c427fa8..1a6187edbddd 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 @@ -49,4 +49,4 @@ {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} -{%- endmacro %} \ No newline at end of file +{%- endmacro %} diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 index 709d704e886c..668a3b3297f2 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 @@ -50,4 +50,4 @@ {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} -{%- endmacro %} \ No newline at end of file +{%- endmacro %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 index 241f0c9a9d25..01b5a1dd8b3e 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 @@ -44,3 +44,9 @@ } }, {%- endmacro %} + +{% import 'buffers_extra_queues.j2' as defs with context %} + +{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} +{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} +{%- endmacro %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 index 0a5e7803e221..68af36a27518 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 @@ -55,4 +55,4 @@ {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} -{%- endmacro %} \ No newline at end of file +{%- endmacro %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 index a19166ba701a..10b9d70d24bf 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 @@ -57,4 +57,4 @@ {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} -{%- endmacro %} \ No newline at end of file +{%- endmacro %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 index a72aa5156fb5..01b5a1dd8b3e 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 @@ -43,4 +43,10 @@ "dynamic_th":"-1" } }, -{%- endmacro %} \ No newline at end of file +{%- endmacro %} + +{% import 'buffers_extra_queues.j2' as defs with context %} + +{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} +{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} +{%- endmacro %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 index da49de2ab66c..1d8fbb3e852f 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 @@ -49,4 +49,4 @@ {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} -{%- endmacro %} \ No newline at end of file +{%- endmacro %} From bd9c28aad0cc1952dde1fedc4f170dd805462600 Mon Sep 17 00:00:00 2001 From: bingwang Date: Thu, 28 Apr 2022 14:11:00 +0000 Subject: [PATCH 07/15] Fix j2 template Signed-off-by: bingwang --- files/build_templates/buffers_config.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index a8f8192c98d3..ee96ac179c13 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -130,11 +130,11 @@ def {%- set port_names_list_extra_queues = [] %} {%- for port in PORT_ACTIVE %} - {% if (defs.generate_queue_buffers_with_extra_lossless_queues is defined or defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined) and + {%- if (defs.generate_queue_buffers_with_extra_lossless_queues is defined or defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined) and (('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'ToRRouter') or ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'LeafRouter')) %} {%- if port_names_list_extra_queues.append(port) %}{%- endif %} - {% endif %} + {%- endif %} {%- endfor %} {%- set port_names_extra_queues = port_names_list_extra_queues | join(',') %} From 662697c60e6327e22919d5c3a532a903de2ac4fd Mon Sep 17 00:00:00 2001 From: bingwang Date: Mon, 16 May 2022 12:10:50 +0000 Subject: [PATCH 08/15] Fix UT for dualtor Signed-off-by: bingwang --- .../tests/sample_output/py3/buffer-arista7050cx3-dualtor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json index 8f768e8bddc1..7790c263cc98 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json @@ -63,7 +63,7 @@ "BUFFER_POOL": { "ingress_lossless_pool": { - "size": "32669440", + "size": "32689152", "type": "ingress", "mode": "dynamic", "xoff": "2058240" From ad1111a6f0f758cd560cc7345334776d54614e13 Mon Sep 17 00:00:00 2001 From: bingwang Date: Wed, 18 May 2022 05:54:49 +0000 Subject: [PATCH 09/15] Combine BUFFER_QUEUE 3 and 4 Signed-off-by: bingwang --- .../buffers_extra_queues.j2 | 5 +- .../buffers_extra_queues.j2 | 5 +- .../py3/buffer-arista7050cx3-dualtor.json | 40 +++++-- .../py3/buffer-arista7260-dualtor.json | 40 +++++-- .../py3/buffer-arista7260-t1.json | 100 ++++++++++++++---- 5 files changed, 152 insertions(+), 38 deletions(-) diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 index 8ec4ad46d667..b53ea5e13054 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 @@ -6,7 +6,10 @@ "{{ port }}|0-1": { "profile" : "egress_lossy_profile" }, - "{{ port }}|2-4": { + "{{ port }}|2": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|3-4": { "profile" : "egress_lossless_profile" }, "{{ port }}|5": { diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 index 3ad6c5b9bc9e..f1bbfc532f6e 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 @@ -7,7 +7,10 @@ "{{ port }}|0-1": { "profile" : "egress_lossy_profile" }, - "{{ port }}|2-4": { + "{{ port }}|2": { + "profile" : "egress_lossless_profile" + }, + "{{ port }}|3-4": { "profile" : "egress_lossless_profile" }, "{{ port }}|5": { diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json index 7790c263cc98..f10fa0ce9e46 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json @@ -199,7 +199,10 @@ "Ethernet24|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet24|2-4": { + "Ethernet24|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet24|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet24|5": { @@ -214,7 +217,10 @@ "Ethernet28|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet28|2-4": { + "Ethernet28|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet28|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet28|5": { @@ -229,7 +235,10 @@ "Ethernet32|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet32|2-4": { + "Ethernet32|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet32|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet32|5": { @@ -244,7 +253,10 @@ "Ethernet36|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet36|2-4": { + "Ethernet36|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet36|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet36|5": { @@ -259,7 +271,10 @@ "Ethernet88|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet88|2-4": { + "Ethernet88|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet88|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet88|5": { @@ -274,7 +289,10 @@ "Ethernet92|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet92|2-4": { + "Ethernet92|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet92|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet92|5": { @@ -289,7 +307,10 @@ "Ethernet96|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet96|2-4": { + "Ethernet96|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet96|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet96|5": { @@ -304,7 +325,10 @@ "Ethernet100|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet100|2-4": { + "Ethernet100|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet100|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet100|5": { diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json index d5ffd8ad8df4..d695326e937e 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json @@ -361,7 +361,10 @@ "Ethernet48|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet48|2-4": { + "Ethernet48|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet48|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet48|5": { @@ -376,7 +379,10 @@ "Ethernet52|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet52|2-4": { + "Ethernet52|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet52|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet52|5": { @@ -391,7 +397,10 @@ "Ethernet56|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet56|2-4": { + "Ethernet56|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet56|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet56|5": { @@ -406,7 +415,10 @@ "Ethernet60|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet60|2-4": { + "Ethernet60|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet60|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet60|5": { @@ -421,7 +433,10 @@ "Ethernet64|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet64|2-4": { + "Ethernet64|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet64|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet64|5": { @@ -436,7 +451,10 @@ "Ethernet68|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet68|2-4": { + "Ethernet68|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet68|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet68|5": { @@ -451,7 +469,10 @@ "Ethernet72|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet72|2-4": { + "Ethernet72|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet72|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet72|5": { @@ -466,7 +487,10 @@ "Ethernet76|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet76|2-4": { + "Ethernet76|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet76|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet76|5": { diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json index 1a8da26573d9..a47d270411f5 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json @@ -197,7 +197,10 @@ "Ethernet136|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet136|2-4": { + "Ethernet136|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet136|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet136|5": { @@ -230,7 +233,10 @@ "Ethernet144|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet144|2-4": { + "Ethernet144|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet144|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet144|5": { @@ -245,7 +251,10 @@ "Ethernet148|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet148|2-4": { + "Ethernet148|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet148|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet148|5": { @@ -278,7 +287,10 @@ "Ethernet152|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet152|2-4": { + "Ethernet152|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet152|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet152|5": { @@ -293,7 +305,10 @@ "Ethernet156|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet156|2-4": { + "Ethernet156|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet156|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet156|5": { @@ -326,7 +341,10 @@ "Ethernet168|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet168|2-4": { + "Ethernet168|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet168|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet168|5": { @@ -341,7 +359,10 @@ "Ethernet176|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet176|2-4": { + "Ethernet176|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet176|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet176|5": { @@ -374,7 +395,10 @@ "Ethernet180|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet180|2-4": { + "Ethernet180|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet180|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet180|5": { @@ -389,7 +413,10 @@ "Ethernet184|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet184|2-4": { + "Ethernet184|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet184|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet184|5": { @@ -404,7 +431,10 @@ "Ethernet188|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet188|2-4": { + "Ethernet188|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet188|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet188|5": { @@ -419,7 +449,10 @@ "Ethernet200|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet200|2-4": { + "Ethernet200|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet200|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet200|5": { @@ -434,7 +467,10 @@ "Ethernet208|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet208|2-4": { + "Ethernet208|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet208|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet208|5": { @@ -449,7 +485,10 @@ "Ethernet212|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet212|2-4": { + "Ethernet212|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet212|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet212|5": { @@ -464,7 +503,10 @@ "Ethernet216|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet216|2-4": { + "Ethernet216|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet216|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet216|5": { @@ -479,7 +521,10 @@ "Ethernet220|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet220|2-4": { + "Ethernet220|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet220|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet220|5": { @@ -494,7 +539,10 @@ "Ethernet232|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet232|2-4": { + "Ethernet232|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet232|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet232|5": { @@ -509,7 +557,10 @@ "Ethernet240|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet240|2-4": { + "Ethernet240|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet240|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet240|5": { @@ -524,7 +575,10 @@ "Ethernet244|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet244|2-4": { + "Ethernet244|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet244|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet244|5": { @@ -539,7 +593,10 @@ "Ethernet248|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet248|2-4": { + "Ethernet248|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet248|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet248|5": { @@ -554,7 +611,10 @@ "Ethernet252|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet252|2-4": { + "Ethernet252|2": { + "profile" : "egress_lossless_profile" + }, + "Ethernet252|3-4": { "profile" : "egress_lossless_profile" }, "Ethernet252|5": { From 1aeb85b0135ba2d9b0af17842d24ac1b0d8d7abd Mon Sep 17 00:00:00 2001 From: bingwang Date: Thu, 26 May 2022 12:42:38 +0000 Subject: [PATCH 10/15] Add SYSTEM_DEFAULTS table Signed-off-by: bingwang --- .../buffers_defaults_t0.j2 | 5 + .../buffers_defaults_t0.j2 | 5 + .../buffers_extra_queues.j2 | 23 +- .../Arista-7260CX3-C64/buffers_defaults_t0.j2 | 5 + .../Arista-7260CX3-C64/buffers_defaults_t1.j2 | 2 + .../buffers_extra_queues.j2 | 23 +- .../buffers_defaults_t0.j2 | 5 + .../Arista-7260CX3-Q64/buffers_defaults_t0.j2 | 5 + .../Arista-7260CX3-Q64/buffers_defaults_t1.j2 | 2 + files/build_templates/buffers_config.j2 | 4 + ...ample-arista-7050cx3-dualtor-minigraph.xml | 8 + .../sample-arista-7260-dualtor-minigraph.xml | 8 + .../tests/sample-arista-7260-t1-minigraph.xml | 8 + .../py3/buffer-arista7050cx3-dualtor.json | 188 +++++++-- .../py3/buffer-arista7260-dualtor.json | 380 ++++++++++++++++-- .../py3/buffer-arista7260-t1.json | 103 +---- 16 files changed, 616 insertions(+), 158 deletions(-) diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 index 1a6187edbddd..08de030d15c3 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 @@ -45,8 +45,13 @@ }, {%- endmacro %} +{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} {% import 'buffers_extra_queues.j2' as defs with context %} {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} +{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} +{{ defs.generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) }} +{%- endmacro %} +{% endif %} diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 index bfeb2185623a..ffdb4c993147 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 @@ -46,8 +46,13 @@ }, {%- endmacro %} +{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} {% import 'buffers_extra_queues.j2' as defs with context %} {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} +{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} +{{ defs.generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) }} +{%- endmacro %} +{% endif %} diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 index b53ea5e13054..e69ea74007aa 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 @@ -6,10 +6,7 @@ "{{ port }}|0-1": { "profile" : "egress_lossy_profile" }, - "{{ port }}|2": { - "profile" : "egress_lossless_profile" - }, - "{{ port }}|3-4": { + "{{ port }}|2-4": { "profile" : "egress_lossless_profile" }, "{{ port }}|5": { @@ -37,4 +34,22 @@ {% endfor %} } {% endmacro %} +{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} + "BUFFER_PG": { +{% for port in port_names.split(',') %} +{% if port not in port_names_require_extra_lossless_pgs.split(',') %} + "{{ port }}|2": { + "profile" : "ingress_lossy_profile" + }, + "{{ port }}|6": { + "profile" : "ingress_lossy_profile" + }, +{% endif %} + "{{ port }}|0": { + "profile" : "ingress_lossy_profile" + }{% if not loop.last %},{% endif %} + +{% endfor %} + }, +{% endmacro %} {% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 index 01b5a1dd8b3e..2c962ed017d6 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 @@ -45,8 +45,13 @@ }, {%- endmacro %} +{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} {% import 'buffers_extra_queues.j2' as defs with context %} {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} +{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} +{{ defs.generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) }} +{%- endmacro %} +{% endif %} \ No newline at end of file diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 index 68af36a27518..e195e48e9b47 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 @@ -51,8 +51,10 @@ }, {%- endmacro %} +{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} {% import 'buffers_extra_queues.j2' as defs with context %} {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} +{% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 index f1bbfc532f6e..b021c6e23b5c 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 @@ -7,10 +7,7 @@ "{{ port }}|0-1": { "profile" : "egress_lossy_profile" }, - "{{ port }}|2": { - "profile" : "egress_lossless_profile" - }, - "{{ port }}|3-4": { + "{{ port }}|2-4": { "profile" : "egress_lossless_profile" }, "{{ port }}|5": { @@ -38,4 +35,22 @@ {% endfor %} } {% endmacro %} +{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} + "BUFFER_PG": { +{% for port in port_names.split(',') %} +{% if port not in port_names_require_extra_lossless_pgs.split(',') %} + "{{ port }}|2": { + "profile" : "ingress_lossy_profile" + }, + "{{ port }}|6": { + "profile" : "ingress_lossy_profile" + }, +{% endif %} + "{{ port }}|0": { + "profile" : "ingress_lossy_profile" + }{% if not loop.last %},{% endif %} + +{% endfor %} + }, +{% endmacro %} {% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 index 10b9d70d24bf..39c4beb1a106 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 @@ -53,8 +53,13 @@ }, {%- endmacro %} +{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} {% import 'buffers_extra_queues.j2' as defs with context %} {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} +{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} +{{ defs.generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) }} +{%- endmacro %} +{% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 index 01b5a1dd8b3e..6cf7a4b54003 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 @@ -45,8 +45,13 @@ }, {%- endmacro %} +{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} {% import 'buffers_extra_queues.j2' as defs with context %} {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} +{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} +{{ defs.generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) }} +{%- endmacro %} +{% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 index 1d8fbb3e852f..ca480d7bd9b6 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 @@ -45,8 +45,10 @@ }, {%- endmacro %} +{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} {% import 'buffers_extra_queues.j2' as defs with context %} {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} +{% endif %} diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index ee96ac179c13..ed67fefbc833 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -172,6 +172,10 @@ def {{ defs.generate_pg_profils(port_names_active) }} {% elif defs.generate_pg_profiles_with_inactive_ports is defined %} {{ defs.generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) }}, +{% elif defs.generate_pg_profiles_with_extra_lossy_pgs is defined %} +{{ defs.generate_pg_profiles_with_extra_lossy_pgs(port_names_active, port_names_extra_queues) }} +{% elif defs.generate_pg_profiles_with_extra_lossy_pgs_with_inactive_ports is defined %} +{{ defs.generate_pg_profiles_with_extra_lossy_pgs_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }} {% else %} "BUFFER_PG": { {% for port in PORT_ACTIVE %} diff --git a/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph.xml index 9ffb8230a6bf..6ffea8427ddb 100644 --- a/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph.xml +++ b/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph.xml @@ -2339,6 +2339,14 @@ + + + + TunnelQosRemapEnabled + True + + + diff --git a/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph.xml index 01a42f934726..e1a7d3580594 100644 --- a/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph.xml +++ b/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph.xml @@ -4605,6 +4605,14 @@ + + + + TunnelQosRemapEnabled + True + + + diff --git a/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph.xml index 4367b705a11a..f4f4a349e97e 100644 --- a/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph.xml +++ b/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph.xml @@ -2486,6 +2486,14 @@ + + + + TunnelQosRemapEnabled + True + + + str-7260cx3-acs-7 Arista-7260CX3-C64 diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json index f10fa0ce9e46..4b360ce40fac 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json @@ -1,5 +1,4 @@ - - { +{ "CABLE_LENGTH": { "AZURE": { "Ethernet0": "5m", @@ -121,88 +120,230 @@ "Ethernet100|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet0|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet0|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet0|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet4|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet4|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet4|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet8|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet8|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet12|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet12|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet12|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet16|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet16|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet20|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet20|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet20|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet40|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet40|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet44|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet44|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet44|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet48|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet48|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet52|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet52|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet52|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet56|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet56|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet60|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet60|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet60|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet64|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet64|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet68|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet68|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet68|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet72|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet72|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet76|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet76|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet76|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet80|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet80|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet84|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet84|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet84|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet104|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet104|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet108|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet108|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet108|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet112|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet112|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet116|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet116|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet116|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet120|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet120|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet124|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet124|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet124|0": { "profile" : "ingress_lossy_profile" } }, + "BUFFER_QUEUE": { "Ethernet24|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet24|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet24|3-4": { + "Ethernet24|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet24|5": { @@ -217,10 +358,7 @@ "Ethernet28|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet28|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet28|3-4": { + "Ethernet28|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet28|5": { @@ -235,10 +373,7 @@ "Ethernet32|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet32|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet32|3-4": { + "Ethernet32|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet32|5": { @@ -253,10 +388,7 @@ "Ethernet36|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet36|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet36|3-4": { + "Ethernet36|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet36|5": { @@ -271,10 +403,7 @@ "Ethernet88|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet88|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet88|3-4": { + "Ethernet88|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet88|5": { @@ -289,10 +418,7 @@ "Ethernet92|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet92|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet92|3-4": { + "Ethernet92|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet92|5": { @@ -307,10 +433,7 @@ "Ethernet96|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet96|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet96|3-4": { + "Ethernet96|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet96|5": { @@ -325,10 +448,7 @@ "Ethernet100|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet100|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet100|3-4": { + "Ethernet100|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet100|5": { diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json index d695326e937e..73ec38ce57e5 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json @@ -1,5 +1,4 @@ - - { +{ "CABLE_LENGTH": { "AZURE": { "Ethernet0": "5m", @@ -187,184 +186,518 @@ "Ethernet76|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet0|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet0|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet0|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet4|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet4|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet4|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet8|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet8|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet12|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet12|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet12|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet16|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet16|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet20|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet20|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet20|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet24|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet24|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet28|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet28|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet28|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet32|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet32|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet36|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet36|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet36|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet40|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet40|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet44|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet44|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet44|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet80|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet80|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet84|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet84|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet84|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet88|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet88|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet92|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet92|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet92|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet96|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet96|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet100|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet100|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet100|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet104|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet104|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet108|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet108|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet108|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet112|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet112|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet116|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet116|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet116|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet120|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet120|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet124|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet124|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet124|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet128|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet128|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet128|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet132|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet132|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet132|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet136|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet136|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet136|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet140|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet140|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet140|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet144|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet144|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet144|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet148|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet148|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet148|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet152|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet152|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet152|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet156|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet156|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet156|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet160|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet160|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet160|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet164|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet164|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet164|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet168|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet168|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet168|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet172|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet172|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet172|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet176|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet176|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet176|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet180|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet180|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet180|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet184|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet184|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet184|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet188|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet188|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet188|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet192|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet192|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet192|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet196|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet196|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet196|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet200|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet200|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet200|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet204|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet204|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet204|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet208|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet208|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet208|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet212|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet212|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet212|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet216|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet216|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet216|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet220|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet220|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet220|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet224|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet224|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet224|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet228|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet228|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet228|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet232|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet232|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet232|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet236|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet236|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet236|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet240|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet240|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet240|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet244|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet244|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet244|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet248|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet248|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet248|0": { "profile" : "ingress_lossy_profile" }, + "Ethernet252|2": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet252|6": { + "profile" : "ingress_lossy_profile" + }, "Ethernet252|0": { "profile" : "ingress_lossy_profile" } }, + "BUFFER_QUEUE": { "Ethernet48|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet48|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet48|3-4": { + "Ethernet48|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet48|5": { @@ -379,10 +712,7 @@ "Ethernet52|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet52|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet52|3-4": { + "Ethernet52|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet52|5": { @@ -397,10 +727,7 @@ "Ethernet56|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet56|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet56|3-4": { + "Ethernet56|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet56|5": { @@ -415,10 +742,7 @@ "Ethernet60|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet60|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet60|3-4": { + "Ethernet60|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet60|5": { @@ -433,10 +757,7 @@ "Ethernet64|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet64|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet64|3-4": { + "Ethernet64|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet64|5": { @@ -451,10 +772,7 @@ "Ethernet68|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet68|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet68|3-4": { + "Ethernet68|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet68|5": { @@ -469,10 +787,7 @@ "Ethernet72|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet72|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet72|3-4": { + "Ethernet72|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet72|5": { @@ -487,10 +802,7 @@ "Ethernet76|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet76|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet76|3-4": { + "Ethernet76|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet76|5": { diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json index a47d270411f5..2491d376c771 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1.json @@ -1,5 +1,4 @@ - - { +{ "CABLE_LENGTH": { "AZURE": { "Ethernet0": "300m", @@ -197,10 +196,7 @@ "Ethernet136|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet136|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet136|3-4": { + "Ethernet136|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet136|5": { @@ -233,10 +229,7 @@ "Ethernet144|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet144|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet144|3-4": { + "Ethernet144|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet144|5": { @@ -251,10 +244,7 @@ "Ethernet148|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet148|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet148|3-4": { + "Ethernet148|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet148|5": { @@ -287,10 +277,7 @@ "Ethernet152|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet152|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet152|3-4": { + "Ethernet152|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet152|5": { @@ -305,10 +292,7 @@ "Ethernet156|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet156|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet156|3-4": { + "Ethernet156|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet156|5": { @@ -341,10 +325,7 @@ "Ethernet168|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet168|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet168|3-4": { + "Ethernet168|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet168|5": { @@ -359,10 +340,7 @@ "Ethernet176|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet176|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet176|3-4": { + "Ethernet176|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet176|5": { @@ -395,10 +373,7 @@ "Ethernet180|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet180|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet180|3-4": { + "Ethernet180|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet180|5": { @@ -413,10 +388,7 @@ "Ethernet184|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet184|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet184|3-4": { + "Ethernet184|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet184|5": { @@ -431,10 +403,7 @@ "Ethernet188|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet188|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet188|3-4": { + "Ethernet188|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet188|5": { @@ -449,10 +418,7 @@ "Ethernet200|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet200|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet200|3-4": { + "Ethernet200|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet200|5": { @@ -467,10 +433,7 @@ "Ethernet208|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet208|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet208|3-4": { + "Ethernet208|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet208|5": { @@ -485,10 +448,7 @@ "Ethernet212|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet212|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet212|3-4": { + "Ethernet212|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet212|5": { @@ -503,10 +463,7 @@ "Ethernet216|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet216|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet216|3-4": { + "Ethernet216|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet216|5": { @@ -521,10 +478,7 @@ "Ethernet220|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet220|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet220|3-4": { + "Ethernet220|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet220|5": { @@ -539,10 +493,7 @@ "Ethernet232|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet232|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet232|3-4": { + "Ethernet232|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet232|5": { @@ -557,10 +508,7 @@ "Ethernet240|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet240|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet240|3-4": { + "Ethernet240|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet240|5": { @@ -575,10 +523,7 @@ "Ethernet244|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet244|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet244|3-4": { + "Ethernet244|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet244|5": { @@ -593,10 +538,7 @@ "Ethernet248|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet248|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet248|3-4": { + "Ethernet248|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet248|5": { @@ -611,10 +553,7 @@ "Ethernet252|0-1": { "profile" : "egress_lossy_profile" }, - "Ethernet252|2": { - "profile" : "egress_lossless_profile" - }, - "Ethernet252|3-4": { + "Ethernet252|2-4": { "profile" : "egress_lossless_profile" }, "Ethernet252|5": { From ba5f9aea087cdad968f8bace1db0fdbd2b690edf Mon Sep 17 00:00:00 2001 From: bingwang Date: Mon, 30 May 2022 08:31:53 +0000 Subject: [PATCH 11/15] Rm lossy PG 2 and 6 Signed-off-by: bingwang --- .../buffers_defaults_t0.j2 | 3 - .../buffers_defaults_t0.j2 | 3 - .../buffers_extra_queues.j2 | 18 - .../Arista-7260CX3-C64/buffers_defaults_t0.j2 | 3 - .../buffers_extra_queues.j2 | 18 - .../buffers_defaults_t0.j2 | 3 - .../Arista-7260CX3-Q64/buffers_defaults_t0.j2 | 3 - files/build_templates/buffers_config.j2 | 4 - .../py3/buffer-arista7050cx3-dualtor.json | 144 -------- .../py3/buffer-arista7260-dualtor.json | 336 ------------------ 10 files changed, 535 deletions(-) diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 index 08de030d15c3..3bc156c56c97 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 @@ -51,7 +51,4 @@ {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} -{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} -{{ defs.generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) }} -{%- endmacro %} {% endif %} diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 index ffdb4c993147..580a5ccde5bc 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 @@ -52,7 +52,4 @@ {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} -{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} -{{ defs.generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) }} -{%- endmacro %} {% endif %} diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 index e69ea74007aa..8ec4ad46d667 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2 @@ -34,22 +34,4 @@ {% endfor %} } {% endmacro %} -{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} - "BUFFER_PG": { -{% for port in port_names.split(',') %} -{% if port not in port_names_require_extra_lossless_pgs.split(',') %} - "{{ port }}|2": { - "profile" : "ingress_lossy_profile" - }, - "{{ port }}|6": { - "profile" : "ingress_lossy_profile" - }, -{% endif %} - "{{ port }}|0": { - "profile" : "ingress_lossy_profile" - }{% if not loop.last %},{% endif %} - -{% endfor %} - }, -{% endmacro %} {% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 index 2c962ed017d6..55ca8ecdeedc 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 @@ -51,7 +51,4 @@ {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} -{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} -{{ defs.generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) }} -{%- endmacro %} {% endif %} \ No newline at end of file diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 index b021c6e23b5c..3ad6c5b9bc9e 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2 @@ -35,22 +35,4 @@ {% endfor %} } {% endmacro %} -{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} - "BUFFER_PG": { -{% for port in port_names.split(',') %} -{% if port not in port_names_require_extra_lossless_pgs.split(',') %} - "{{ port }}|2": { - "profile" : "ingress_lossy_profile" - }, - "{{ port }}|6": { - "profile" : "ingress_lossy_profile" - }, -{% endif %} - "{{ port }}|0": { - "profile" : "ingress_lossy_profile" - }{% if not loop.last %},{% endif %} - -{% endfor %} - }, -{% endmacro %} {% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 index 39c4beb1a106..ec36e0649cee 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 @@ -59,7 +59,4 @@ {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} -{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} -{{ defs.generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) }} -{%- endmacro %} {% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 index 6cf7a4b54003..27f9e7521bc4 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 @@ -51,7 +51,4 @@ {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} -{%- macro generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) %} -{{ defs.generate_pg_profiles_with_extra_lossy_pgs(port_names, port_names_require_extra_lossless_pgs) }} -{%- endmacro %} {% endif %} diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index ed67fefbc833..ee96ac179c13 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -172,10 +172,6 @@ def {{ defs.generate_pg_profils(port_names_active) }} {% elif defs.generate_pg_profiles_with_inactive_ports is defined %} {{ defs.generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) }}, -{% elif defs.generate_pg_profiles_with_extra_lossy_pgs is defined %} -{{ defs.generate_pg_profiles_with_extra_lossy_pgs(port_names_active, port_names_extra_queues) }} -{% elif defs.generate_pg_profiles_with_extra_lossy_pgs_with_inactive_ports is defined %} -{{ defs.generate_pg_profiles_with_extra_lossy_pgs_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }} {% else %} "BUFFER_PG": { {% for port in PORT_ACTIVE %} diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json index 4b360ce40fac..02c3a0c6e8df 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor.json @@ -120,219 +120,75 @@ "Ethernet100|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet0|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet0|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet0|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet4|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet4|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet4|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet8|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet8|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet8|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet12|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet12|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet12|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet16|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet16|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet16|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet20|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet20|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet20|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet40|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet40|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet40|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet44|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet44|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet44|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet48|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet48|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet48|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet52|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet52|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet52|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet56|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet56|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet56|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet60|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet60|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet60|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet64|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet64|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet64|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet68|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet68|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet68|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet72|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet72|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet72|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet76|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet76|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet76|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet80|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet80|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet80|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet84|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet84|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet84|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet104|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet104|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet104|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet108|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet108|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet108|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet112|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet112|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet112|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet116|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet116|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet116|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet120|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet120|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet120|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet124|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet124|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet124|0": { "profile" : "ingress_lossy_profile" } diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json index 73ec38ce57e5..32fbfe24370a 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor.json @@ -186,507 +186,171 @@ "Ethernet76|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet0|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet0|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet0|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet4|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet4|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet4|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet8|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet8|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet8|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet12|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet12|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet12|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet16|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet16|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet16|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet20|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet20|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet20|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet24|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet24|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet24|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet28|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet28|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet28|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet32|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet32|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet32|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet36|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet36|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet36|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet40|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet40|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet40|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet44|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet44|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet44|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet80|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet80|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet80|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet84|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet84|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet84|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet88|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet88|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet88|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet92|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet92|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet92|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet96|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet96|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet96|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet100|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet100|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet100|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet104|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet104|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet104|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet108|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet108|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet108|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet112|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet112|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet112|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet116|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet116|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet116|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet120|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet120|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet120|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet124|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet124|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet124|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet128|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet128|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet128|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet132|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet132|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet132|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet136|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet136|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet136|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet140|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet140|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet140|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet144|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet144|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet144|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet148|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet148|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet148|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet152|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet152|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet152|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet156|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet156|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet156|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet160|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet160|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet160|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet164|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet164|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet164|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet168|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet168|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet168|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet172|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet172|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet172|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet176|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet176|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet176|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet180|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet180|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet180|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet184|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet184|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet184|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet188|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet188|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet188|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet192|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet192|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet192|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet196|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet196|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet196|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet200|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet200|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet200|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet204|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet204|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet204|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet208|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet208|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet208|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet212|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet212|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet212|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet216|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet216|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet216|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet220|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet220|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet220|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet224|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet224|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet224|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet228|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet228|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet228|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet232|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet232|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet232|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet236|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet236|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet236|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet240|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet240|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet240|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet244|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet244|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet244|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet248|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet248|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet248|0": { "profile" : "ingress_lossy_profile" }, - "Ethernet252|2": { - "profile" : "ingress_lossy_profile" - }, - "Ethernet252|6": { - "profile" : "ingress_lossy_profile" - }, "Ethernet252|0": { "profile" : "ingress_lossy_profile" } From 4488f9b0c79c0f956bb188812d6c4bd2f72c2520 Mon Sep 17 00:00:00 2001 From: bingwang Date: Tue, 31 May 2022 08:03:05 +0000 Subject: [PATCH 12/15] Add check in buffers_config.j2 Signed-off-by: bingwang --- .../Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 | 2 -- .../Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 | 2 -- .../Arista-7260CX3-C64/buffers_defaults_t0.j2 | 4 +--- .../Arista-7260CX3-C64/buffers_defaults_t1.j2 | 2 -- .../Arista-7260CX3-D108C8/buffers_defaults_t0.j2 | 2 -- .../Arista-7260CX3-Q64/buffers_defaults_t0.j2 | 2 -- .../Arista-7260CX3-Q64/buffers_defaults_t1.j2 | 10 +--------- files/build_templates/buffers_config.j2 | 6 +++--- 8 files changed, 5 insertions(+), 25 deletions(-) diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 index 3bc156c56c97..1a6187edbddd 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2 @@ -45,10 +45,8 @@ }, {%- endmacro %} -{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} {% import 'buffers_extra_queues.j2' as defs with context %} {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} -{% endif %} diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 index 580a5ccde5bc..bfeb2185623a 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2 @@ -46,10 +46,8 @@ }, {%- endmacro %} -{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} {% import 'buffers_extra_queues.j2' as defs with context %} {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} -{% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 index 55ca8ecdeedc..625ca0ab119e 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2 @@ -45,10 +45,8 @@ }, {%- endmacro %} -{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} {% import 'buffers_extra_queues.j2' as defs with context %} {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} -{%- endmacro %} -{% endif %} \ No newline at end of file +{%- endmacro %} \ No newline at end of file diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 index e195e48e9b47..68af36a27518 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2 @@ -51,10 +51,8 @@ }, {%- endmacro %} -{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} {% import 'buffers_extra_queues.j2' as defs with context %} {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} -{% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 index ec36e0649cee..10b9d70d24bf 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2 @@ -53,10 +53,8 @@ }, {%- endmacro %} -{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} {% import 'buffers_extra_queues.j2' as defs with context %} {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} -{% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 index 27f9e7521bc4..01b5a1dd8b3e 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2 @@ -45,10 +45,8 @@ }, {%- endmacro %} -{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} {% import 'buffers_extra_queues.j2' as defs with context %} {%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} {%- endmacro %} -{% endif %} diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 index ca480d7bd9b6..7c95b83763d4 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 @@ -43,12 +43,4 @@ "dynamic_th":"-1" } }, -{%- endmacro %} - -{% if (SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled') %} -{% import 'buffers_extra_queues.j2' as defs with context %} - -{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} -{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} -{%- endmacro %} -{% endif %} +{%- endmacro %} \ No newline at end of file diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index ee96ac179c13..f1685f9c9451 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -130,7 +130,7 @@ def {%- set port_names_list_extra_queues = [] %} {%- for port in PORT_ACTIVE %} - {%- if (defs.generate_queue_buffers_with_extra_lossless_queues is defined or defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined) and + {%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) and (defs.generate_queue_buffers_with_extra_lossless_queues is defined or defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined) and (('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'ToRRouter') or ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'LeafRouter')) %} {%- if port_names_list_extra_queues.append(port) %}{%- endif %} @@ -192,9 +192,9 @@ def {{ defs.generate_queue_buffers(port_names_active) }} {% elif defs.generate_queue_buffers_with_inactive_ports is defined %} {{ defs.generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) }} -{% elif defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined %} +{% elif (defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined) and (port_names_extra_queues != '') %} {{ defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) }} -{% elif defs.generate_queue_buffers_with_extra_lossless_queues is defined %} +{% elif (defs.generate_queue_buffers_with_extra_lossless_queues is defined) and (port_names_extra_queues != '') %} {{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues) }} {% else %} "BUFFER_QUEUE": { From 40a587790d7fd29be7abceac0c29046e7df387e7 Mon Sep 17 00:00:00 2001 From: bingwang Date: Tue, 31 May 2022 08:06:02 +0000 Subject: [PATCH 13/15] Add check in buffers_config.j2 Signed-off-by: bingwang --- .../Arista-7260CX3-Q64/buffers_defaults_t1.j2 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 index 7c95b83763d4..1d8fbb3e852f 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2 @@ -43,4 +43,10 @@ "dynamic_th":"-1" } }, -{%- endmacro %} \ No newline at end of file +{%- endmacro %} + +{% import 'buffers_extra_queues.j2' as defs with context %} + +{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %} +{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }} +{%- endmacro %} From 1f4eff33237c967ed0badc30540e508f0cc5df06 Mon Sep 17 00:00:00 2001 From: bingwang Date: Tue, 31 May 2022 10:28:28 +0000 Subject: [PATCH 14/15] Tests cover remap-disabled Signed-off-by: bingwang --- ...50cx3-dualtor-minigraph-remap-disabled.xml | 2369 +++++++++ ...-7260-dualtor-minigraph-remap-disabled.xml | 4635 +++++++++++++++++ ...rista-7260-t1-minigraph-remap-disabled.xml | 2491 +++++++++ ...-arista7050cx3-dualtor-remap-disabled.json | 487 ++ ...fer-arista7260-dualtor-remap-disabled.json | 937 ++++ .../buffer-arista7260-t1-remap-disabled.json | 449 ++ src/sonic-config-engine/tests/test_j2files.py | 5 +- 7 files changed, 11372 insertions(+), 1 deletion(-) create mode 100644 src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph-remap-disabled.xml create mode 100644 src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph-remap-disabled.xml create mode 100644 src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph-remap-disabled.xml create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor-remap-disabled.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor-remap-disabled.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1-remap-disabled.json diff --git a/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph-remap-disabled.xml b/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph-remap-disabled.xml new file mode 100644 index 000000000000..9ffb8230a6bf --- /dev/null +++ b/src/sonic-config-engine/tests/sample-arista-7050cx3-dualtor-minigraph-remap-disabled.xml @@ -0,0 +1,2369 @@ + + + + + + false + str2-7050cx3-acs-10 + 10.0.0.56 + ARISTA01T1 + 10.0.0.57 + 1 + 10 + 3 + + + str2-7050cx3-acs-10 + FC00::71 + ARISTA01T1 + FC00::72 + 1 + 10 + 3 + + + false + str2-7050cx3-acs-10 + 10.0.0.58 + ARISTA02T1 + 10.0.0.59 + 1 + 10 + 3 + + + str2-7050cx3-acs-10 + FC00::75 + ARISTA02T1 + FC00::76 + 1 + 10 + 3 + + + false + str2-7050cx3-acs-10 + 10.0.0.60 + ARISTA03T1 + 10.0.0.61 + 1 + 10 + 3 + + + str2-7050cx3-acs-10 + FC00::79 + ARISTA03T1 + FC00::7A + 1 + 10 + 3 + + + false + str2-7050cx3-acs-10 + 10.0.0.62 + ARISTA04T1 + 10.0.0.63 + 1 + 10 + 3 + + + str2-7050cx3-acs-10 + FC00::7D + ARISTA04T1 + FC00::7E + 1 + 10 + 3 + + + + + 65100 + str2-7050cx3-acs-10 + + +
10.0.0.57
+ + + + + +
10.0.0.59
+ + + + + +
10.0.0.61
+ + + + + +
10.0.0.63
+ + + + + + BGPPeer +
10.1.0.32
+ + + + BGPSLBPassive + 10.255.0.0/25 + + + BGPPeer +
10.1.0.32
+ + + + BGPVac + 192.168.0.0/21 + + + + + + 64600 + ARISTA01T1 + + + + 64600 + ARISTA02T1 + + + + 64600 + ARISTA03T1 + + + + 64600 + ARISTA04T1 + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.32/32 + + 10.1.0.32/32 + + + HostIP1 + Loopback0 + + FC00:1::32/128 + + FC00:1::32/128 + + + HostIP2 + Loopback1 + + 10.1.0.34/32 + + 10.1.0.34/32 + + + HostIP3 + Loopback1 + + FC00:1::34/128 + + FC00:1::34/128 + + HostIP6 + Loopback3 + + 10.1.0.38/32 + + 10.1.0.38/32 + + + HostIP7 + Loopback3 + + FC00:1::38/128 + + FC00:1::38/128 + + HostIP4 + Loopback2 + + 10.1.0.36/32 + + 10.1.0.36/32 + + + HostIP5 + Loopback2 + + FC00:1::36/128 + + FC00:1::36/128 + + + + HostIP + eth0 + + 10.3.146.122/23 + + 10.3.146.122/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + + str2-7050cx3-acs-10 + + + PortChannel101 + Ethernet7/1;Ethernet8/1 + + + + PortChannel102 + Ethernet9/1;Ethernet10/1 + + + + PortChannel103 + Ethernet23/1;Ethernet24/1 + + + + PortChannel104 + Ethernet25/1;Ethernet26/1 + + + + + + + + + Vlan1000 + Ethernet1/1;Ethernet2/1;Ethernet3/1;Ethernet4/1;Ethernet5/1;Ethernet6/1;Ethernet11/1;Ethernet12/1;Ethernet13/1;Ethernet14/1;Ethernet15/1;Ethernet16/1;Ethernet17/1;Ethernet18/1;Ethernet19/1;Ethernet20/1;Ethernet21/1;Ethernet22/1;Ethernet27/1;Ethernet28/1;Ethernet29/1;Ethernet30/1;Ethernet31/1;Ethernet32/1 + False + 0.0.0.0/0 + 192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48 + fc02:2000::1;fc02:2000::2;fc02:2000::3;fc02:2000::4 + 1000 + 1000 + 192.168.0.0/21 + 00:aa:bb:cc:dd:ee + + + + + + PortChannel101 + 10.0.0.56/31 + + + + PortChannel101 + FC00::71/126 + + + + PortChannel102 + 10.0.0.58/31 + + + + PortChannel102 + FC00::75/126 + + + + PortChannel103 + 10.0.0.60/31 + + + + PortChannel103 + FC00::79/126 + + + + PortChannel104 + 10.0.0.62/31 + + + + PortChannel104 + FC00::7D/126 + + + + Vlan1000 + 192.168.0.1/21 + + + + Vlan1000 + fc02:1000::1/64 + + + + + + NTP_ACL + NTP + NTP + + + SNMP_ACL + SNMP + SNMP + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + VTY_LINE + ssh-only + SSH + + + + + + + + + + DeviceInterfaceLink + ARISTA01T1 + Ethernet1 + str2-7050cx3-acs-10 + Ethernet7/1 + + + DeviceInterfaceLink + ARISTA01T1 + Ethernet2 + str2-7050cx3-acs-10 + Ethernet8/1 + + + DeviceInterfaceLink + ARISTA02T1 + Ethernet1 + str2-7050cx3-acs-10 + Ethernet9/1 + + + DeviceInterfaceLink + ARISTA02T1 + Ethernet2 + str2-7050cx3-acs-10 + Ethernet10/1 + + + DeviceInterfaceLink + ARISTA03T1 + Ethernet1 + str2-7050cx3-acs-10 + Ethernet23/1 + + + DeviceInterfaceLink + ARISTA03T1 + Ethernet2 + str2-7050cx3-acs-10 + Ethernet24/1 + + + DeviceInterfaceLink + ARISTA04T1 + Ethernet1 + str2-7050cx3-acs-10 + Ethernet25/1 + + + DeviceInterfaceLink + ARISTA04T1 + Ethernet2 + str2-7050cx3-acs-10 + Ethernet26/1 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet1/1 + Servers0 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet2/1 + Servers1 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet3/1 + Servers2 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet4/1 + Servers3 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet5/1 + Servers4 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet6/1 + Servers5 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet11/1 + Servers6 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet12/1 + Servers7 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet13/1 + Servers8 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet14/1 + Servers9 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet15/1 + Servers10 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet16/1 + Servers11 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet17/1 + Servers12 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet18/1 + Servers13 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet19/1 + Servers14 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet20/1 + Servers15 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet21/1 + Servers16 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet22/1 + Servers17 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet27/1 + Servers18 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet28/1 + Servers19 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet29/1 + Servers20 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet30/1 + Servers21 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet31/1 + Servers22 + eth0 + + + DeviceInterfaceLink + str2-7050cx3-acs-10 + Ethernet32/1 + Servers23 + eth0 + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet1/1 + str2-7050cx3-acs-10-Servers0-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet2/1 + str2-7050cx3-acs-10-Servers1-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet3/1 + str2-7050cx3-acs-10-Servers2-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet4/1 + str2-7050cx3-acs-10-Servers3-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet5/1 + str2-7050cx3-acs-10-Servers4-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet6/1 + str2-7050cx3-acs-10-Servers5-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet11/1 + str2-7050cx3-acs-10-Servers6-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet12/1 + str2-7050cx3-acs-10-Servers7-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet13/1 + str2-7050cx3-acs-10-Servers8-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet14/1 + str2-7050cx3-acs-10-Servers9-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet15/1 + str2-7050cx3-acs-10-Servers10-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet16/1 + str2-7050cx3-acs-10-Servers11-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet17/1 + str2-7050cx3-acs-10-Servers12-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet18/1 + str2-7050cx3-acs-10-Servers13-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet19/1 + str2-7050cx3-acs-10-Servers14-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet20/1 + str2-7050cx3-acs-10-Servers15-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet21/1 + str2-7050cx3-acs-10-Servers16-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet22/1 + str2-7050cx3-acs-10-Servers17-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet27/1 + str2-7050cx3-acs-10-Servers18-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet28/1 + str2-7050cx3-acs-10-Servers19-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet29/1 + str2-7050cx3-acs-10-Servers20-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet30/1 + str2-7050cx3-acs-10-Servers21-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet31/1 + str2-7050cx3-acs-10-Servers22-SC + U + + + LogicalLink + str2-7050cx3-acs-10 + Ethernet32/1 + str2-7050cx3-acs-10-Servers23-SC + U + + + + + str2-7050cx3-acs-10 + Arista-7050CX3-32S-D48C8 +
+ 10.1.0.32/32 +
+ + FC00:1::32/128 + + + 10.3.146.122 + + + + str2-7050cx3-acs-11 + Arista-7050CX3-32S-D48C8 +
+ 10.1.0.33/32 +
+ + FC00:1::33/128 + + + 10.3.146.127 + + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers0-SC + + + Server +
+ 192.168.0.2/26 +
+ + fc02:1000::2/96 + + + 0.0.0.0/0 + + Servers0 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers1-SC + + + Server +
+ 192.168.0.3/26 +
+ + fc02:1000::3/96 + + + 0.0.0.0/0 + + Servers1 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers2-SC + + + Server +
+ 192.168.0.4/26 +
+ + fc02:1000::4/96 + + + 0.0.0.0/0 + + Servers2 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers3-SC + + + Server +
+ 192.168.0.5/26 +
+ + fc02:1000::5/96 + + + 0.0.0.0/0 + + Servers3 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers4-SC + + + Server +
+ 192.168.0.6/26 +
+ + fc02:1000::6/96 + + + 0.0.0.0/0 + + Servers4 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers5-SC + + + Server +
+ 192.168.0.7/26 +
+ + fc02:1000::7/96 + + + 0.0.0.0/0 + + Servers5 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers6-SC + + + Server +
+ 192.168.0.8/26 +
+ + fc02:1000::8/96 + + + 0.0.0.0/0 + + Servers6 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers7-SC + + + Server +
+ 192.168.0.9/26 +
+ + fc02:1000::9/96 + + + 0.0.0.0/0 + + Servers7 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers8-SC + + + Server +
+ 192.168.0.10/26 +
+ + fc02:1000::a/96 + + + 0.0.0.0/0 + + Servers8 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers9-SC + + + Server +
+ 192.168.0.11/26 +
+ + fc02:1000::b/96 + + + 0.0.0.0/0 + + Servers9 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers10-SC + + + Server +
+ 192.168.0.12/26 +
+ + fc02:1000::c/96 + + + 0.0.0.0/0 + + Servers10 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers11-SC + + + Server +
+ 192.168.0.13/26 +
+ + fc02:1000::d/96 + + + 0.0.0.0/0 + + Servers11 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers12-SC + + + Server +
+ 192.168.0.14/26 +
+ + fc02:1000::e/96 + + + 0.0.0.0/0 + + Servers12 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers13-SC + + + Server +
+ 192.168.0.15/26 +
+ + fc02:1000::f/96 + + + 0.0.0.0/0 + + Servers13 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers14-SC + + + Server +
+ 192.168.0.16/26 +
+ + fc02:1000::10/96 + + + 0.0.0.0/0 + + Servers14 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers15-SC + + + Server +
+ 192.168.0.17/26 +
+ + fc02:1000::11/96 + + + 0.0.0.0/0 + + Servers15 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers16-SC + + + Server +
+ 192.168.0.18/26 +
+ + fc02:1000::12/96 + + + 0.0.0.0/0 + + Servers16 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers17-SC + + + Server +
+ 192.168.0.19/26 +
+ + fc02:1000::13/96 + + + 0.0.0.0/0 + + Servers17 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers18-SC + + + Server +
+ 192.168.0.20/26 +
+ + fc02:1000::14/96 + + + 0.0.0.0/0 + + Servers18 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers19-SC + + + Server +
+ 192.168.0.21/26 +
+ + fc02:1000::15/96 + + + 0.0.0.0/0 + + Servers19 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers20-SC + + + Server +
+ 192.168.0.22/26 +
+ + fc02:1000::16/96 + + + 0.0.0.0/0 + + Servers20 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers21-SC + + + Server +
+ 192.168.0.23/26 +
+ + fc02:1000::17/96 + + + 0.0.0.0/0 + + Servers21 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers22-SC + + + Server +
+ 192.168.0.24/26 +
+ + fc02:1000::18/96 + + + 0.0.0.0/0 + + Servers22 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7050cx3-acs-10-Servers23-SC + + + Server +
+ 192.168.0.25/26 +
+ + fc02:1000::19/96 + + + 0.0.0.0/0 + + Servers23 + + + ARISTA04T1 + + 172.16.142.63 + + Arista-VM + + + ARISTA03T1 + + 172.16.142.62 + + Arista-VM + + + ARISTA02T1 + + 172.16.142.61 + + Arista-VM + + + ARISTA01T1 + + 172.16.142.60 + + Arista-VM + + + + + + true + + + DeviceInterface + + true + true + 1 + Ethernet1/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet1/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet2/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet2/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet3/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet3/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet4/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet4/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet5/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet5/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet6/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet6/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet7/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet8/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet9/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet10/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet11/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet11/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet12/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet12/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet13/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet13/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet14/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet14/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet15/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet15/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet16/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet16/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet17/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet17/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet18/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet18/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet19/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet19/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet20/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet20/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet21/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet21/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet22/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet22/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet23/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet24/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet25/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet26/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet27/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet27/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet28/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet28/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet29/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet29/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet30/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet30/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet31/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet31/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet32/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet32/3 + + false + 0 + 0 + 50000 + + + true + 0 + Arista-7050CX3-32S-D48C8 + + + + + + + str2-7050cx3-acs-10 + + + DeploymentId + + 1 + + + QosProfile + + Profile0 + + + GeminiEnabled + + True + + + DhcpResources + + 192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48 + + + NtpResources + + 10.20.8.129;10.20.8.130 + + + SnmpResources + + 10.3.145.98 + + + SyslogResources + + 10.64.246.95 + + + TacacsGroup + + Starlab + + + TacacsServer + + 100.127.20.21 + + + ForcedMgmtRoutes + + 10.3.145.98/31;10.3.145.8;100.127.20.16/28;10.3.149.170/31;40.122.216.24;13.91.48.226;10.3.145.14;10.64.246.0/24;10.3.146.0/23;10.64.5.5 + + + ErspanDestinationIpv4 + + 10.20.6.16 + + + + + + + + + + + + + GeminiPeeringLink + + True + + + UpperTOR + + str2-7050cx3-acs-10 + + + LowerTOR + + str2-7050cx3-acs-11 + + + str2-7050cx3-acs-11:MuxTunnel0;str2-7050cx3-acs-10:MuxTunnel0 + + + + str2-7050cx3-acs-10 + Arista-7050CX3-32S-D48C8 + diff --git a/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph-remap-disabled.xml b/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph-remap-disabled.xml new file mode 100644 index 000000000000..01a42f934726 --- /dev/null +++ b/src/sonic-config-engine/tests/sample-arista-7260-dualtor-minigraph-remap-disabled.xml @@ -0,0 +1,4635 @@ + + + + + + false + str2-7260cx3-acs-12 + 10.0.0.56 + ARISTA01T1 + 10.0.0.57 + 1 + 10 + 3 + + + str2-7260cx3-acs-12 + FC00::71 + ARISTA01T1 + FC00::72 + 1 + 10 + 3 + + + false + str2-7260cx3-acs-12 + 10.0.0.58 + ARISTA02T1 + 10.0.0.59 + 1 + 10 + 3 + + + str2-7260cx3-acs-12 + FC00::75 + ARISTA02T1 + FC00::76 + 1 + 10 + 3 + + + false + str2-7260cx3-acs-12 + 10.0.0.60 + ARISTA03T1 + 10.0.0.61 + 1 + 10 + 3 + + + str2-7260cx3-acs-12 + FC00::79 + ARISTA03T1 + FC00::7A + 1 + 10 + 3 + + + false + str2-7260cx3-acs-12 + 10.0.0.62 + ARISTA04T1 + 10.0.0.63 + 1 + 10 + 3 + + + str2-7260cx3-acs-12 + FC00::7D + ARISTA04T1 + FC00::7E + 1 + 10 + 3 + + + + + 65100 + str2-7260cx3-acs-12 + + +
10.0.0.57
+ + + + + +
10.0.0.59
+ + + + + +
10.0.0.61
+ + + + + +
10.0.0.63
+ + + + + + BGPPeer +
10.1.0.32
+ + + + BGPSLBPassive + 10.255.0.0/25 + + + BGPPeer +
10.1.0.32
+ + + + BGPVac + 192.168.0.0/21 + + + + + + 64600 + ARISTA01T1 + + + + 64600 + ARISTA02T1 + + + + 64600 + ARISTA03T1 + + + + 64600 + ARISTA04T1 + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.32/32 + + 10.1.0.32/32 + + + HostIP1 + Loopback0 + + FC00:1::32/128 + + FC00:1::32/128 + + + HostIP2 + Loopback1 + + 10.1.0.34/32 + + 10.1.0.34/32 + + + HostIP3 + Loopback1 + + FC00:1::34/128 + + FC00:1::34/128 + + HostIP6 + Loopback3 + + 10.1.0.38/32 + + 10.1.0.38/32 + + + HostIP7 + Loopback3 + + FC00:1::38/128 + + FC00:1::38/128 + + HostIP4 + Loopback2 + + 10.1.0.36/32 + + 10.1.0.36/32 + + + HostIP5 + Loopback2 + + FC00:1::36/128 + + FC00:1::36/128 + + + + HostIP + eth0 + + 10.3.147.165/23 + + 10.3.147.165/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + + str2-7260cx3-acs-12 + + + PortChannel101 + Ethernet13/1;Ethernet14/1 + + + + PortChannel102 + Ethernet15/1;Ethernet16/1 + + + + PortChannel103 + Ethernet17/1;Ethernet18/1 + + + + PortChannel104 + Ethernet19/1;Ethernet20/1 + + + + + + + + + Vlan1000 + Ethernet1/1;Ethernet2/1;Ethernet3/1;Ethernet4/1;Ethernet5/1;Ethernet6/1;Ethernet7/1;Ethernet8/1;Ethernet9/1;Ethernet10/1;Ethernet11/1;Ethernet12/1;Ethernet21/1;Ethernet22/1;Ethernet23/1;Ethernet24/1;Ethernet25/1;Ethernet26/1;Ethernet27/1;Ethernet28/1;Ethernet29/1;Ethernet30/1;Ethernet31/1;Ethernet32/1;Ethernet33/1;Ethernet34/1;Ethernet35/1;Ethernet36/1;Ethernet37/1;Ethernet38/1;Ethernet39/1;Ethernet40/1;Ethernet41/1;Ethernet42/1;Ethernet43/1;Ethernet44/1;Ethernet45/1;Ethernet46/1;Ethernet47/1;Ethernet48/1;Ethernet49/1;Ethernet50/1;Ethernet51/1;Ethernet52/1;Ethernet53/1;Ethernet54/1;Ethernet55/1;Ethernet56/1;Ethernet57/1;Ethernet58/1;Ethernet59/1;Ethernet60/1;Ethernet61/1;Ethernet62/1;Ethernet63/1;Ethernet64/1 + False + 0.0.0.0/0 + 192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48 + fc02:2000::1;fc02:2000::2;fc02:2000::3;fc02:2000::4 + 1000 + 1000 + 192.168.0.0/21 + 00:aa:bb:cc:dd:ee + + + + + + PortChannel101 + 10.0.0.56/31 + + + + PortChannel101 + FC00::71/126 + + + + PortChannel102 + 10.0.0.58/31 + + + + PortChannel102 + FC00::75/126 + + + + PortChannel103 + 10.0.0.60/31 + + + + PortChannel103 + FC00::79/126 + + + + PortChannel104 + 10.0.0.62/31 + + + + PortChannel104 + FC00::7D/126 + + + + Vlan1000 + 192.168.0.1/21 + + + + Vlan1000 + fc02:1000::1/64 + + + + + + NTP_ACL + NTP + NTP + + + SNMP_ACL + SNMP + SNMP + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + VTY_LINE + ssh-only + SSH + + + + + + + + + + DeviceInterfaceLink + ARISTA01T1 + Ethernet1 + str2-7260cx3-acs-12 + Ethernet13/1 + + + DeviceInterfaceLink + ARISTA01T1 + Ethernet2 + str2-7260cx3-acs-12 + Ethernet14/1 + + + DeviceInterfaceLink + ARISTA02T1 + Ethernet1 + str2-7260cx3-acs-12 + Ethernet15/1 + + + DeviceInterfaceLink + ARISTA02T1 + Ethernet2 + str2-7260cx3-acs-12 + Ethernet16/1 + + + DeviceInterfaceLink + ARISTA03T1 + Ethernet1 + str2-7260cx3-acs-12 + Ethernet17/1 + + + DeviceInterfaceLink + ARISTA03T1 + Ethernet2 + str2-7260cx3-acs-12 + Ethernet18/1 + + + DeviceInterfaceLink + ARISTA04T1 + Ethernet1 + str2-7260cx3-acs-12 + Ethernet19/1 + + + DeviceInterfaceLink + ARISTA04T1 + Ethernet2 + str2-7260cx3-acs-12 + Ethernet20/1 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet1/1 + Servers0 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet2/1 + Servers1 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet3/1 + Servers2 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet4/1 + Servers3 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet5/1 + Servers4 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet6/1 + Servers5 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet7/1 + Servers6 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet8/1 + Servers7 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet9/1 + Servers8 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet10/1 + Servers9 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet11/1 + Servers10 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet12/1 + Servers11 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet21/1 + Servers12 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet22/1 + Servers13 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet23/1 + Servers14 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet24/1 + Servers15 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet25/1 + Servers16 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet26/1 + Servers17 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet27/1 + Servers18 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet28/1 + Servers19 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet29/1 + Servers20 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet30/1 + Servers21 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet31/1 + Servers22 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet32/1 + Servers23 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet33/1 + Servers24 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet34/1 + Servers25 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet35/1 + Servers26 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet36/1 + Servers27 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet37/1 + Servers28 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet38/1 + Servers29 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet39/1 + Servers30 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet40/1 + Servers31 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet41/1 + Servers32 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet42/1 + Servers33 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet43/1 + Servers34 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet44/1 + Servers35 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet45/1 + Servers36 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet46/1 + Servers37 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet47/1 + Servers38 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet48/1 + Servers39 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet49/1 + Servers40 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet50/1 + Servers41 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet51/1 + Servers42 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet52/1 + Servers43 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet53/1 + Servers44 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet54/1 + Servers45 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet55/1 + Servers46 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet56/1 + Servers47 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet57/1 + Servers48 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet58/1 + Servers49 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet59/1 + Servers50 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet60/1 + Servers51 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet61/1 + Servers52 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet62/1 + Servers53 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet63/1 + Servers54 + eth0 + + + DeviceInterfaceLink + str2-7260cx3-acs-12 + Ethernet64/1 + Servers55 + eth0 + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet1/1 + str2-7260cx3-acs-12-Servers0-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet2/1 + str2-7260cx3-acs-12-Servers1-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet3/1 + str2-7260cx3-acs-12-Servers2-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet4/1 + str2-7260cx3-acs-12-Servers3-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet5/1 + str2-7260cx3-acs-12-Servers4-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet6/1 + str2-7260cx3-acs-12-Servers5-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet7/1 + str2-7260cx3-acs-12-Servers6-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet8/1 + str2-7260cx3-acs-12-Servers7-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet9/1 + str2-7260cx3-acs-12-Servers8-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet10/1 + str2-7260cx3-acs-12-Servers9-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet11/1 + str2-7260cx3-acs-12-Servers10-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet12/1 + str2-7260cx3-acs-12-Servers11-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet21/1 + str2-7260cx3-acs-12-Servers12-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet22/1 + str2-7260cx3-acs-12-Servers13-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet23/1 + str2-7260cx3-acs-12-Servers14-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet24/1 + str2-7260cx3-acs-12-Servers15-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet25/1 + str2-7260cx3-acs-12-Servers16-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet26/1 + str2-7260cx3-acs-12-Servers17-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet27/1 + str2-7260cx3-acs-12-Servers18-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet28/1 + str2-7260cx3-acs-12-Servers19-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet29/1 + str2-7260cx3-acs-12-Servers20-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet30/1 + str2-7260cx3-acs-12-Servers21-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet31/1 + str2-7260cx3-acs-12-Servers22-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet32/1 + str2-7260cx3-acs-12-Servers23-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet33/1 + str2-7260cx3-acs-12-Servers24-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet34/1 + str2-7260cx3-acs-12-Servers25-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet35/1 + str2-7260cx3-acs-12-Servers26-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet36/1 + str2-7260cx3-acs-12-Servers27-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet37/1 + str2-7260cx3-acs-12-Servers28-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet38/1 + str2-7260cx3-acs-12-Servers29-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet39/1 + str2-7260cx3-acs-12-Servers30-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet40/1 + str2-7260cx3-acs-12-Servers31-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet41/1 + str2-7260cx3-acs-12-Servers32-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet42/1 + str2-7260cx3-acs-12-Servers33-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet43/1 + str2-7260cx3-acs-12-Servers34-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet44/1 + str2-7260cx3-acs-12-Servers35-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet45/1 + str2-7260cx3-acs-12-Servers36-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet46/1 + str2-7260cx3-acs-12-Servers37-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet47/1 + str2-7260cx3-acs-12-Servers38-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet48/1 + str2-7260cx3-acs-12-Servers39-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet49/1 + str2-7260cx3-acs-12-Servers40-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet50/1 + str2-7260cx3-acs-12-Servers41-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet51/1 + str2-7260cx3-acs-12-Servers42-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet52/1 + str2-7260cx3-acs-12-Servers43-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet53/1 + str2-7260cx3-acs-12-Servers44-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet54/1 + str2-7260cx3-acs-12-Servers45-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet55/1 + str2-7260cx3-acs-12-Servers46-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet56/1 + str2-7260cx3-acs-12-Servers47-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet57/1 + str2-7260cx3-acs-12-Servers48-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet58/1 + str2-7260cx3-acs-12-Servers49-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet59/1 + str2-7260cx3-acs-12-Servers50-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet60/1 + str2-7260cx3-acs-12-Servers51-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet61/1 + str2-7260cx3-acs-12-Servers52-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet62/1 + str2-7260cx3-acs-12-Servers53-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet63/1 + str2-7260cx3-acs-12-Servers54-SC + U + + + LogicalLink + str2-7260cx3-acs-12 + Ethernet64/1 + str2-7260cx3-acs-12-Servers55-SC + U + + + + + str2-7260cx3-acs-12 + Arista-7260CX3-D108C8 +
+ 10.1.0.32/32 +
+ + FC00:1::32/128 + + + 10.3.147.165 + + + + str2-7260cx3-acs-13 + Arista-7260CX3-D108C8 +
+ 10.1.0.33/32 +
+ + FC00:1::33/128 + + + 10.3.147.167 + + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers0-SC + + + Server +
+ 192.168.0.2/26 +
+ + fc02:1000::2/96 + + + 0.0.0.0/0 + + Servers0 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers1-SC + + + Server +
+ 192.168.0.3/26 +
+ + fc02:1000::3/96 + + + 0.0.0.0/0 + + Servers1 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers2-SC + + + Server +
+ 192.168.0.4/26 +
+ + fc02:1000::4/96 + + + 0.0.0.0/0 + + Servers2 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers3-SC + + + Server +
+ 192.168.0.5/26 +
+ + fc02:1000::5/96 + + + 0.0.0.0/0 + + Servers3 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers4-SC + + + Server +
+ 192.168.0.6/26 +
+ + fc02:1000::6/96 + + + 0.0.0.0/0 + + Servers4 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers5-SC + + + Server +
+ 192.168.0.7/26 +
+ + fc02:1000::7/96 + + + 0.0.0.0/0 + + Servers5 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers6-SC + + + Server +
+ 192.168.0.8/26 +
+ + fc02:1000::8/96 + + + 0.0.0.0/0 + + Servers6 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers7-SC + + + Server +
+ 192.168.0.9/26 +
+ + fc02:1000::9/96 + + + 0.0.0.0/0 + + Servers7 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers8-SC + + + Server +
+ 192.168.0.10/26 +
+ + fc02:1000::a/96 + + + 0.0.0.0/0 + + Servers8 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers9-SC + + + Server +
+ 192.168.0.11/26 +
+ + fc02:1000::b/96 + + + 0.0.0.0/0 + + Servers9 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers10-SC + + + Server +
+ 192.168.0.12/26 +
+ + fc02:1000::c/96 + + + 0.0.0.0/0 + + Servers10 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers11-SC + + + Server +
+ 192.168.0.13/26 +
+ + fc02:1000::d/96 + + + 0.0.0.0/0 + + Servers11 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers12-SC + + + Server +
+ 192.168.0.14/26 +
+ + fc02:1000::e/96 + + + 0.0.0.0/0 + + Servers12 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers13-SC + + + Server +
+ 192.168.0.15/26 +
+ + fc02:1000::f/96 + + + 0.0.0.0/0 + + Servers13 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers14-SC + + + Server +
+ 192.168.0.16/26 +
+ + fc02:1000::10/96 + + + 0.0.0.0/0 + + Servers14 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers15-SC + + + Server +
+ 192.168.0.17/26 +
+ + fc02:1000::11/96 + + + 0.0.0.0/0 + + Servers15 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers16-SC + + + Server +
+ 192.168.0.18/26 +
+ + fc02:1000::12/96 + + + 0.0.0.0/0 + + Servers16 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers17-SC + + + Server +
+ 192.168.0.19/26 +
+ + fc02:1000::13/96 + + + 0.0.0.0/0 + + Servers17 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers18-SC + + + Server +
+ 192.168.0.20/26 +
+ + fc02:1000::14/96 + + + 0.0.0.0/0 + + Servers18 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers19-SC + + + Server +
+ 192.168.0.21/26 +
+ + fc02:1000::15/96 + + + 0.0.0.0/0 + + Servers19 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers20-SC + + + Server +
+ 192.168.0.22/26 +
+ + fc02:1000::16/96 + + + 0.0.0.0/0 + + Servers20 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers21-SC + + + Server +
+ 192.168.0.23/26 +
+ + fc02:1000::17/96 + + + 0.0.0.0/0 + + Servers21 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers22-SC + + + Server +
+ 192.168.0.24/26 +
+ + fc02:1000::18/96 + + + 0.0.0.0/0 + + Servers22 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers23-SC + + + Server +
+ 192.168.0.25/26 +
+ + fc02:1000::19/96 + + + 0.0.0.0/0 + + Servers23 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers24-SC + + + Server +
+ 192.168.0.26/26 +
+ + fc02:1000::1a/96 + + + 0.0.0.0/0 + + Servers24 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers25-SC + + + Server +
+ 192.168.0.27/26 +
+ + fc02:1000::1b/96 + + + 0.0.0.0/0 + + Servers25 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers26-SC + + + Server +
+ 192.168.0.28/26 +
+ + fc02:1000::1c/96 + + + 0.0.0.0/0 + + Servers26 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers27-SC + + + Server +
+ 192.168.0.29/26 +
+ + fc02:1000::1d/96 + + + 0.0.0.0/0 + + Servers27 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers28-SC + + + Server +
+ 192.168.0.30/26 +
+ + fc02:1000::1e/96 + + + 0.0.0.0/0 + + Servers28 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers29-SC + + + Server +
+ 192.168.0.31/26 +
+ + fc02:1000::1f/96 + + + 0.0.0.0/0 + + Servers29 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers30-SC + + + Server +
+ 192.168.0.32/26 +
+ + fc02:1000::20/96 + + + 0.0.0.0/0 + + Servers30 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers31-SC + + + Server +
+ 192.168.0.33/26 +
+ + fc02:1000::21/96 + + + 0.0.0.0/0 + + Servers31 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers32-SC + + + Server +
+ 192.168.0.34/26 +
+ + fc02:1000::22/96 + + + 0.0.0.0/0 + + Servers32 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers33-SC + + + Server +
+ 192.168.0.35/26 +
+ + fc02:1000::23/96 + + + 0.0.0.0/0 + + Servers33 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers34-SC + + + Server +
+ 192.168.0.36/26 +
+ + fc02:1000::24/96 + + + 0.0.0.0/0 + + Servers34 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers35-SC + + + Server +
+ 192.168.0.37/26 +
+ + fc02:1000::25/96 + + + 0.0.0.0/0 + + Servers35 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers36-SC + + + Server +
+ 192.168.0.38/26 +
+ + fc02:1000::26/96 + + + 0.0.0.0/0 + + Servers36 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers37-SC + + + Server +
+ 192.168.0.39/26 +
+ + fc02:1000::27/96 + + + 0.0.0.0/0 + + Servers37 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers38-SC + + + Server +
+ 192.168.0.40/26 +
+ + fc02:1000::28/96 + + + 0.0.0.0/0 + + Servers38 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers39-SC + + + Server +
+ 192.168.0.41/26 +
+ + fc02:1000::29/96 + + + 0.0.0.0/0 + + Servers39 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers40-SC + + + Server +
+ 192.168.0.42/26 +
+ + fc02:1000::2a/96 + + + 0.0.0.0/0 + + Servers40 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers41-SC + + + Server +
+ 192.168.0.43/26 +
+ + fc02:1000::2b/96 + + + 0.0.0.0/0 + + Servers41 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers42-SC + + + Server +
+ 192.168.0.44/26 +
+ + fc02:1000::2c/96 + + + 0.0.0.0/0 + + Servers42 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers43-SC + + + Server +
+ 192.168.0.45/26 +
+ + fc02:1000::2d/96 + + + 0.0.0.0/0 + + Servers43 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers44-SC + + + Server +
+ 192.168.0.46/26 +
+ + fc02:1000::2e/96 + + + 0.0.0.0/0 + + Servers44 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers45-SC + + + Server +
+ 192.168.0.47/26 +
+ + fc02:1000::2f/96 + + + 0.0.0.0/0 + + Servers45 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers46-SC + + + Server +
+ 192.168.0.48/26 +
+ + fc02:1000::30/96 + + + 0.0.0.0/0 + + Servers46 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers47-SC + + + Server +
+ 192.168.0.49/26 +
+ + fc02:1000::31/96 + + + 0.0.0.0/0 + + Servers47 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers48-SC + + + Server +
+ 192.168.0.50/26 +
+ + fc02:1000::32/96 + + + 0.0.0.0/0 + + Servers48 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers49-SC + + + Server +
+ 192.168.0.51/26 +
+ + fc02:1000::33/96 + + + 0.0.0.0/0 + + Servers49 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers50-SC + + + Server +
+ 192.168.0.52/26 +
+ + fc02:1000::34/96 + + + 0.0.0.0/0 + + Servers50 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers51-SC + + + Server +
+ 192.168.0.53/26 +
+ + fc02:1000::35/96 + + + 0.0.0.0/0 + + Servers51 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers52-SC + + + Server +
+ 192.168.0.54/26 +
+ + fc02:1000::36/96 + + + 0.0.0.0/0 + + Servers52 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers53-SC + + + Server +
+ 192.168.0.55/26 +
+ + fc02:1000::37/96 + + + 0.0.0.0/0 + + Servers53 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers54-SC + + + Server +
+ 192.168.0.56/26 +
+ + fc02:1000::38/96 + + + 0.0.0.0/0 + + Servers54 + + + SmartCable +
+ 0.0.0.0/0 +
+ + ::/0 + + + 0.0.0.0/0 + + + ::/0 + + + str2-7260cx3-acs-12-Servers55-SC + + + Server +
+ 192.168.0.57/26 +
+ + fc02:1000::39/96 + + + 0.0.0.0/0 + + Servers55 + + + ARISTA04T1 + + 172.16.147.75 + + Arista-VM + + + ARISTA03T1 + + 172.16.147.74 + + Arista-VM + + + ARISTA02T1 + + 172.16.147.73 + + Arista-VM + + + ARISTA01T1 + + 172.16.147.72 + + Arista-VM + + + + + + true + + + DeviceInterface + + true + true + 1 + Ethernet1/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet1/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet2/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet2/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet3/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet3/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet4/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet4/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet5/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet5/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet6/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet6/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet7/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet7/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet8/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet8/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet9/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet9/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet10/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet10/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet11/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet11/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet12/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet12/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet13/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet14/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet15/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet16/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet17/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet18/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet19/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet20/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet21/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet21/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet22/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet22/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet23/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet23/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet24/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet24/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet25/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet25/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet26/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet26/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet27/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet27/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet28/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet28/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet29/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet29/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet30/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet30/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet31/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet31/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet32/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet32/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet33/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet33/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet34/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet34/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet35/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet35/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet36/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet36/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet37/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet37/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet38/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet38/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet39/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet39/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet40/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet40/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet41/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet41/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet42/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet42/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet43/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet43/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet44/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet44/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet45/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet45/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet46/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet46/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet47/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet47/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet48/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet48/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet49/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet49/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet50/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet50/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet51/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet51/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet52/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet52/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet53/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet53/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet54/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet54/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet55/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet55/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet56/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet56/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet57/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet57/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet58/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet58/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet59/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet59/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet60/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet60/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet61/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet61/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet62/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet62/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet63/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet63/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet64/1 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet64/3 + + false + 0 + 0 + 50000 + + + DeviceInterface + + true + true + 1 + Ethernet65 + + false + 0 + 0 + 10000 + + + DeviceInterface + + true + true + 1 + Ethernet66 + + false + 0 + 0 + 10000 + + + true + 0 + Arista-7260CX3-D108C8 + + + + + + + str2-7260cx3-acs-12 + + + DeploymentId + + 1 + + + QosProfile + + Profile0 + + + GeminiEnabled + + True + + + DhcpResources + + 192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48 + + + NtpResources + + 10.20.8.129;10.20.8.130 + + + SnmpResources + + 10.3.145.98 + + + SyslogResources + + 10.64.246.95 + + + TacacsGroup + + Starlab + + + TacacsServer + + 100.127.20.21 + + + ForcedMgmtRoutes + + 10.3.145.98/31;10.3.145.8;100.127.20.16/28;10.3.149.170/31;40.122.216.24;13.91.48.226;10.3.145.14;10.64.246.0/24;10.3.146.0/23;10.64.5.5 + + + ErspanDestinationIpv4 + + 10.20.6.16 + + + + + + + + + + + + + GeminiPeeringLink + + True + + + UpperTOR + + str2-7260cx3-acs-12 + + + LowerTOR + + str2-7260cx3-acs-13 + + + str2-7260cx3-acs-13:MuxTunnel0;str2-7260cx3-acs-12:MuxTunnel0 + + + + str2-7260cx3-acs-12 + Arista-7260CX3-D108C8 + diff --git a/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph-remap-disabled.xml b/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph-remap-disabled.xml new file mode 100644 index 000000000000..4367b705a11a --- /dev/null +++ b/src/sonic-config-engine/tests/sample-arista-7260-t1-minigraph-remap-disabled.xml @@ -0,0 +1,2491 @@ + + + + + + false + str-7260cx3-acs-7 + 10.0.0.32 + ARISTA01T0 + 10.0.0.33 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::41 + ARISTA01T0 + FC00::42 + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.0 + ARISTA01T2 + 10.0.0.1 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::1 + ARISTA01T2 + FC00::2 + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.34 + ARISTA02T0 + 10.0.0.35 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::45 + ARISTA02T0 + FC00::46 + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.36 + ARISTA03T0 + 10.0.0.37 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::49 + ARISTA03T0 + FC00::4A + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.4 + ARISTA03T2 + 10.0.0.5 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::5 + ARISTA03T2 + FC00::6 + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.38 + ARISTA04T0 + 10.0.0.39 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::4D + ARISTA04T0 + FC00::4E + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.40 + ARISTA05T0 + 10.0.0.41 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::51 + ARISTA05T0 + FC00::52 + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.8 + ARISTA05T2 + 10.0.0.9 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::9 + ARISTA05T2 + FC00::A + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.42 + ARISTA06T0 + 10.0.0.43 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::55 + ARISTA06T0 + FC00::56 + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.44 + ARISTA07T0 + 10.0.0.45 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::59 + ARISTA07T0 + FC00::5A + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.12 + ARISTA07T2 + 10.0.0.13 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::D + ARISTA07T2 + FC00::E + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.46 + ARISTA08T0 + 10.0.0.47 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::5D + ARISTA08T0 + FC00::5E + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.48 + ARISTA09T0 + 10.0.0.49 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::61 + ARISTA09T0 + FC00::62 + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.50 + ARISTA10T0 + 10.0.0.51 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::65 + ARISTA10T0 + FC00::66 + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.52 + ARISTA11T0 + 10.0.0.53 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::69 + ARISTA11T0 + FC00::6A + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.54 + ARISTA12T0 + 10.0.0.55 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::6D + ARISTA12T0 + FC00::6E + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.56 + ARISTA13T0 + 10.0.0.57 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::71 + ARISTA13T0 + FC00::72 + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.58 + ARISTA14T0 + 10.0.0.59 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::75 + ARISTA14T0 + FC00::76 + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.60 + ARISTA15T0 + 10.0.0.61 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::79 + ARISTA15T0 + FC00::7A + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.62 + ARISTA16T0 + 10.0.0.63 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::7D + ARISTA16T0 + FC00::7E + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.64 + ARISTA17T0 + 10.0.0.65 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::81 + ARISTA17T0 + FC00::82 + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.66 + ARISTA18T0 + 10.0.0.67 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::85 + ARISTA18T0 + FC00::86 + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.68 + ARISTA19T0 + 10.0.0.69 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::89 + ARISTA19T0 + FC00::8A + 1 + 10 + 3 + + + false + str-7260cx3-acs-7 + 10.0.0.70 + ARISTA20T0 + 10.0.0.71 + 1 + 10 + 3 + + + str-7260cx3-acs-7 + FC00::8D + ARISTA20T0 + FC00::8E + 1 + 10 + 3 + + + + + 65100 + str-7260cx3-acs-7 + + +
10.0.0.33
+ + + + + +
10.0.0.1
+ + + + + +
10.0.0.35
+ + + + + +
10.0.0.37
+ + + + + +
10.0.0.5
+ + + + + +
10.0.0.39
+ + + + + +
10.0.0.41
+ + + + + +
10.0.0.9
+ + + + + +
10.0.0.43
+ + + + + +
10.0.0.45
+ + + + + +
10.0.0.13
+ + + + + +
10.0.0.47
+ + + + + +
10.0.0.49
+ + + + + +
10.0.0.51
+ + + + + +
10.0.0.53
+ + + + + +
10.0.0.55
+ + + + + +
10.0.0.57
+ + + + + +
10.0.0.59
+ + + + + +
10.0.0.61
+ + + + + +
10.0.0.63
+ + + + + +
10.0.0.65
+ + + + + +
10.0.0.67
+ + + + + +
10.0.0.69
+ + + + + +
10.0.0.71
+ + + + + + + + + 64001 + ARISTA01T0 + + + + 65200 + ARISTA01T2 + + + + 64002 + ARISTA02T0 + + + + 64003 + ARISTA03T0 + + + + 65200 + ARISTA03T2 + + + + 64004 + ARISTA04T0 + + + + 64005 + ARISTA05T0 + + + + 65200 + ARISTA05T2 + + + + 64006 + ARISTA06T0 + + + + 64007 + ARISTA07T0 + + + + 65200 + ARISTA07T2 + + + + 64008 + ARISTA08T0 + + + + 64009 + ARISTA09T0 + + + + 64010 + ARISTA10T0 + + + + 64011 + ARISTA11T0 + + + + 64012 + ARISTA12T0 + + + + 64013 + ARISTA13T0 + + + + 64014 + ARISTA14T0 + + + + 64015 + ARISTA15T0 + + + + 64016 + ARISTA16T0 + + + + 64017 + ARISTA17T0 + + + + 64018 + ARISTA18T0 + + + + 64019 + ARISTA19T0 + + + + 64020 + ARISTA20T0 + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.32/32 + + 10.1.0.32/32 + + + HostIP1 + Loopback0 + + FC00:1::32/128 + + FC00:1::32/128 + + + + + HostIP + eth0 + + 10.64.246.78/23 + + 10.64.246.78/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + + str-7260cx3-acs-7 + + + PortChannel101 + Ethernet35/1 + + + + PortChannel102 + Ethernet1/1;Ethernet2/1 + + + + PortChannel103 + Ethernet37/1 + + + + PortChannel104 + Ethernet38/1 + + + + PortChannel105 + Ethernet5/1;Ethernet6/1 + + + + PortChannel106 + Ethernet39/1 + + + + PortChannel107 + Ethernet40/1 + + + + PortChannel108 + Ethernet17/1;Ethernet18/1 + + + + PortChannel109 + Ethernet43/1 + + + + PortChannel1010 + Ethernet45/1 + + + + PortChannel1011 + Ethernet21/1;Ethernet22/1 + + + + PortChannel1012 + Ethernet46/1 + + + + PortChannel1013 + Ethernet47/1 + + + + PortChannel1014 + Ethernet48/1 + + + + PortChannel1015 + Ethernet51/1 + + + + PortChannel1016 + Ethernet53/1 + + + + PortChannel1017 + Ethernet54/1 + + + + PortChannel1018 + Ethernet55/1 + + + + PortChannel1019 + Ethernet56/1 + + + + PortChannel1020 + Ethernet59/1 + + + + PortChannel1021 + Ethernet61/1 + + + + PortChannel1022 + Ethernet62/1 + + + + PortChannel1023 + Ethernet63/1 + + + + PortChannel1024 + Ethernet64/1 + + + + + + + + + PortChannel101 + 10.0.0.32/31 + + + + PortChannel101 + FC00::41/126 + + + + PortChannel102 + 10.0.0.0/31 + + + + PortChannel102 + FC00::1/126 + + + + PortChannel103 + 10.0.0.34/31 + + + + PortChannel103 + FC00::45/126 + + + + PortChannel104 + 10.0.0.36/31 + + + + PortChannel104 + FC00::49/126 + + + + PortChannel105 + 10.0.0.4/31 + + + + PortChannel105 + FC00::5/126 + + + + PortChannel106 + 10.0.0.38/31 + + + + PortChannel106 + FC00::4D/126 + + + + PortChannel107 + 10.0.0.40/31 + + + + PortChannel107 + FC00::51/126 + + + + PortChannel108 + 10.0.0.8/31 + + + + PortChannel108 + FC00::9/126 + + + + PortChannel109 + 10.0.0.42/31 + + + + PortChannel109 + FC00::55/126 + + + + PortChannel1010 + 10.0.0.44/31 + + + + PortChannel1010 + FC00::59/126 + + + + PortChannel1011 + 10.0.0.12/31 + + + + PortChannel1011 + FC00::D/126 + + + + PortChannel1012 + 10.0.0.46/31 + + + + PortChannel1012 + FC00::5D/126 + + + + PortChannel1013 + 10.0.0.48/31 + + + + PortChannel1013 + FC00::61/126 + + + + PortChannel1014 + 10.0.0.50/31 + + + + PortChannel1014 + FC00::65/126 + + + + PortChannel1015 + 10.0.0.52/31 + + + + PortChannel1015 + FC00::69/126 + + + + PortChannel1016 + 10.0.0.54/31 + + + + PortChannel1016 + FC00::6D/126 + + + + PortChannel1017 + 10.0.0.56/31 + + + + PortChannel1017 + FC00::71/126 + + + + PortChannel1018 + 10.0.0.58/31 + + + + PortChannel1018 + FC00::75/126 + + + + PortChannel1019 + 10.0.0.60/31 + + + + PortChannel1019 + FC00::79/126 + + + + PortChannel1020 + 10.0.0.62/31 + + + + PortChannel1020 + FC00::7D/126 + + + + PortChannel1021 + 10.0.0.64/31 + + + + PortChannel1021 + FC00::81/126 + + + + PortChannel1022 + 10.0.0.66/31 + + + + PortChannel1022 + FC00::85/126 + + + + PortChannel1023 + 10.0.0.68/31 + + + + PortChannel1023 + FC00::89/126 + + + + PortChannel1024 + 10.0.0.70/31 + + + + PortChannel1024 + FC00::8D/126 + + + + + + NTP_ACL + NTP + NTP + + + SNMP_ACL + SNMP + SNMP + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + VTY_LINE + ssh-only + SSH + + + PortChannel101;PortChannel102;PortChannel103;PortChannel104;PortChannel105;PortChannel106;PortChannel107;PortChannel108;PortChannel109;PortChannel1010;PortChannel1011;PortChannel1012;PortChannel1013;PortChannel1014;PortChannel1015;PortChannel1016;PortChannel1017;PortChannel1018;PortChannel1019;PortChannel1020;PortChannel1021;PortChannel1022;PortChannel1023;PortChannel1024 + DataAcl + DataPlane + + + + + + + + + + DeviceInterfaceLink + ARISTA01T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet35/1 + + + DeviceInterfaceLink + ARISTA01T2 + Ethernet1 + str-7260cx3-acs-7 + Ethernet1/1 + + + DeviceInterfaceLink + ARISTA01T2 + Ethernet2 + str-7260cx3-acs-7 + Ethernet2/1 + + + DeviceInterfaceLink + ARISTA02T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet37/1 + + + DeviceInterfaceLink + ARISTA03T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet38/1 + + + DeviceInterfaceLink + ARISTA03T2 + Ethernet1 + str-7260cx3-acs-7 + Ethernet5/1 + + + DeviceInterfaceLink + ARISTA03T2 + Ethernet2 + str-7260cx3-acs-7 + Ethernet6/1 + + + DeviceInterfaceLink + ARISTA04T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet39/1 + + + DeviceInterfaceLink + ARISTA05T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet40/1 + + + DeviceInterfaceLink + ARISTA05T2 + Ethernet1 + str-7260cx3-acs-7 + Ethernet17/1 + + + DeviceInterfaceLink + ARISTA05T2 + Ethernet2 + str-7260cx3-acs-7 + Ethernet18/1 + + + DeviceInterfaceLink + ARISTA06T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet43/1 + + + DeviceInterfaceLink + ARISTA07T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet45/1 + + + DeviceInterfaceLink + ARISTA07T2 + Ethernet1 + str-7260cx3-acs-7 + Ethernet21/1 + + + DeviceInterfaceLink + ARISTA07T2 + Ethernet2 + str-7260cx3-acs-7 + Ethernet22/1 + + + DeviceInterfaceLink + ARISTA08T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet46/1 + + + DeviceInterfaceLink + ARISTA09T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet47/1 + + + DeviceInterfaceLink + ARISTA10T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet48/1 + + + DeviceInterfaceLink + ARISTA11T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet51/1 + + + DeviceInterfaceLink + ARISTA12T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet53/1 + + + DeviceInterfaceLink + ARISTA13T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet54/1 + + + DeviceInterfaceLink + ARISTA14T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet55/1 + + + DeviceInterfaceLink + ARISTA15T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet56/1 + + + DeviceInterfaceLink + ARISTA16T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet59/1 + + + DeviceInterfaceLink + ARISTA17T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet61/1 + + + DeviceInterfaceLink + ARISTA18T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet62/1 + + + DeviceInterfaceLink + ARISTA19T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet63/1 + + + DeviceInterfaceLink + ARISTA20T0 + Ethernet1 + str-7260cx3-acs-7 + Ethernet64/1 + + + + + str-7260cx3-acs-7 + Arista-7260CX3-C64 + + 10.64.246.78 + + + + ARISTA16T0 + + 172.16.141.95 + + Arista-VM + + + ARISTA11T0 + + 172.16.141.90 + + Arista-VM + + + ARISTA10T0 + + 172.16.141.89 + + Arista-VM + + + ARISTA17T0 + + 172.16.141.96 + + Arista-VM + + + ARISTA09T0 + + 172.16.141.88 + + Arista-VM + + + ARISTA20T0 + + 172.16.141.99 + + Arista-VM + + + ARISTA08T0 + + 172.16.141.87 + + Arista-VM + + + ARISTA07T0 + + 172.16.141.86 + + Arista-VM + + + ARISTA07T2 + + 172.16.141.79 + + Arista-VM + + + ARISTA01T2 + + 172.16.141.76 + + Arista-VM + + + ARISTA01T0 + + 172.16.141.80 + + Arista-VM + + + ARISTA05T2 + + 172.16.141.78 + + Arista-VM + + + ARISTA05T0 + + 172.16.141.84 + + Arista-VM + + + ARISTA02T0 + + 172.16.141.81 + + Arista-VM + + + ARISTA03T0 + + 172.16.141.82 + + Arista-VM + + + ARISTA03T2 + + 172.16.141.77 + + Arista-VM + + + ARISTA04T0 + + 172.16.141.83 + + Arista-VM + + + ARISTA18T0 + + 172.16.141.97 + + Arista-VM + + + ARISTA15T0 + + 172.16.141.94 + + Arista-VM + + + ARISTA19T0 + + 172.16.141.98 + + Arista-VM + + + ARISTA14T0 + + 172.16.141.93 + + Arista-VM + + + ARISTA12T0 + + 172.16.141.91 + + Arista-VM + + + ARISTA13T0 + + 172.16.141.92 + + Arista-VM + + + ARISTA06T0 + + 172.16.141.85 + + Arista-VM + + + + + + true + + + DeviceInterface + + true + true + 1 + Ethernet1/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet2/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet3/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet4/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet5/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet6/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet7/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet8/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet9/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet10/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet11/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet12/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet13/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet14/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet15/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet16/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet17/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet18/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet19/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet20/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet21/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet22/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet23/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet24/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet25/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet26/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet27/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet28/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet29/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet30/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet31/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet32/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet33/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet34/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet35/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet36/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet37/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet38/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet39/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet40/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet41/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet42/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet43/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet44/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet45/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet46/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet47/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet48/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet49/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet50/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet51/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet52/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet53/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet54/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet55/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet56/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet57/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet58/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet59/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet60/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet61/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet62/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet63/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet64/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet65 + + false + 0 + 0 + 10000 + + + DeviceInterface + + true + true + 1 + Ethernet66 + + false + 0 + 0 + 10000 + + + true + 0 + Arista-7260CX3-C64 + + + + + + + str-7260cx3-acs-7 + + + DeploymentId + + 1 + + + QosProfile + + Profile0 + + + DhcpResources + + 192.0.0.1;192.0.0.2;192.0.0.3;192.0.0.4;192.0.0.5;192.0.0.6;192.0.0.7;192.0.0.8;192.0.0.9;192.0.0.10;192.0.0.11;192.0.0.12;192.0.0.13;192.0.0.14;192.0.0.15;192.0.0.16;192.0.0.17;192.0.0.18;192.0.0.19;192.0.0.20;192.0.0.21;192.0.0.22;192.0.0.23;192.0.0.24;192.0.0.25;192.0.0.26;192.0.0.27;192.0.0.28;192.0.0.29;192.0.0.30;192.0.0.31;192.0.0.32;192.0.0.33;192.0.0.34;192.0.0.35;192.0.0.36;192.0.0.37;192.0.0.38;192.0.0.39;192.0.0.40;192.0.0.41;192.0.0.42;192.0.0.43;192.0.0.44;192.0.0.45;192.0.0.46;192.0.0.47;192.0.0.48 + + + NtpResources + + 10.20.8.129;10.20.8.130 + + + SnmpResources + + 10.3.145.98 + + + SyslogResources + + 10.64.246.95 + + + TacacsGroup + + Starlab + + + TacacsServer + + 100.127.20.21 + + + ForcedMgmtRoutes + + 10.3.145.98/31;10.3.145.8;100.127.20.16/28;10.3.149.170/31;40.122.216.24;13.91.48.226;10.3.145.14;10.64.246.0/24;10.64.247.0/24;10.64.5.5 + + + ErspanDestinationIpv4 + + 10.20.6.16 + + + + + + + str-7260cx3-acs-7 + Arista-7260CX3-C64 + diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor-remap-disabled.json new file mode 100644 index 000000000000..883757d621ad --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7050cx3-dualtor-remap-disabled.json @@ -0,0 +1,487 @@ +{ + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "5m", + "Ethernet2": "300m", + "Ethernet4": "5m", + "Ethernet6": "300m", + "Ethernet8": "5m", + "Ethernet10": "300m", + "Ethernet12": "5m", + "Ethernet14": "300m", + "Ethernet16": "5m", + "Ethernet18": "300m", + "Ethernet20": "5m", + "Ethernet22": "300m", + "Ethernet24": "40m", + "Ethernet28": "40m", + "Ethernet32": "40m", + "Ethernet36": "40m", + "Ethernet40": "5m", + "Ethernet42": "300m", + "Ethernet44": "5m", + "Ethernet46": "300m", + "Ethernet48": "5m", + "Ethernet50": "300m", + "Ethernet52": "5m", + "Ethernet54": "300m", + "Ethernet56": "5m", + "Ethernet58": "300m", + "Ethernet60": "5m", + "Ethernet62": "300m", + "Ethernet64": "5m", + "Ethernet66": "300m", + "Ethernet68": "5m", + "Ethernet70": "300m", + "Ethernet72": "5m", + "Ethernet74": "300m", + "Ethernet76": "5m", + "Ethernet78": "300m", + "Ethernet80": "5m", + "Ethernet82": "300m", + "Ethernet84": "5m", + "Ethernet86": "300m", + "Ethernet88": "40m", + "Ethernet92": "40m", + "Ethernet96": "40m", + "Ethernet100": "40m", + "Ethernet104": "5m", + "Ethernet106": "300m", + "Ethernet108": "5m", + "Ethernet110": "300m", + "Ethernet112": "5m", + "Ethernet114": "300m", + "Ethernet116": "5m", + "Ethernet118": "300m", + "Ethernet120": "5m", + "Ethernet122": "300m", + "Ethernet124": "5m", + "Ethernet126": "300m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "32689152", + "type": "ingress", + "mode": "dynamic", + "xoff": "2058240" + }, + "egress_lossy_pool": { + "size": "24192256", + "type": "egress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "32340992", + "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":"0", + "static_th":"32340992" + }, + "egress_lossy_profile": { + "pool":"egress_lossy_pool", + "size":"1792", + "dynamic_th":"-1" + } + }, + "BUFFER_PG": { + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet28|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet36|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet92|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet100|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet4|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet12|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet20|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet44|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet52|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet60|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet68|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet76|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet84|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet108|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet116|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet124|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor-remap-disabled.json new file mode 100644 index 000000000000..f6bad8e11d1b --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-dualtor-remap-disabled.json @@ -0,0 +1,937 @@ +{ + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "5m", + "Ethernet2": "5m", + "Ethernet4": "5m", + "Ethernet6": "5m", + "Ethernet8": "5m", + "Ethernet10": "5m", + "Ethernet12": "5m", + "Ethernet14": "5m", + "Ethernet16": "5m", + "Ethernet18": "5m", + "Ethernet20": "5m", + "Ethernet22": "5m", + "Ethernet24": "5m", + "Ethernet26": "5m", + "Ethernet28": "5m", + "Ethernet30": "5m", + "Ethernet32": "5m", + "Ethernet34": "5m", + "Ethernet36": "5m", + "Ethernet38": "5m", + "Ethernet40": "5m", + "Ethernet42": "5m", + "Ethernet44": "5m", + "Ethernet46": "5m", + "Ethernet48": "40m", + "Ethernet52": "40m", + "Ethernet56": "40m", + "Ethernet60": "40m", + "Ethernet64": "40m", + "Ethernet68": "40m", + "Ethernet72": "40m", + "Ethernet76": "40m", + "Ethernet80": "5m", + "Ethernet82": "5m", + "Ethernet84": "5m", + "Ethernet86": "5m", + "Ethernet88": "5m", + "Ethernet90": "5m", + "Ethernet92": "5m", + "Ethernet94": "5m", + "Ethernet96": "5m", + "Ethernet98": "5m", + "Ethernet100": "5m", + "Ethernet102": "5m", + "Ethernet104": "5m", + "Ethernet106": "5m", + "Ethernet108": "5m", + "Ethernet110": "5m", + "Ethernet112": "5m", + "Ethernet114": "5m", + "Ethernet116": "5m", + "Ethernet118": "5m", + "Ethernet120": "5m", + "Ethernet122": "5m", + "Ethernet124": "5m", + "Ethernet126": "5m", + "Ethernet128": "5m", + "Ethernet130": "5m", + "Ethernet132": "5m", + "Ethernet134": "5m", + "Ethernet136": "5m", + "Ethernet138": "5m", + "Ethernet140": "5m", + "Ethernet142": "5m", + "Ethernet144": "5m", + "Ethernet146": "5m", + "Ethernet148": "5m", + "Ethernet150": "5m", + "Ethernet152": "5m", + "Ethernet154": "5m", + "Ethernet156": "5m", + "Ethernet158": "5m", + "Ethernet160": "5m", + "Ethernet162": "5m", + "Ethernet164": "5m", + "Ethernet166": "5m", + "Ethernet168": "5m", + "Ethernet170": "5m", + "Ethernet172": "5m", + "Ethernet174": "5m", + "Ethernet176": "5m", + "Ethernet178": "5m", + "Ethernet180": "5m", + "Ethernet182": "5m", + "Ethernet184": "5m", + "Ethernet186": "5m", + "Ethernet188": "5m", + "Ethernet190": "5m", + "Ethernet192": "5m", + "Ethernet194": "5m", + "Ethernet196": "5m", + "Ethernet198": "5m", + "Ethernet200": "5m", + "Ethernet202": "5m", + "Ethernet204": "5m", + "Ethernet206": "5m", + "Ethernet208": "5m", + "Ethernet210": "5m", + "Ethernet212": "5m", + "Ethernet214": "5m", + "Ethernet216": "5m", + "Ethernet218": "5m", + "Ethernet220": "5m", + "Ethernet222": "5m", + "Ethernet224": "5m", + "Ethernet226": "5m", + "Ethernet228": "5m", + "Ethernet230": "5m", + "Ethernet232": "5m", + "Ethernet234": "5m", + "Ethernet236": "5m", + "Ethernet238": "5m", + "Ethernet240": "5m", + "Ethernet242": "5m", + "Ethernet244": "5m", + "Ethernet246": "5m", + "Ethernet248": "5m", + "Ethernet250": "5m", + "Ethernet252": "5m", + "Ethernet254": "5m", + "Ethernet256": "5m", + "Ethernet260": "5m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "33329088", + "type": "ingress", + "mode": "dynamic", + "xoff": "7827456" + }, + "egress_lossy_pool": { + "size": "26663272", + "type": "egress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "42349632", + "type": "egress", + "mode": "static" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "static_th":"44302336" + }, + "egress_lossless_profile": { + "pool":"egress_lossless_pool", + "size":"0", + "static_th":"42349632" + }, + "egress_lossy_profile": { + "pool":"egress_lossy_pool", + "size":"1664", + "dynamic_th":"-1" + } + }, + "BUFFER_PG": { + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet52|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet60|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet68|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet76|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet4|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet12|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet20|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet28|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet36|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet44|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet84|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet92|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet100|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet108|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet116|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet124|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet128|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet132|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet140|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet144|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet148|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet152|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet156|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet160|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet164|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet168|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet172|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet176|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet180|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet184|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet188|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet192|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet196|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet200|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet204|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet208|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet212|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet216|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet220|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet224|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet228|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet232|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet236|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet240|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet244|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet248|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet252|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet196|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet204|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet212|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet220|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet228|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet236|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet244|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet252|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet196|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet204|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet212|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet220|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet228|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet236|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet244|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet252|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet196|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet204|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet212|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet220|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet228|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet236|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet244|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet252|5-6": { + "profile" : "egress_lossy_profile" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1-remap-disabled.json new file mode 100644 index 000000000000..9306b98e8134 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7260-t1-remap-disabled.json @@ -0,0 +1,449 @@ +{ + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "300m", + "Ethernet4": "300m", + "Ethernet8": "300m", + "Ethernet12": "300m", + "Ethernet16": "300m", + "Ethernet20": "300m", + "Ethernet24": "300m", + "Ethernet28": "300m", + "Ethernet32": "300m", + "Ethernet36": "300m", + "Ethernet40": "300m", + "Ethernet44": "300m", + "Ethernet48": "300m", + "Ethernet52": "300m", + "Ethernet56": "300m", + "Ethernet60": "300m", + "Ethernet64": "300m", + "Ethernet68": "300m", + "Ethernet72": "300m", + "Ethernet76": "300m", + "Ethernet80": "300m", + "Ethernet84": "300m", + "Ethernet88": "300m", + "Ethernet92": "300m", + "Ethernet96": "300m", + "Ethernet100": "300m", + "Ethernet104": "300m", + "Ethernet108": "300m", + "Ethernet112": "300m", + "Ethernet116": "300m", + "Ethernet120": "300m", + "Ethernet124": "300m", + "Ethernet128": "300m", + "Ethernet132": "300m", + "Ethernet136": "40m", + "Ethernet140": "300m", + "Ethernet144": "40m", + "Ethernet148": "40m", + "Ethernet152": "40m", + "Ethernet156": "40m", + "Ethernet160": "300m", + "Ethernet164": "300m", + "Ethernet168": "40m", + "Ethernet172": "300m", + "Ethernet176": "40m", + "Ethernet180": "40m", + "Ethernet184": "40m", + "Ethernet188": "40m", + "Ethernet192": "300m", + "Ethernet196": "300m", + "Ethernet200": "40m", + "Ethernet204": "300m", + "Ethernet208": "40m", + "Ethernet212": "40m", + "Ethernet216": "40m", + "Ethernet220": "40m", + "Ethernet224": "300m", + "Ethernet228": "300m", + "Ethernet232": "40m", + "Ethernet236": "300m", + "Ethernet240": "40m", + "Ethernet244": "40m", + "Ethernet248": "40m", + "Ethernet252": "40m", + "Ethernet256": "300m", + "Ethernet260": "300m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "33582016", + "type": "ingress", + "mode": "dynamic", + "xoff": "8965632" + }, + "egress_lossy_pool": { + "size": "26866112", + "type": "egress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "43481152", + "type": "egress", + "mode": "static" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "static_th":"44302336" + }, + "egress_lossless_profile": { + "pool":"egress_lossless_pool", + "size":"0", + "static_th":"43481152" + }, + "egress_lossy_profile": { + "pool":"egress_lossy_pool", + "size":"1664", + "dynamic_th":"-1" + } + }, + "BUFFER_PG": { + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet4|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet144|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet148|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet20|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet152|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet156|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet68|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet168|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet176|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet84|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet180|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet184|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet188|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet200|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet208|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet212|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet216|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet220|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet232|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet240|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet244|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet248|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet252|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet212|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet220|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet244|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet252|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet212|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet220|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet244|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet252|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet212|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet220|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet244|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet252|5-6": { + "profile" : "egress_lossy_profile" + } + } +} diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py index d335545a3c70..a4f59b5a3471 100644 --- a/src/sonic-config-engine/tests/test_j2files.py +++ b/src/sonic-config-engine/tests/test_j2files.py @@ -363,8 +363,11 @@ def test_extra_lossless_buffer_for_tunnel_remapping(self): TEST_DATA = [ # (vendor, platform, sku, minigraph, buffer_template, sample_output ) ('arista', 'x86_64-arista_7050cx3_32s', 'Arista-7050CX3-32S-D48C8', 'sample-arista-7050cx3-dualtor-minigraph.xml', 'buffers.json.j2', 'buffer-arista7050cx3-dualtor.json'), + ('arista', 'x86_64-arista_7050cx3_32s', 'Arista-7050CX3-32S-D48C8', 'sample-arista-7050cx3-dualtor-minigraph-remap-disabled.xml', 'buffers.json.j2', 'buffer-arista7050cx3-dualtor-remap-disabled.json'), ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-D108C8', 'sample-arista-7260-dualtor-minigraph.xml', 'buffers.json.j2', 'buffer-arista7260-dualtor.json'), - ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-C64', 'sample-arista-7260-t1-minigraph.xml', 'buffers.json.j2', 'buffer-arista7260-t1.json') + ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-D108C8', 'sample-arista-7260-dualtor-minigraph-remap-disabled.xml', 'buffers.json.j2', 'buffer-arista7260-dualtor-remap-disabled.json'), + ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-C64', 'sample-arista-7260-t1-minigraph.xml', 'buffers.json.j2', 'buffer-arista7260-t1.json'), + ('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-C64', 'sample-arista-7260-t1-minigraph-remap-disabled.xml', 'buffers.json.j2', 'buffer-arista7260-t1-remap-disabled.json') ] for test_data in TEST_DATA: From a7618ecbb6fee66f3a78549415847f019aabb8e5 Mon Sep 17 00:00:00 2001 From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com> Date: Thu, 2 Jun 2022 10:29:56 +0800 Subject: [PATCH 15/15] Update buffers_config.j2 --- files/build_templates/buffers_config.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index f1685f9c9451..814e470d0211 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -130,7 +130,7 @@ def {%- set port_names_list_extra_queues = [] %} {%- for port in PORT_ACTIVE %} - {%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) and (defs.generate_queue_buffers_with_extra_lossless_queues is defined or defs.generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports is defined) and + {%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) and (('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'ToRRouter') or ('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' and DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR[port].name in DEVICE_NEIGHBOR_METADATA and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[port].name].type == 'LeafRouter')) %} {%- if port_names_list_extra_queues.append(port) %}{%- endif %}