Update buffers config for Mellanox 27xx devices (#1649)
* Update buffers config for Mellanox 27xx devices Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Remove buffers template test for msn27xx Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>
This commit is contained in:
Andriy Moroz
Ying Xie
parent
c63b828bf6
commit
872f69a566
@ -1,162 +0,0 @@
|
|||||||
{# Default values which will be used if no actual configura available #}
|
|
||||||
{% set default_cable = '300m' %}
|
|
||||||
{% set default_ports_num = 32 -%}
|
|
||||||
|
|
||||||
{# Port configuration to cable length look-up table #}
|
|
||||||
{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
|
|
||||||
{# Roles described in the minigraph #}
|
|
||||||
{% set ports2cable = {
|
|
||||||
'torrouter_server' : '5m',
|
|
||||||
'leafrouter_torrouter' : '40m',
|
|
||||||
'spinerouter_leafrouter' : '300m'
|
|
||||||
}
|
|
||||||
%}
|
|
||||||
|
|
||||||
{%- macro cable_length(port_name) -%}
|
|
||||||
{%- set cable_len = [] -%}
|
|
||||||
{%- for local_port in DEVICE_NEIGHBOR -%}
|
|
||||||
{%- if local_port == port_name -%}
|
|
||||||
{%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
|
|
||||||
{%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
|
|
||||||
{%- set neighbor_role = neighbor.type -%}
|
|
||||||
{%- set roles1 = switch_role + '_' + neighbor_role %}
|
|
||||||
{%- set roles2 = neighbor_role + '_' + switch_role -%}
|
|
||||||
{%- set roles1 = roles1 | lower -%}
|
|
||||||
{%- set roles2 = roles2 | lower -%}
|
|
||||||
{%- if roles1 in ports2cable -%}
|
|
||||||
{%- if cable_len.append(ports2cable[roles1]) -%}{%- endif -%}
|
|
||||||
{%- elif roles2 in ports2cable -%}
|
|
||||||
{%- if cable_len.append(ports2cable[roles2]) -%}{%- endif -%}
|
|
||||||
{%- endif -%}
|
|
||||||
{%- endif -%}
|
|
||||||
{%- endif -%}
|
|
||||||
{%- endfor -%}
|
|
||||||
{%- if cable_len -%}
|
|
||||||
{{ cable_len.0 }}
|
|
||||||
{%- else -%}
|
|
||||||
{{ default_cable }}
|
|
||||||
{%- endif -%}
|
|
||||||
{% endmacro %}
|
|
||||||
|
|
||||||
{%- if DEVICE_METADATA is defined %}
|
|
||||||
{%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
|
|
||||||
{%- endif -%}
|
|
||||||
|
|
||||||
{# Generate list of ports if not defined #}
|
|
||||||
{% if PORT is not defined %}
|
|
||||||
{% set PORT = [] %}
|
|
||||||
{% for port_idx in range(0,default_ports_num) %}
|
|
||||||
{% if PORT.append("Ethernet%d" % (port_idx*4)) %}{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
{% endif -%}
|
|
||||||
|
|
||||||
{% set port_names_list = [] %}
|
|
||||||
{% for port in PORT %}
|
|
||||||
{%- if port_names_list.append(port) %}{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
{% set port_names = port_names_list | join(',') -%}
|
|
||||||
|
|
||||||
{
|
|
||||||
"CABLE_LENGTH": {
|
|
||||||
"AZURE": {
|
|
||||||
{% for port in PORT %}
|
|
||||||
{% set cable = cable_length(port) -%}
|
|
||||||
"{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
|
|
||||||
|
|
||||||
{% endfor %}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{%if switch_role == 'ToRRouter' %}
|
|
||||||
{% set ingress_lossless_pool_size = '4194304' %}
|
|
||||||
{% set ingress_lossy_pool_size = '7340032' %}
|
|
||||||
{% set egress_lossless_pool_size = '16777152' %}
|
|
||||||
{% set egress_lossy_pool_size = '7340032' %}
|
|
||||||
{% else %}
|
|
||||||
{% set ingress_lossless_pool_size = '2097152' %}
|
|
||||||
{% set ingress_lossy_pool_size = '5242880' %}
|
|
||||||
{% set egress_lossless_pool_size = '16777152' %}
|
|
||||||
{% set egress_lossy_pool_size = '5242880' %}
|
|
||||||
{%endif %}
|
|
||||||
"BUFFER_POOL": {
|
|
||||||
"ingress_lossless_pool": {
|
|
||||||
"size": "{{ ingress_lossless_pool_size }}",
|
|
||||||
"type": "ingress",
|
|
||||||
"mode": "dynamic"
|
|
||||||
},
|
|
||||||
"ingress_lossy_pool": {
|
|
||||||
"size": "{{ ingress_lossy_pool_size }}",
|
|
||||||
"type": "ingress",
|
|
||||||
"mode": "dynamic"
|
|
||||||
},
|
|
||||||
"egress_lossless_pool": {
|
|
||||||
"size": "{{ egress_lossless_pool_size }}",
|
|
||||||
"type": "egress",
|
|
||||||
"mode": "dynamic"
|
|
||||||
},
|
|
||||||
"egress_lossy_pool": {
|
|
||||||
"size": "{{ egress_lossy_pool_size }}",
|
|
||||||
"type": "egress",
|
|
||||||
"mode": "dynamic"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_PROFILE": {
|
|
||||||
"ingress_lossless_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"0"
|
|
||||||
},
|
|
||||||
"ingress_lossy_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|ingress_lossy_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"3"
|
|
||||||
},
|
|
||||||
"egress_lossless_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|egress_lossless_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"7"
|
|
||||||
},
|
|
||||||
"egress_lossy_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|egress_lossy_pool]",
|
|
||||||
"size":"4096",
|
|
||||||
"dynamic_th":"3"
|
|
||||||
},
|
|
||||||
"pg_lossy_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|ingress_lossy_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"3"
|
|
||||||
},
|
|
||||||
"q_lossless_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|egress_lossless_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"7"
|
|
||||||
},
|
|
||||||
"q_lossy_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|egress_lossy_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"3"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_PORT_INGRESS_PROFILE_LIST": {
|
|
||||||
"{{ port_names }}": {
|
|
||||||
"profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_PORT_EGRESS_PROFILE_LIST": {
|
|
||||||
"{{ port_names }}": {
|
|
||||||
"profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_PG": {
|
|
||||||
"{{ port_names }}|0-1": {
|
|
||||||
"profile" : "[BUFFER_PROFILE|pg_lossy_profile]"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_QUEUE": {
|
|
||||||
"{{ port_names }}|3-4": {
|
|
||||||
"profile" : "[BUFFER_PROFILE|q_lossless_profile]"
|
|
||||||
},
|
|
||||||
"{{ port_names }}|0-1": {
|
|
||||||
"profile" : "[BUFFER_PROFILE|q_lossy_profile]"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1 @@
|
|||||||
|
../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2
|
||||||
@ -0,0 +1 @@
|
|||||||
|
../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
|
||||||
@ -0,0 +1 @@
|
|||||||
|
../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
|
||||||
@ -1,162 +1,2 @@
|
|||||||
{# Default values which will be used if no actual configura available #}
|
{%- set default_topo = 't0' %}
|
||||||
{% set default_cable = '300m' %}
|
{%- include 'buffers_config.j2' %}
|
||||||
{% set default_ports_num = 32 -%}
|
|
||||||
|
|
||||||
{# Port configuration to cable length look-up table #}
|
|
||||||
{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
|
|
||||||
{# Roles described in the minigraph #}
|
|
||||||
{% set ports2cable = {
|
|
||||||
'torrouter_server' : '5m',
|
|
||||||
'leafrouter_torrouter' : '40m',
|
|
||||||
'spinerouter_leafrouter' : '300m'
|
|
||||||
}
|
|
||||||
%}
|
|
||||||
|
|
||||||
{%- macro cable_length(port_name) -%}
|
|
||||||
{%- set cable_len = [] -%}
|
|
||||||
{%- for local_port in DEVICE_NEIGHBOR -%}
|
|
||||||
{%- if local_port == port_name -%}
|
|
||||||
{%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
|
|
||||||
{%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
|
|
||||||
{%- set neighbor_role = neighbor.type -%}
|
|
||||||
{%- set roles1 = switch_role + '_' + neighbor_role %}
|
|
||||||
{%- set roles2 = neighbor_role + '_' + switch_role -%}
|
|
||||||
{%- set roles1 = roles1 | lower -%}
|
|
||||||
{%- set roles2 = roles2 | lower -%}
|
|
||||||
{%- if roles1 in ports2cable -%}
|
|
||||||
{%- if cable_len.append(ports2cable[roles1]) -%}{%- endif -%}
|
|
||||||
{%- elif roles2 in ports2cable -%}
|
|
||||||
{%- if cable_len.append(ports2cable[roles2]) -%}{%- endif -%}
|
|
||||||
{%- endif -%}
|
|
||||||
{%- endif -%}
|
|
||||||
{%- endif -%}
|
|
||||||
{%- endfor -%}
|
|
||||||
{%- if cable_len -%}
|
|
||||||
{{ cable_len.0 }}
|
|
||||||
{%- else -%}
|
|
||||||
{{ default_cable }}
|
|
||||||
{%- endif -%}
|
|
||||||
{% endmacro %}
|
|
||||||
|
|
||||||
{%- if DEVICE_METADATA is defined %}
|
|
||||||
{%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
|
|
||||||
{%- endif -%}
|
|
||||||
|
|
||||||
{# Generate list of ports if not defined #}
|
|
||||||
{% if PORT is not defined %}
|
|
||||||
{% set PORT = [] %}
|
|
||||||
{% for port_idx in range(0,default_ports_num) %}
|
|
||||||
{% if PORT.append("Ethernet%d" % (port_idx*4)) %}{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
{% endif -%}
|
|
||||||
|
|
||||||
{% set port_names_list = [] %}
|
|
||||||
{% for port in PORT %}
|
|
||||||
{%- if port_names_list.append(port) %}{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
{% set port_names = port_names_list | join(',') -%}
|
|
||||||
|
|
||||||
{
|
|
||||||
"CABLE_LENGTH": {
|
|
||||||
"AZURE": {
|
|
||||||
{% for port in PORT %}
|
|
||||||
{% set cable = cable_length(port) -%}
|
|
||||||
"{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
|
|
||||||
|
|
||||||
{% endfor %}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{%if switch_role == 'ToRRouter' %}
|
|
||||||
{% set ingress_lossless_pool_size = '4194304' %}
|
|
||||||
{% set ingress_lossy_pool_size = '7340032' %}
|
|
||||||
{% set egress_lossless_pool_size = '16777152' %}
|
|
||||||
{% set egress_lossy_pool_size = '7340032' %}
|
|
||||||
{% else %}
|
|
||||||
{% set ingress_lossless_pool_size = '2097152' %}
|
|
||||||
{% set ingress_lossy_pool_size = '5242880' %}
|
|
||||||
{% set egress_lossless_pool_size = '16777152' %}
|
|
||||||
{% set egress_lossy_pool_size = '5242880' %}
|
|
||||||
{%endif %}
|
|
||||||
"BUFFER_POOL": {
|
|
||||||
"ingress_lossless_pool": {
|
|
||||||
"size": "{{ ingress_lossless_pool_size }}",
|
|
||||||
"type": "ingress",
|
|
||||||
"mode": "dynamic"
|
|
||||||
},
|
|
||||||
"ingress_lossy_pool": {
|
|
||||||
"size": "{{ ingress_lossy_pool_size }}",
|
|
||||||
"type": "ingress",
|
|
||||||
"mode": "dynamic"
|
|
||||||
},
|
|
||||||
"egress_lossless_pool": {
|
|
||||||
"size": "{{ egress_lossless_pool_size }}",
|
|
||||||
"type": "egress",
|
|
||||||
"mode": "dynamic"
|
|
||||||
},
|
|
||||||
"egress_lossy_pool": {
|
|
||||||
"size": "{{ egress_lossy_pool_size }}",
|
|
||||||
"type": "egress",
|
|
||||||
"mode": "dynamic"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_PROFILE": {
|
|
||||||
"ingress_lossless_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"0"
|
|
||||||
},
|
|
||||||
"ingress_lossy_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|ingress_lossy_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"3"
|
|
||||||
},
|
|
||||||
"egress_lossless_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|egress_lossless_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"7"
|
|
||||||
},
|
|
||||||
"egress_lossy_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|egress_lossy_pool]",
|
|
||||||
"size":"4096",
|
|
||||||
"dynamic_th":"3"
|
|
||||||
},
|
|
||||||
"pg_lossy_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|ingress_lossy_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"3"
|
|
||||||
},
|
|
||||||
"q_lossless_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|egress_lossless_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"7"
|
|
||||||
},
|
|
||||||
"q_lossy_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|egress_lossy_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"3"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_PORT_INGRESS_PROFILE_LIST": {
|
|
||||||
"{{ port_names }}": {
|
|
||||||
"profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_PORT_EGRESS_PROFILE_LIST": {
|
|
||||||
"{{ port_names }}": {
|
|
||||||
"profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_PG": {
|
|
||||||
"{{ port_names }}|0-1": {
|
|
||||||
"profile" : "[BUFFER_PROFILE|pg_lossy_profile]"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_QUEUE": {
|
|
||||||
"{{ port_names }}|3-4": {
|
|
||||||
"profile" : "[BUFFER_PROFILE|q_lossless_profile]"
|
|
||||||
},
|
|
||||||
"{{ port_names }}|0-1": {
|
|
||||||
"profile" : "[BUFFER_PROFILE|q_lossy_profile]"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -0,0 +1,90 @@
|
|||||||
|
{% set default_cable = '5m' %}
|
||||||
|
{% set ingress_lossless_pool_size = '4194304' %}
|
||||||
|
{% set ingress_lossy_pool_size = '7340032' %}
|
||||||
|
{% set egress_lossless_pool_size = '16777152' %}
|
||||||
|
{% set egress_lossy_pool_size = '7340032' %}
|
||||||
|
|
||||||
|
{%- macro generate_port_lists(PORT_ALL) %}
|
||||||
|
{# Generate list of ports #}
|
||||||
|
{%- for port_idx in range(0, 32) %}
|
||||||
|
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
|
||||||
|
{%- endfor %}
|
||||||
|
{%- endmacro %}
|
||||||
|
|
||||||
|
{%- macro generate_buffer_pool_and_profiles() %}
|
||||||
|
"BUFFER_POOL": {
|
||||||
|
"ingress_lossless_pool": {
|
||||||
|
"size": "{{ ingress_lossless_pool_size }}",
|
||||||
|
"type": "ingress",
|
||||||
|
"mode": "dynamic"
|
||||||
|
},
|
||||||
|
"ingress_lossy_pool": {
|
||||||
|
"size": "{{ ingress_lossy_pool_size }}",
|
||||||
|
"type": "ingress",
|
||||||
|
"mode": "dynamic"
|
||||||
|
},
|
||||||
|
"egress_lossless_pool": {
|
||||||
|
"size": "{{ egress_lossless_pool_size }}",
|
||||||
|
"type": "egress",
|
||||||
|
"mode": "dynamic"
|
||||||
|
},
|
||||||
|
"egress_lossy_pool": {
|
||||||
|
"size": "{{ egress_lossy_pool_size }}",
|
||||||
|
"type": "egress",
|
||||||
|
"mode": "dynamic"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"BUFFER_PROFILE": {
|
||||||
|
"ingress_lossless_profile": {
|
||||||
|
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
|
||||||
|
"size":"0",
|
||||||
|
"dynamic_th":"0"
|
||||||
|
},
|
||||||
|
"ingress_lossy_profile": {
|
||||||
|
"pool":"[BUFFER_POOL|ingress_lossy_pool]",
|
||||||
|
"size":"0",
|
||||||
|
"dynamic_th":"3"
|
||||||
|
},
|
||||||
|
"egress_lossless_profile": {
|
||||||
|
"pool":"[BUFFER_POOL|egress_lossless_pool]",
|
||||||
|
"size":"0",
|
||||||
|
"dynamic_th":"7"
|
||||||
|
},
|
||||||
|
"egress_lossy_profile": {
|
||||||
|
"pool":"[BUFFER_POOL|egress_lossy_pool]",
|
||||||
|
"size":"4096",
|
||||||
|
"dynamic_th":"3"
|
||||||
|
},
|
||||||
|
"q_lossy_profile": {
|
||||||
|
"pool":"[BUFFER_POOL|egress_lossy_pool]",
|
||||||
|
"size":"0",
|
||||||
|
"dynamic_th":"3"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{%- endmacro %}
|
||||||
|
|
||||||
|
{%- macro generate_profile_lists(port_names) %}
|
||||||
|
"BUFFER_PORT_INGRESS_PROFILE_LIST": {
|
||||||
|
"{{ port_names }}": {
|
||||||
|
"profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"BUFFER_PORT_EGRESS_PROFILE_LIST": {
|
||||||
|
"{{ port_names }}": {
|
||||||
|
"profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{%- endmacro %}
|
||||||
|
|
||||||
|
{%- macro generate_queue_buffers(port_names) %}
|
||||||
|
"BUFFER_QUEUE": {
|
||||||
|
"{{ port_names }}|3-4": {
|
||||||
|
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
|
||||||
|
},
|
||||||
|
"{{ port_names }}|0-1": {
|
||||||
|
"profile" : "[BUFFER_PROFILE|q_lossy_profile]"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{%- endmacro %}
|
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,90 @@
|
|||||||
|
{% set default_cable = '5m' %}
|
||||||
|
{% set ingress_lossless_pool_size = '2097152' %}
|
||||||
|
{% set ingress_lossy_pool_size = '5242880' %}
|
||||||
|
{% set egress_lossless_pool_size = '16777152' %}
|
||||||
|
{% set egress_lossy_pool_size = '5242880' %}
|
||||||
|
|
||||||
|
{%- macro generate_port_lists(PORT_ALL) %}
|
||||||
|
{# Generate list of ports #}
|
||||||
|
{%- for port_idx in range(0, 32) %}
|
||||||
|
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
|
||||||
|
{%- endfor %}
|
||||||
|
{%- endmacro %}
|
||||||
|
|
||||||
|
{%- macro generate_buffer_pool_and_profiles() %}
|
||||||
|
"BUFFER_POOL": {
|
||||||
|
"ingress_lossless_pool": {
|
||||||
|
"size": "{{ ingress_lossless_pool_size }}",
|
||||||
|
"type": "ingress",
|
||||||
|
"mode": "dynamic"
|
||||||
|
},
|
||||||
|
"ingress_lossy_pool": {
|
||||||
|
"size": "{{ ingress_lossy_pool_size }}",
|
||||||
|
"type": "ingress",
|
||||||
|
"mode": "dynamic"
|
||||||
|
},
|
||||||
|
"egress_lossless_pool": {
|
||||||
|
"size": "{{ egress_lossless_pool_size }}",
|
||||||
|
"type": "egress",
|
||||||
|
"mode": "dynamic"
|
||||||
|
},
|
||||||
|
"egress_lossy_pool": {
|
||||||
|
"size": "{{ egress_lossy_pool_size }}",
|
||||||
|
"type": "egress",
|
||||||
|
"mode": "dynamic"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"BUFFER_PROFILE": {
|
||||||
|
"ingress_lossless_profile": {
|
||||||
|
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
|
||||||
|
"size":"0",
|
||||||
|
"dynamic_th":"0"
|
||||||
|
},
|
||||||
|
"ingress_lossy_profile": {
|
||||||
|
"pool":"[BUFFER_POOL|ingress_lossy_pool]",
|
||||||
|
"size":"0",
|
||||||
|
"dynamic_th":"3"
|
||||||
|
},
|
||||||
|
"egress_lossless_profile": {
|
||||||
|
"pool":"[BUFFER_POOL|egress_lossless_pool]",
|
||||||
|
"size":"0",
|
||||||
|
"dynamic_th":"7"
|
||||||
|
},
|
||||||
|
"egress_lossy_profile": {
|
||||||
|
"pool":"[BUFFER_POOL|egress_lossy_pool]",
|
||||||
|
"size":"4096",
|
||||||
|
"dynamic_th":"3"
|
||||||
|
},
|
||||||
|
"q_lossy_profile": {
|
||||||
|
"pool":"[BUFFER_POOL|egress_lossy_pool]",
|
||||||
|
"size":"0",
|
||||||
|
"dynamic_th":"3"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{%- endmacro %}
|
||||||
|
|
||||||
|
{%- macro generate_profile_lists(port_names) %}
|
||||||
|
"BUFFER_PORT_INGRESS_PROFILE_LIST": {
|
||||||
|
"{{ port_names }}": {
|
||||||
|
"profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"BUFFER_PORT_EGRESS_PROFILE_LIST": {
|
||||||
|
"{{ port_names }}": {
|
||||||
|
"profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{%- endmacro %}
|
||||||
|
|
||||||
|
{%- macro generate_queue_buffers(port_names) %}
|
||||||
|
"BUFFER_QUEUE": {
|
||||||
|
"{{ port_names }}|3-4": {
|
||||||
|
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
|
||||||
|
},
|
||||||
|
"{{ port_names }}|0-1": {
|
||||||
|
"profile" : "[BUFFER_PROFILE|q_lossy_profile]"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{%- endmacro %}
|
||||||
|
|
||||||
|
|
||||||
@ -1,162 +0,0 @@
|
|||||||
{# Default values which will be used if no actual configura available #}
|
|
||||||
{% set default_cable = '300m' %}
|
|
||||||
{% set default_ports_num = 32 -%}
|
|
||||||
|
|
||||||
{# Port configuration to cable length look-up table #}
|
|
||||||
{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
|
|
||||||
{# Roles described in the minigraph #}
|
|
||||||
{% set ports2cable = {
|
|
||||||
'torrouter_server' : '5m',
|
|
||||||
'leafrouter_torrouter' : '40m',
|
|
||||||
'spinerouter_leafrouter' : '300m'
|
|
||||||
}
|
|
||||||
%}
|
|
||||||
|
|
||||||
{%- macro cable_length(port_name) -%}
|
|
||||||
{%- set cable_len = [] -%}
|
|
||||||
{%- for local_port in DEVICE_NEIGHBOR -%}
|
|
||||||
{%- if local_port == port_name -%}
|
|
||||||
{%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
|
|
||||||
{%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
|
|
||||||
{%- set neighbor_role = neighbor.type -%}
|
|
||||||
{%- set roles1 = switch_role + '_' + neighbor_role %}
|
|
||||||
{%- set roles2 = neighbor_role + '_' + switch_role -%}
|
|
||||||
{%- set roles1 = roles1 | lower -%}
|
|
||||||
{%- set roles2 = roles2 | lower -%}
|
|
||||||
{%- if roles1 in ports2cable -%}
|
|
||||||
{%- if cable_len.append(ports2cable[roles1]) -%}{%- endif -%}
|
|
||||||
{%- elif roles2 in ports2cable -%}
|
|
||||||
{%- if cable_len.append(ports2cable[roles2]) -%}{%- endif -%}
|
|
||||||
{%- endif -%}
|
|
||||||
{%- endif -%}
|
|
||||||
{%- endif -%}
|
|
||||||
{%- endfor -%}
|
|
||||||
{%- if cable_len -%}
|
|
||||||
{{ cable_len.0 }}
|
|
||||||
{%- else -%}
|
|
||||||
{{ default_cable }}
|
|
||||||
{%- endif -%}
|
|
||||||
{% endmacro %}
|
|
||||||
|
|
||||||
{%- if DEVICE_METADATA is defined %}
|
|
||||||
{%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
|
|
||||||
{%- endif -%}
|
|
||||||
|
|
||||||
{# Generate list of ports if not defined #}
|
|
||||||
{% if PORT is not defined %}
|
|
||||||
{% set PORT = [] %}
|
|
||||||
{% for port_idx in range(0,default_ports_num) %}
|
|
||||||
{% if PORT.append("Ethernet%d" % (port_idx*4)) %}{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
{% endif -%}
|
|
||||||
|
|
||||||
{% set port_names_list = [] %}
|
|
||||||
{% for port in PORT %}
|
|
||||||
{%- if port_names_list.append(port) %}{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
{% set port_names = port_names_list | join(',') -%}
|
|
||||||
|
|
||||||
{
|
|
||||||
"CABLE_LENGTH": {
|
|
||||||
"AZURE": {
|
|
||||||
{% for port in PORT %}
|
|
||||||
{% set cable = cable_length(port) -%}
|
|
||||||
"{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
|
|
||||||
|
|
||||||
{% endfor %}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{%if switch_role == 'ToRRouter' %}
|
|
||||||
{% set ingress_lossless_pool_size = '4194304' %}
|
|
||||||
{% set ingress_lossy_pool_size = '7340032' %}
|
|
||||||
{% set egress_lossless_pool_size = '16777152' %}
|
|
||||||
{% set egress_lossy_pool_size = '7340032' %}
|
|
||||||
{% else %}
|
|
||||||
{% set ingress_lossless_pool_size = '2097152' %}
|
|
||||||
{% set ingress_lossy_pool_size = '5242880' %}
|
|
||||||
{% set egress_lossless_pool_size = '16777152' %}
|
|
||||||
{% set egress_lossy_pool_size = '5242880' %}
|
|
||||||
{%endif %}
|
|
||||||
"BUFFER_POOL": {
|
|
||||||
"ingress_lossless_pool": {
|
|
||||||
"size": "{{ ingress_lossless_pool_size }}",
|
|
||||||
"type": "ingress",
|
|
||||||
"mode": "dynamic"
|
|
||||||
},
|
|
||||||
"ingress_lossy_pool": {
|
|
||||||
"size": "{{ ingress_lossy_pool_size }}",
|
|
||||||
"type": "ingress",
|
|
||||||
"mode": "dynamic"
|
|
||||||
},
|
|
||||||
"egress_lossless_pool": {
|
|
||||||
"size": "{{ egress_lossless_pool_size }}",
|
|
||||||
"type": "egress",
|
|
||||||
"mode": "dynamic"
|
|
||||||
},
|
|
||||||
"egress_lossy_pool": {
|
|
||||||
"size": "{{ egress_lossy_pool_size }}",
|
|
||||||
"type": "egress",
|
|
||||||
"mode": "dynamic"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_PROFILE": {
|
|
||||||
"ingress_lossless_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"0"
|
|
||||||
},
|
|
||||||
"ingress_lossy_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|ingress_lossy_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"3"
|
|
||||||
},
|
|
||||||
"egress_lossless_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|egress_lossless_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"7"
|
|
||||||
},
|
|
||||||
"egress_lossy_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|egress_lossy_pool]",
|
|
||||||
"size":"4096",
|
|
||||||
"dynamic_th":"3"
|
|
||||||
},
|
|
||||||
"pg_lossy_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|ingress_lossy_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"3"
|
|
||||||
},
|
|
||||||
"q_lossless_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|egress_lossless_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"7"
|
|
||||||
},
|
|
||||||
"q_lossy_profile": {
|
|
||||||
"pool":"[BUFFER_POOL|egress_lossy_pool]",
|
|
||||||
"size":"0",
|
|
||||||
"dynamic_th":"3"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_PORT_INGRESS_PROFILE_LIST": {
|
|
||||||
"{{ port_names }}": {
|
|
||||||
"profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_PORT_EGRESS_PROFILE_LIST": {
|
|
||||||
"{{ port_names }}": {
|
|
||||||
"profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_PG": {
|
|
||||||
"{{ port_names }}|0-1": {
|
|
||||||
"profile" : "[BUFFER_PROFILE|pg_lossy_profile]"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BUFFER_QUEUE": {
|
|
||||||
"{{ port_names }}|3-4": {
|
|
||||||
"profile" : "[BUFFER_PROFILE|q_lossless_profile]"
|
|
||||||
},
|
|
||||||
"{{ port_names }}|0-1": {
|
|
||||||
"profile" : "[BUFFER_PROFILE|q_lossy_profile]"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1 @@
|
|||||||
|
../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2
|
||||||
@ -0,0 +1 @@
|
|||||||
|
../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
|
||||||
@ -0,0 +1 @@
|
|||||||
|
../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
|
||||||
@ -4,7 +4,7 @@
|
|||||||
{%- else %}
|
{%- else %}
|
||||||
def
|
def
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- endmacro %}
|
{%- endmacro -%}
|
||||||
|
|
||||||
{# Determine device topology and filename postfix #}
|
{# Determine device topology and filename postfix #}
|
||||||
{%- if DEVICE_METADATA is defined %}
|
{%- if DEVICE_METADATA is defined %}
|
||||||
@ -19,12 +19,12 @@ def
|
|||||||
{%- else %}
|
{%- else %}
|
||||||
{%- set filename_postfix = set_default_topology() %}
|
{%- set filename_postfix = set_default_topology() %}
|
||||||
{%- set switch_role = '' %}
|
{%- set switch_role = '' %}
|
||||||
{%- endif %}
|
{%- endif -%}
|
||||||
|
|
||||||
{# Import default values from device HWSKU folder #}
|
{# Import default values from device HWSKU folder #}
|
||||||
{%- import 'buffers_defaults_%s.j2' % filename_postfix as defs %}
|
{%- import 'buffers_defaults_%s.j2' % filename_postfix as defs %}
|
||||||
|
|
||||||
{%- set default_cable = defs.default_cable %}
|
{%- set default_cable = defs.default_cable -%}
|
||||||
|
|
||||||
{# Port configuration to cable length look-up table #}
|
{# Port configuration to cable length look-up table #}
|
||||||
{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
|
{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
|
||||||
@ -106,13 +106,28 @@ def
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{% set bufs = defs.generate_buffer_pool_and_profiles() %}
|
|
||||||
{{ bufs }}
|
{% if defs.generate_buffer_pool_and_profiles is defined %}
|
||||||
|
{{ defs.generate_buffer_pool_and_profiles() }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{%- if defs.generate_profile_lists is defined %}
|
||||||
|
{{ defs.generate_profile_lists(port_names_all) }},
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{%- if defs.generate_pg_profils is defined %}
|
||||||
|
{{ defs.generate_pg_profils }},
|
||||||
|
{% else %}
|
||||||
"BUFFER_PG": {
|
"BUFFER_PG": {
|
||||||
"{{ port_names_all }}|0-1": {
|
"{{ port_names_all }}|0-1": {
|
||||||
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
|
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if defs.generate_queue_buffers is defined %}
|
||||||
|
{{ defs.generate_queue_buffers(port_names_all) }}
|
||||||
|
{% else %}
|
||||||
"BUFFER_QUEUE": {
|
"BUFFER_QUEUE": {
|
||||||
"{{ port_names_all }}|3-4": {
|
"{{ port_names_all }}|3-4": {
|
||||||
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
|
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
|
||||||
@ -121,4 +136,5 @@ def
|
|||||||
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
|
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
{% endif %}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -111,15 +111,6 @@ class TestJ2Files(TestCase):
|
|||||||
sample_output_file = os.path.join(self.test_dir, 'sample_output', 'ipinip.json')
|
sample_output_file = os.path.join(self.test_dir, 'sample_output', 'ipinip.json')
|
||||||
assert filecmp.cmp(sample_output_file, self.output_file)
|
assert filecmp.cmp(sample_output_file, self.output_file)
|
||||||
|
|
||||||
def test_msn27xx_32ports_buffers(self):
|
|
||||||
buffer_file = os.path.join(self.test_dir, '..', '..', '..', 'device', 'mellanox', 'x86_64-mlnx_msn2700-r0', 'ACS-MSN2700', 'buffers.json.j2')
|
|
||||||
argument = '-m ' + self.t1_mlnx_minigraph + ' -p ' + self.mlnx_port_config + ' -t ' + buffer_file + ' > ' + self.output_file
|
|
||||||
self.run_script(argument)
|
|
||||||
|
|
||||||
sample_output_file = os.path.join(self.test_dir, 'sample_output', 'msn27.32ports.json')
|
|
||||||
|
|
||||||
self.assertTrue(filecmp.cmp(sample_output_file, self.output_file))
|
|
||||||
|
|
||||||
def test_sku_render_template(self):
|
def test_sku_render_template(self):
|
||||||
argument = '-k Mellanox-SN2700 -t ' + os.path.join(self.test_dir, '../data/l2switch.j2') + ' -p ' + self.t0_port_config + ' > ' + self.output_file
|
argument = '-k Mellanox-SN2700 -t ' + os.path.join(self.test_dir, '../data/l2switch.j2') + ' -p ' + self.t0_port_config + ' > ' + self.output_file
|
||||||
self.run_script(argument)
|
self.run_script(argument)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user