From de149398db512c7df914ae05081441a0f133fc5a Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Sun, 27 Dec 2020 12:03:07 -0800 Subject: [PATCH] Revert "[pytest][qos][config] Added pytests for "config qos reload" commands (#1266)" This reverts commit 6202a81d9b504c42d992ea33f361c35688f5fbbb. --- config/main.py | 45 +-- pfcwd/main.py | 2 - scripts/intfutil | 4 +- tests/config_test.py | 105 +------ tests/conftest.py | 35 +-- tests/crm_test.py | 5 +- tests/mock_tables/mock_multi_asic.py | 2 - tests/qos_config_input/0/buffers.json.j2 | 3 - tests/qos_config_input/0/buffers_config.j2 | 172 ------------ .../qos_config_input/0/buffers_defaults_t0.j2 | 45 --- .../qos_config_input/0/buffers_defaults_t1.j2 | 45 --- tests/qos_config_input/0/config_qos.json | 137 ---------- tests/qos_config_input/0/qos.json.j2 | 1 - tests/qos_config_input/0/qos_config.j2 | 257 ------------------ tests/qos_config_input/1/buffers.json.j2 | 3 - tests/qos_config_input/1/buffers_config.j2 | 172 ------------ .../qos_config_input/1/buffers_defaults_t0.j2 | 45 --- .../qos_config_input/1/buffers_defaults_t1.j2 | 45 --- tests/qos_config_input/1/config_qos.json | 137 ---------- tests/qos_config_input/1/qos.json.j2 | 1 - tests/qos_config_input/1/qos_config.j2 | 257 ------------------ tests/qos_config_input/buffers.json.j2 | 3 - tests/qos_config_input/buffers_config.j2 | 172 ------------ tests/qos_config_input/buffers_defaults_t1.j2 | 45 --- tests/qos_config_input/config_qos.json | 137 ---------- tests/qos_config_input/qos.json.j2 | 1 - tests/qos_config_input/qos_config.j2 | 257 ------------------ tests/qos_config_input/sonic_version.yml | 8 - 28 files changed, 17 insertions(+), 2124 deletions(-) delete mode 100644 tests/qos_config_input/0/buffers.json.j2 delete mode 100644 tests/qos_config_input/0/buffers_config.j2 delete mode 100644 tests/qos_config_input/0/buffers_defaults_t0.j2 delete mode 100644 tests/qos_config_input/0/buffers_defaults_t1.j2 delete mode 100644 tests/qos_config_input/0/config_qos.json delete mode 100644 tests/qos_config_input/0/qos.json.j2 delete mode 100644 tests/qos_config_input/0/qos_config.j2 delete mode 100644 tests/qos_config_input/1/buffers.json.j2 delete mode 100644 tests/qos_config_input/1/buffers_config.j2 delete mode 100644 tests/qos_config_input/1/buffers_defaults_t0.j2 delete mode 100644 tests/qos_config_input/1/buffers_defaults_t1.j2 delete mode 100644 tests/qos_config_input/1/config_qos.json delete mode 100644 tests/qos_config_input/1/qos.json.j2 delete mode 100644 tests/qos_config_input/1/qos_config.j2 delete mode 100644 tests/qos_config_input/buffers.json.j2 delete mode 100644 tests/qos_config_input/buffers_config.j2 delete mode 100644 tests/qos_config_input/buffers_defaults_t1.j2 delete mode 100644 tests/qos_config_input/config_qos.json delete mode 100644 tests/qos_config_input/qos.json.j2 delete mode 100644 tests/qos_config_input/qos_config.j2 delete mode 100644 tests/qos_config_input/sonic_version.yml diff --git a/config/main.py b/config/main.py index 8710481e4789..7f82deec8c49 100644 --- a/config/main.py +++ b/config/main.py @@ -37,21 +37,6 @@ from . import vxlan from .config_mgmt import ConfigMgmtDPB -# mock masic APIs for unit test -try: - if os.environ["UTILITIES_UNIT_TESTING"] == "1" or os.environ["UTILITIES_UNIT_TESTING"] == "2": - modules_path = os.path.join(os.path.dirname(__file__), "..") - tests_path = os.path.join(modules_path, "tests") - sys.path.insert(0, modules_path) - sys.path.insert(0, tests_path) - import mock_tables.dbconnector - if os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] == "multi_asic": - import mock_tables.mock_multi_asic - mock_tables.dbconnector.load_namespace_config() -except KeyError: - pass - - CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help', '-?']) SONIC_GENERATED_SERVICE_PATH = '/etc/sonic/generated_services.conf' @@ -1656,24 +1641,12 @@ def _update_buffer_calculation_model(config_db, model): @qos.command('reload') @click.pass_context @click.option('--no-dynamic-buffer', is_flag=True, help="Disable dynamic buffer calculation") -@click.option( - '--json-data', type=click.STRING, - help="json string with additional data, valid with --dry-run option" -) -@click.option( - '--dry_run', type=click.STRING, - help="Dry run, writes config to the given file" -) -def reload(ctx, no_dynamic_buffer, dry_run, json_data): +def reload(ctx, no_dynamic_buffer): """Reload QoS configuration""" log.log_info("'qos reload' executing...") _clear_qos() _, hwsku_path = device_info.get_paths_to_platform_and_hwsku_dirs() - sonic_version_file = device_info.get_sonic_version_file() - from_db = "-d --write-to-db" - if dry_run: - from_db = "--additional-data \'{}\'".format(json_data) if json_data else "" namespace_list = [DEFAULT_NAMESPACE] if multi_asic.get_num_asics() > 1: @@ -1710,17 +1683,17 @@ def reload(ctx, no_dynamic_buffer, dry_run, json_data): buffer_template_file = os.path.join(hwsku_path, asic_id_suffix, "buffers.json.j2") if asic_type in vendors_supporting_dynamic_buffer: buffer_model_updated |= _update_buffer_calculation_model(config_db, "traditional") - if os.path.isfile(buffer_template_file): - qos_template_file = os.path.join( - hwsku_path, asic_id_suffix, "qos.json.j2" - ) + qos_template_file = os.path.join(hwsku_path, asic_id_suffix, "qos.json.j2") if os.path.isfile(qos_template_file): cmd_ns = "" if ns is DEFAULT_NAMESPACE else "-n {}".format(ns) - fname = "{}{}".format(dry_run, asic_id_suffix) if dry_run else "config-db" - command = "{} {} {} -t {},{} -t {},{} -y {}".format( - SONIC_CFGGEN_PATH, cmd_ns, from_db, buffer_template_file, - fname, qos_template_file, fname, sonic_version_file + sonic_version_file = os.path.join('/', "etc", "sonic", "sonic_version.yml") + command = "{} {} -d -t {},config-db -t {},config-db -y {} --write-to-db".format( + SONIC_CFGGEN_PATH, + cmd_ns, + buffer_template_file, + qos_template_file, + sonic_version_file ) # Apply the configurations only when both buffer and qos # configuration files are present diff --git a/pfcwd/main.py b/pfcwd/main.py index bc5211191b9a..c55038b9b21a 100644 --- a/pfcwd/main.py +++ b/pfcwd/main.py @@ -1,5 +1,4 @@ import os -import imp import sys import click @@ -22,7 +21,6 @@ import mock_tables.dbconnector if os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] == "multi_asic": import mock_tables.mock_multi_asic - imp.reload(mock_tables.mock_multi_asic) mock_tables.dbconnector.load_namespace_config() except KeyError: diff --git a/scripts/intfutil b/scripts/intfutil index b943b7c5435b..2f4baa71ab21 100755 --- a/scripts/intfutil +++ b/scripts/intfutil @@ -22,7 +22,7 @@ try: if os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] == "multi_asic": import mock_tables.mock_multi_asic mock_tables.dbconnector.load_namespace_config() - + except KeyError: pass @@ -461,7 +461,7 @@ class IntfDescription(object): self.intf_name = intf_name def display_intf_description(self): - + self.get_intf_description() # Sorting and tabulating the result table. diff --git a/tests/config_test.py b/tests/config_test.py index 30a1f10ec8f5..1ca37fb7a9bd 100644 --- a/tests/config_test.py +++ b/tests/config_test.py @@ -1,14 +1,10 @@ -import filecmp -import imp import os import traceback -import json from unittest import mock import click from click.testing import CliRunner -from sonic_py_common import device_info from utilities_common.db import Db load_minigraph_command_output="""\ @@ -65,10 +61,8 @@ class TestLoadMinigraph(object): def setup_class(cls): os.environ['UTILITIES_UNIT_TESTING'] = "1" print("SETUP") - import config.main - imp.reload(config.main) - def test_load_minigraph(self, get_cmd_module, setup_single_broadcom_asic): + def test_load_minigraph(self, get_cmd_module, setup_single_broacom_asic): with mock.patch("utilities_common.cli.run_command", mock.MagicMock(side_effect=mock_run_command_side_effect)) as mock_run_command: (config, show) = get_cmd_module runner = CliRunner() @@ -80,7 +74,7 @@ def test_load_minigraph(self, get_cmd_module, setup_single_broadcom_asic): assert "\n".join([l.rstrip() for l in result.output.split('\n')]) == load_minigraph_command_output assert mock_run_command.call_count == 38 - def test_load_minigraph_with_disabled_telemetry(self, get_cmd_module, setup_single_broadcom_asic): + def test_load_minigraph_with_disabled_telemetry(self, get_cmd_module, setup_single_broacom_asic): with mock.patch("utilities_common.cli.run_command", mock.MagicMock(side_effect=mock_run_command_side_effect)) as mock_run_command: (config, show) = get_cmd_module db = Db() @@ -101,98 +95,3 @@ def test_load_minigraph_with_disabled_telemetry(self, get_cmd_module, setup_sing def teardown_class(cls): os.environ['UTILITIES_UNIT_TESTING'] = "0" print("TEARDOWN") - - -class TestConfigQos(object): - @classmethod - def setup_class(cls): - print("SETUP") - os.environ['UTILITIES_UNIT_TESTING'] = "2" - import config.main - imp.reload(config.main) - - def test_qos_reload_single( - self, get_cmd_module, setup_qos_mock_apis, - setup_single_broadcom_asic - ): - (config, show) = get_cmd_module - runner = CliRunner() - output_file = os.path.join(os.sep, "tmp", "qos_config_output.json") - print("Saving output in {}".format(output_file)) - try: - os.remove(output_file) - except OSError: - pass - json_data = '{"DEVICE_METADATA": {"localhost": {}}}' - result = runner.invoke( - config.config.commands["qos"], - ["reload", "--dry_run", output_file, "--json-data", json_data] - ) - print(result.exit_code) - print(result.output) - assert result.exit_code == 0 - - cwd = os.path.dirname(os.path.realpath(__file__)) - expected_result = os.path.join( - cwd, "qos_config_input", "config_qos.json" - ) - assert filecmp.cmp(output_file, expected_result, shallow=False) - - @classmethod - def teardown_class(cls): - print("TEARDOWN") - os.environ['UTILITIES_UNIT_TESTING'] = "0" - - -class TestConfigQosMasic(object): - @classmethod - def setup_class(cls): - print("SETUP") - os.environ['UTILITIES_UNIT_TESTING'] = "2" - os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] = "multi_asic" - import config.main - imp.reload(config.main) - - def test_qos_reload_masic( - self, get_cmd_module, setup_qos_mock_apis, - setup_multi_broadcom_masic - ): - (config, show) = get_cmd_module - runner = CliRunner() - output_file = os.path.join(os.sep, "tmp", "qos_config_output.json") - print("Saving output in {}<0,1,2..>".format(output_file)) - num_asic = device_info.get_num_npus() - for asic in range(num_asic): - try: - file = "{}{}".format(output_file, asic) - os.remove(file) - except OSError: - pass - json_data = '{"DEVICE_METADATA": {"localhost": {}}}' - result = runner.invoke( - config.config.commands["qos"], - ["reload", "--dry_run", output_file, "--json-data", json_data] - ) - print(result.exit_code) - print(result.output) - assert result.exit_code == 0 - - cwd = os.path.dirname(os.path.realpath(__file__)) - - for asic in range(num_asic): - expected_result = os.path.join( - cwd, "qos_config_input", str(asic), "config_qos.json" - ) - file = "{}{}".format(output_file, asic) - assert filecmp.cmp(file, expected_result, shallow=False) - - @classmethod - def teardown_class(cls): - print("TEARDOWN") - os.environ['UTILITIES_UNIT_TESTING'] = "0" - os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] = "" - # change back to single asic config - from .mock_tables import dbconnector - from .mock_tables import mock_single_asic - imp.reload(mock_single_asic) - dbconnector.load_namespace_config() diff --git a/tests/conftest.py b/tests/conftest.py index 309e65f0558d..c4ec7bb61d98 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -56,47 +56,18 @@ def get_cmd_module(): return (config, show) -def set_mock_apis(): - import config.main as config - cwd = os.path.dirname(os.path.realpath(__file__)) - config.asic_type = mock.MagicMock(return_value="broadcom") - config._get_device_type = mock.MagicMock(return_value="ToRRouter") - -@pytest.fixture -def setup_qos_mock_apis(): - cwd = os.path.dirname(os.path.realpath(__file__)) - device_info.get_paths_to_platform_and_hwsku_dirs = mock.MagicMock( - return_value=( - os.path.join(cwd, "."), os.path.join(cwd, "qos_config_input") - ) - ) - device_info.get_sonic_version_file = mock.MagicMock( - return_value=os.path.join(cwd, "qos_config_input/sonic_version.yml") - ) @pytest.fixture -def setup_single_broadcom_asic(): +def setup_single_broacom_asic(): import config.main as config import show.main as show - set_mock_apis() device_info.get_num_npus = mock.MagicMock(return_value=1) config._get_sonic_generated_services = \ mock.MagicMock(return_value=(generated_services_list, [])) - -@pytest.fixture -def setup_multi_broadcom_masic(): - import config.main as config - import show.main as show - - set_mock_apis() - device_info.get_num_npus = mock.MagicMock(return_value=2) - - yield - - device_info.get_num_npus = mock.MagicMock(return_value=1) - + config.asic_type = mock.MagicMock(return_value="broadcom") + config._get_device_type = mock.MagicMock(return_value="ToRRouter") @pytest.fixture def setup_t1_topo(): diff --git a/tests/crm_test.py b/tests/crm_test.py index 0c42bf17fcb3..f4fdcece100b 100644 --- a/tests/crm_test.py +++ b/tests/crm_test.py @@ -1,4 +1,3 @@ -import imp import os import sys from importlib import reload @@ -1575,7 +1574,5 @@ def teardown_class(cls): print("TEARDOWN") os.environ["UTILITIES_UNIT_TESTING"] = "0" os.environ["UTILITIES_UNIT_TESTING_TOPOLOGY"] = "" - from .mock_tables import dbconnector from .mock_tables import mock_single_asic - imp.reload(mock_single_asic) - dbconnector.load_namespace_config() + reload(mock_single_asic) diff --git a/tests/mock_tables/mock_multi_asic.py b/tests/mock_tables/mock_multi_asic.py index 3e875af36a88..ad694003f77b 100644 --- a/tests/mock_tables/mock_multi_asic.py +++ b/tests/mock_tables/mock_multi_asic.py @@ -14,8 +14,6 @@ def mock_is_multi_asic(): def mock_get_namespace_list(namespace=None): return ['asic0', 'asic1'] - multi_asic.get_num_asics = mock_get_num_asics multi_asic.is_multi_asic = mock_is_multi_asic multi_asic.get_namespace_list = mock_get_namespace_list -multi_asic.get_namespaces_from_linux = mock_get_namespace_list diff --git a/tests/qos_config_input/0/buffers.json.j2 b/tests/qos_config_input/0/buffers.json.j2 deleted file mode 100644 index b67cf577ab75..000000000000 --- a/tests/qos_config_input/0/buffers.json.j2 +++ /dev/null @@ -1,3 +0,0 @@ -{%- set default_topo = 't1' %} -{%- include 'buffers_config.j2' %} - diff --git a/tests/qos_config_input/0/buffers_config.j2 b/tests/qos_config_input/0/buffers_config.j2 deleted file mode 100644 index f5dbb9784f64..000000000000 --- a/tests/qos_config_input/0/buffers_config.j2 +++ /dev/null @@ -1,172 +0,0 @@ -{%- macro set_default_topology() %} -{%- if default_topo is defined %} -{{ default_topo }} -{%- else %} -def -{%- endif %} -{%- endmacro -%} - -{# Determine device topology and filename postfix #} -{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost']['type'] is defined %} -{%- set switch_role = DEVICE_METADATA['localhost']['type'] %} -{%- if 'torrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%} -{%- set filename_postfix = 't0' %} -{%- elif 'leafrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%} -{%- set filename_postfix = 't1' %} -{%- else %} -{%- set filename_postfix = set_default_topology() %} -{%- endif %} -{%- else %} -{%- set filename_postfix = set_default_topology() %} -{%- set switch_role = '' %} -{%- endif -%} - -{# Import default values from device HWSKU folder #} -{%- import 'buffers_defaults_%s.j2' % filename_postfix as defs %} - -{%- set default_cable = defs.default_cable -%} - -{# 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 #} -{%- if defs.ports2cable is defined %} - {%- set ports2cable = defs.ports2cable %} -{%- else %} - {%- set ports2cable = { - 'torrouter_server' : '5m', - 'leafrouter_torrouter' : '40m', - 'spinerouter_leafrouter' : '300m' - } - -%} -{%- endif %} - -{%- macro cable_length(port_name) %} - {%- set cable_len = [] %} - {%- for local_port in DEVICE_NEIGHBOR %} - {%- if local_port == port_name %} - {%- if DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] %} - {%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] %} - {%- set neighbor_role = neighbor.type %} - {%- if 'asic' == neighbor_role | lower %} - {%- set roles1 = 'internal' %} - {%- if 'internal' not in ports2cable %} - {%- set _ = ports2cable.update({'internal': '5m'}) %} - {%- endif -%} - {%- else %} - {%- set roles1 = switch_role + '_' + neighbor_role %} - {%- set roles2 = neighbor_role + '_' + switch_role %} - {%- set roles1 = roles1 | lower %} - {%- set roles2 = roles2 | lower %} - {%- endif %} - {%- 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 %} - {%- if 'torrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%} - {%- for local_port in VLAN_MEMBER %} - {%- if local_port[1] == port_name %} - {%- set roles3 = switch_role + '_' + 'server' %} - {%- set roles3 = roles3 | lower %} - {%- if roles3 in ports2cable %} - {%- if cable_len.append(ports2cable[roles3]) %}{% endif %} - {%- endif %} - {%- endif %} - {%- endfor %} - {%- if cable_len -%} - {{ cable_len.0 }} - {%- else -%} - {{ default_cable }} - {%- endif %} - {%- else -%} - {{ default_cable }} - {%- endif %} - {%- endif %} -{%- endmacro %} - -{%- set PORT_ALL = [] %} - -{%- if PORT is not defined %} - {%- if defs.generate_port_lists(PORT_ALL) %} {% endif %} -{%- else %} - {%- for port in PORT %} - {%- if PORT_ALL.append(port) %}{%- endif %} - {%- endfor %} -{%- endif %} - -{%- set PORT_ACTIVE = [] %} -{%- if DEVICE_NEIGHBOR is not defined %} - {%- set PORT_ACTIVE = PORT_ALL %} -{%- else %} - {%- for port in DEVICE_NEIGHBOR.keys() %} - {%- if PORT_ACTIVE.append(port) %}{%- endif %} - {%- endfor %} -{%- endif %} - -{%- set port_names_list_active = [] %} -{%- for port in PORT_ACTIVE %} - {%- if port_names_list_active.append(port) %}{%- endif %} -{%- endfor %} -{%- set port_names_active = port_names_list_active | join(',') %} - -{ - "CABLE_LENGTH": { - "AZURE": { - {% for port in PORT_ALL %} - {%- set cable = cable_length(port) %} - "{{ port }}": "{{ cable }}"{%- if not loop.last %},{% endif %} - - {% endfor %} - } - }, - -{% 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_active) }}, -{% endif %} - -{%- if defs.generate_pg_profils is defined %} -{{ defs.generate_pg_profils(port_names_active) }} -{% else %} - "BUFFER_PG": { -{% for port in PORT_ACTIVE %} - "{{ port }}|0": { - "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - }, -{% endif %} - -{% if defs.generate_queue_buffers is defined %} -{{ defs.generate_queue_buffers(port_names_active) }} -{% else %} - "BUFFER_QUEUE": { -{% for port in PORT_ACTIVE %} - "{{ port }}|3-4": { - "profile" : "[BUFFER_PROFILE|egress_lossless_profile]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|0-2": { - "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|5-6": { - "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - } -{% endif %} -} diff --git a/tests/qos_config_input/0/buffers_defaults_t0.j2 b/tests/qos_config_input/0/buffers_defaults_t0.j2 deleted file mode 100644 index 38e34eb571e8..000000000000 --- a/tests/qos_config_input/0/buffers_defaults_t0.j2 +++ /dev/null @@ -1,45 +0,0 @@ -{%- set default_cable = '300m' %} - -{%- 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 * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "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":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/tests/qos_config_input/0/buffers_defaults_t1.j2 b/tests/qos_config_input/0/buffers_defaults_t1.j2 deleted file mode 100644 index 38e34eb571e8..000000000000 --- a/tests/qos_config_input/0/buffers_defaults_t1.j2 +++ /dev/null @@ -1,45 +0,0 @@ -{%- set default_cable = '300m' %} - -{%- 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 * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "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":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/tests/qos_config_input/0/config_qos.json b/tests/qos_config_input/0/config_qos.json deleted file mode 100644 index 40c1903a06ff..000000000000 --- a/tests/qos_config_input/0/config_qos.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "TC_TO_PRIORITY_GROUP_MAP": { - "AZURE": { - "0": "0", - "1": "0", - "2": "0", - "3": "3", - "4": "4", - "5": "0", - "6": "0", - "7": "7" - } - }, - "MAP_PFC_PRIORITY_TO_QUEUE": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, - "TC_TO_QUEUE_MAP": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, - "DSCP_TO_TC_MAP": { - "AZURE": { - "0" : "1", - "1" : "1", - "2" : "1", - "3" : "3", - "4" : "4", - "5" : "2", - "6" : "1", - "7" : "1", - "8" : "0", - "9" : "1", - "10": "1", - "11": "1", - "12": "1", - "13": "1", - "14": "1", - "15": "1", - "16": "1", - "17": "1", - "18": "1", - "19": "1", - "20": "1", - "21": "1", - "22": "1", - "23": "1", - "24": "1", - "25": "1", - "26": "1", - "27": "1", - "28": "1", - "29": "1", - "30": "1", - "31": "1", - "32": "1", - "33": "1", - "34": "1", - "35": "1", - "36": "1", - "37": "1", - "38": "1", - "39": "1", - "40": "1", - "41": "1", - "42": "1", - "43": "1", - "44": "1", - "45": "1", - "46": "5", - "47": "1", - "48": "6", - "49": "1", - "50": "1", - "51": "1", - "52": "1", - "53": "1", - "54": "1", - "55": "1", - "56": "1", - "57": "1", - "58": "1", - "59": "1", - "60": "1", - "61": "1", - "62": "1", - "63": "1" - } - }, - "SCHEDULER": { - "scheduler.0": { - "type" : "DWRR", - "weight": "14" - }, - "scheduler.1": { - "type" : "DWRR", - "weight": "15" - } - }, - "PORT_QOS_MAP": { - }, - "WRED_PROFILE": { - "AZURE_LOSSLESS" : { - "wred_green_enable" : "true", - "wred_yellow_enable" : "true", - "wred_red_enable" : "true", - "ecn" : "ecn_all", - "green_max_threshold" : "2097152", - "green_min_threshold" : "1048576", - "yellow_max_threshold" : "2097152", - "yellow_min_threshold" : "1048576", - "red_max_threshold" : "2097152", - "red_min_threshold" : "1048576", - "green_drop_probability" : "5", - "yellow_drop_probability": "5", - "red_drop_probability" : "5" - } - }, - "QUEUE": { - } -} diff --git a/tests/qos_config_input/0/qos.json.j2 b/tests/qos_config_input/0/qos.json.j2 deleted file mode 100644 index 3e548325ea30..000000000000 --- a/tests/qos_config_input/0/qos.json.j2 +++ /dev/null @@ -1 +0,0 @@ -{%- include 'qos_config.j2' %} diff --git a/tests/qos_config_input/0/qos_config.j2 b/tests/qos_config_input/0/qos_config.j2 deleted file mode 100644 index a7c361d69fa5..000000000000 --- a/tests/qos_config_input/0/qos_config.j2 +++ /dev/null @@ -1,257 +0,0 @@ -{%- set PORT_ALL = [] %} -{%- for port in PORT %} - {%- if PORT_ALL.append(port) %}{% endif %} -{%- endfor %} -{%- if PORT_ALL | sort_by_port_index %}{% endif %} - -{%- set port_names_list_all = [] %} -{%- for port in PORT_ALL %} - {%- if port_names_list_all.append(port) %}{% endif %} -{%- endfor %} -{%- set port_names_all = port_names_list_all | join(',') -%} - - -{%- set PORT_ACTIVE = [] %} -{%- if DEVICE_NEIGHBOR is not defined %} - {%- set PORT_ACTIVE = PORT_ALL %} -{%- else %} - {%- for port in DEVICE_NEIGHBOR.keys() %} - {%- if PORT_ACTIVE.append(port) %}{%- endif %} - {%- endfor %} -{%- endif %} -{%- if PORT_ACTIVE | sort_by_port_index %}{% endif %} - -{%- set port_names_list_active = [] %} -{%- for port in PORT_ACTIVE %} - {%- if port_names_list_active.append(port) %}{%- endif %} -{%- endfor %} -{%- set port_names_active = port_names_list_active | join(',') -%} - - -{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%} -{%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%} - - -{ -{% if generate_tc_to_pg_map is defined %} - {{- generate_tc_to_pg_map() }} -{% else %} - "TC_TO_PRIORITY_GROUP_MAP": { - "AZURE": { - "0": "0", - "1": "0", - "2": "0", - "3": "3", - "4": "4", - "5": "0", - "6": "0", - "7": "7" - } - }, -{% endif %} - "MAP_PFC_PRIORITY_TO_QUEUE": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, - "TC_TO_QUEUE_MAP": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, -{% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] in backend_device_types and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true' %} - "DOT1P_TO_TC_MAP": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, -{% else %} - "DSCP_TO_TC_MAP": { - "AZURE": { - "0" : "1", - "1" : "1", - "2" : "1", - "3" : "3", - "4" : "4", - "5" : "2", - "6" : "1", - "7" : "1", - "8" : "0", - "9" : "1", - "10": "1", - "11": "1", - "12": "1", - "13": "1", - "14": "1", - "15": "1", - "16": "1", - "17": "1", - "18": "1", - "19": "1", - "20": "1", - "21": "1", - "22": "1", - "23": "1", - "24": "1", - "25": "1", - "26": "1", - "27": "1", - "28": "1", - "29": "1", - "30": "1", - "31": "1", - "32": "1", - "33": "1", - "34": "1", - "35": "1", - "36": "1", - "37": "1", - "38": "1", - "39": "1", - "40": "1", - "41": "1", - "42": "1", - "43": "1", - "44": "1", - "45": "1", - "46": "5", - "47": "1", - "48": "6", - "49": "1", - "50": "1", - "51": "1", - "52": "1", - "53": "1", - "54": "1", - "55": "1", - "56": "1", - "57": "1", - "58": "1", - "59": "1", - "60": "1", - "61": "1", - "62": "1", - "63": "1" - } - }, -{% endif %} - "SCHEDULER": { - "scheduler.0": { - "type" : "DWRR", - "weight": "14" - }, - "scheduler.1": { - "type" : "DWRR", - "weight": "15" - } - }, -{% if asic_type in pfc_to_pg_map_supported_asics %} - "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": { - "AZURE": { - "3": "3", - "4": "4" - } - }, -{% endif %} - "PORT_QOS_MAP": { -{% for port in PORT_ACTIVE %} - "{{ port }}": { -{% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] in backend_device_types and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true' %} - "dot1p_to_tc_map" : "[DOT1P_TO_TC_MAP|AZURE]", -{% else %} - "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]", -{% endif %} - "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]", - "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]", - "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]", -{% if asic_type in pfc_to_pg_map_supported_asics %} - "pfc_to_pg_map" : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]", -{% endif %} - "pfc_enable" : "3,4" - }{% if not loop.last %},{% endif %} - -{% endfor %} - }, -{% if generate_wred_profiles is defined %} - {{- generate_wred_profiles() }} -{% else %} - "WRED_PROFILE": { - "AZURE_LOSSLESS" : { - "wred_green_enable" : "true", - "wred_yellow_enable" : "true", - "wred_red_enable" : "true", - "ecn" : "ecn_all", - "green_max_threshold" : "2097152", - "green_min_threshold" : "1048576", - "yellow_max_threshold" : "2097152", - "yellow_min_threshold" : "1048576", - "red_max_threshold" : "2097152", - "red_min_threshold" : "1048576", - "green_drop_probability" : "5", - "yellow_drop_probability": "5", - "red_drop_probability" : "5" - } - }, -{% endif %} - "QUEUE": { -{% for port in PORT_ACTIVE %} - "{{ port }}|3": { - "scheduler" : "[SCHEDULER|scheduler.1]", - "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|4": { - "scheduler" : "[SCHEDULER|scheduler.1]", - "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|0": { - "scheduler": "[SCHEDULER|scheduler.0]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|1": { - "scheduler": "[SCHEDULER|scheduler.0]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|2": { - "scheduler": "[SCHEDULER|scheduler.0]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|5": { - "scheduler": "[SCHEDULER|scheduler.0]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|6": { - "scheduler": "[SCHEDULER|scheduler.0]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - } -} diff --git a/tests/qos_config_input/1/buffers.json.j2 b/tests/qos_config_input/1/buffers.json.j2 deleted file mode 100644 index b67cf577ab75..000000000000 --- a/tests/qos_config_input/1/buffers.json.j2 +++ /dev/null @@ -1,3 +0,0 @@ -{%- set default_topo = 't1' %} -{%- include 'buffers_config.j2' %} - diff --git a/tests/qos_config_input/1/buffers_config.j2 b/tests/qos_config_input/1/buffers_config.j2 deleted file mode 100644 index f5dbb9784f64..000000000000 --- a/tests/qos_config_input/1/buffers_config.j2 +++ /dev/null @@ -1,172 +0,0 @@ -{%- macro set_default_topology() %} -{%- if default_topo is defined %} -{{ default_topo }} -{%- else %} -def -{%- endif %} -{%- endmacro -%} - -{# Determine device topology and filename postfix #} -{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost']['type'] is defined %} -{%- set switch_role = DEVICE_METADATA['localhost']['type'] %} -{%- if 'torrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%} -{%- set filename_postfix = 't0' %} -{%- elif 'leafrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%} -{%- set filename_postfix = 't1' %} -{%- else %} -{%- set filename_postfix = set_default_topology() %} -{%- endif %} -{%- else %} -{%- set filename_postfix = set_default_topology() %} -{%- set switch_role = '' %} -{%- endif -%} - -{# Import default values from device HWSKU folder #} -{%- import 'buffers_defaults_%s.j2' % filename_postfix as defs %} - -{%- set default_cable = defs.default_cable -%} - -{# 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 #} -{%- if defs.ports2cable is defined %} - {%- set ports2cable = defs.ports2cable %} -{%- else %} - {%- set ports2cable = { - 'torrouter_server' : '5m', - 'leafrouter_torrouter' : '40m', - 'spinerouter_leafrouter' : '300m' - } - -%} -{%- endif %} - -{%- macro cable_length(port_name) %} - {%- set cable_len = [] %} - {%- for local_port in DEVICE_NEIGHBOR %} - {%- if local_port == port_name %} - {%- if DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] %} - {%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] %} - {%- set neighbor_role = neighbor.type %} - {%- if 'asic' == neighbor_role | lower %} - {%- set roles1 = 'internal' %} - {%- if 'internal' not in ports2cable %} - {%- set _ = ports2cable.update({'internal': '5m'}) %} - {%- endif -%} - {%- else %} - {%- set roles1 = switch_role + '_' + neighbor_role %} - {%- set roles2 = neighbor_role + '_' + switch_role %} - {%- set roles1 = roles1 | lower %} - {%- set roles2 = roles2 | lower %} - {%- endif %} - {%- 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 %} - {%- if 'torrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%} - {%- for local_port in VLAN_MEMBER %} - {%- if local_port[1] == port_name %} - {%- set roles3 = switch_role + '_' + 'server' %} - {%- set roles3 = roles3 | lower %} - {%- if roles3 in ports2cable %} - {%- if cable_len.append(ports2cable[roles3]) %}{% endif %} - {%- endif %} - {%- endif %} - {%- endfor %} - {%- if cable_len -%} - {{ cable_len.0 }} - {%- else -%} - {{ default_cable }} - {%- endif %} - {%- else -%} - {{ default_cable }} - {%- endif %} - {%- endif %} -{%- endmacro %} - -{%- set PORT_ALL = [] %} - -{%- if PORT is not defined %} - {%- if defs.generate_port_lists(PORT_ALL) %} {% endif %} -{%- else %} - {%- for port in PORT %} - {%- if PORT_ALL.append(port) %}{%- endif %} - {%- endfor %} -{%- endif %} - -{%- set PORT_ACTIVE = [] %} -{%- if DEVICE_NEIGHBOR is not defined %} - {%- set PORT_ACTIVE = PORT_ALL %} -{%- else %} - {%- for port in DEVICE_NEIGHBOR.keys() %} - {%- if PORT_ACTIVE.append(port) %}{%- endif %} - {%- endfor %} -{%- endif %} - -{%- set port_names_list_active = [] %} -{%- for port in PORT_ACTIVE %} - {%- if port_names_list_active.append(port) %}{%- endif %} -{%- endfor %} -{%- set port_names_active = port_names_list_active | join(',') %} - -{ - "CABLE_LENGTH": { - "AZURE": { - {% for port in PORT_ALL %} - {%- set cable = cable_length(port) %} - "{{ port }}": "{{ cable }}"{%- if not loop.last %},{% endif %} - - {% endfor %} - } - }, - -{% 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_active) }}, -{% endif %} - -{%- if defs.generate_pg_profils is defined %} -{{ defs.generate_pg_profils(port_names_active) }} -{% else %} - "BUFFER_PG": { -{% for port in PORT_ACTIVE %} - "{{ port }}|0": { - "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - }, -{% endif %} - -{% if defs.generate_queue_buffers is defined %} -{{ defs.generate_queue_buffers(port_names_active) }} -{% else %} - "BUFFER_QUEUE": { -{% for port in PORT_ACTIVE %} - "{{ port }}|3-4": { - "profile" : "[BUFFER_PROFILE|egress_lossless_profile]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|0-2": { - "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|5-6": { - "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - } -{% endif %} -} diff --git a/tests/qos_config_input/1/buffers_defaults_t0.j2 b/tests/qos_config_input/1/buffers_defaults_t0.j2 deleted file mode 100644 index 38e34eb571e8..000000000000 --- a/tests/qos_config_input/1/buffers_defaults_t0.j2 +++ /dev/null @@ -1,45 +0,0 @@ -{%- set default_cable = '300m' %} - -{%- 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 * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "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":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/tests/qos_config_input/1/buffers_defaults_t1.j2 b/tests/qos_config_input/1/buffers_defaults_t1.j2 deleted file mode 100644 index 38e34eb571e8..000000000000 --- a/tests/qos_config_input/1/buffers_defaults_t1.j2 +++ /dev/null @@ -1,45 +0,0 @@ -{%- set default_cable = '300m' %} - -{%- 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 * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "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":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/tests/qos_config_input/1/config_qos.json b/tests/qos_config_input/1/config_qos.json deleted file mode 100644 index 40c1903a06ff..000000000000 --- a/tests/qos_config_input/1/config_qos.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "TC_TO_PRIORITY_GROUP_MAP": { - "AZURE": { - "0": "0", - "1": "0", - "2": "0", - "3": "3", - "4": "4", - "5": "0", - "6": "0", - "7": "7" - } - }, - "MAP_PFC_PRIORITY_TO_QUEUE": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, - "TC_TO_QUEUE_MAP": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, - "DSCP_TO_TC_MAP": { - "AZURE": { - "0" : "1", - "1" : "1", - "2" : "1", - "3" : "3", - "4" : "4", - "5" : "2", - "6" : "1", - "7" : "1", - "8" : "0", - "9" : "1", - "10": "1", - "11": "1", - "12": "1", - "13": "1", - "14": "1", - "15": "1", - "16": "1", - "17": "1", - "18": "1", - "19": "1", - "20": "1", - "21": "1", - "22": "1", - "23": "1", - "24": "1", - "25": "1", - "26": "1", - "27": "1", - "28": "1", - "29": "1", - "30": "1", - "31": "1", - "32": "1", - "33": "1", - "34": "1", - "35": "1", - "36": "1", - "37": "1", - "38": "1", - "39": "1", - "40": "1", - "41": "1", - "42": "1", - "43": "1", - "44": "1", - "45": "1", - "46": "5", - "47": "1", - "48": "6", - "49": "1", - "50": "1", - "51": "1", - "52": "1", - "53": "1", - "54": "1", - "55": "1", - "56": "1", - "57": "1", - "58": "1", - "59": "1", - "60": "1", - "61": "1", - "62": "1", - "63": "1" - } - }, - "SCHEDULER": { - "scheduler.0": { - "type" : "DWRR", - "weight": "14" - }, - "scheduler.1": { - "type" : "DWRR", - "weight": "15" - } - }, - "PORT_QOS_MAP": { - }, - "WRED_PROFILE": { - "AZURE_LOSSLESS" : { - "wred_green_enable" : "true", - "wred_yellow_enable" : "true", - "wred_red_enable" : "true", - "ecn" : "ecn_all", - "green_max_threshold" : "2097152", - "green_min_threshold" : "1048576", - "yellow_max_threshold" : "2097152", - "yellow_min_threshold" : "1048576", - "red_max_threshold" : "2097152", - "red_min_threshold" : "1048576", - "green_drop_probability" : "5", - "yellow_drop_probability": "5", - "red_drop_probability" : "5" - } - }, - "QUEUE": { - } -} diff --git a/tests/qos_config_input/1/qos.json.j2 b/tests/qos_config_input/1/qos.json.j2 deleted file mode 100644 index 3e548325ea30..000000000000 --- a/tests/qos_config_input/1/qos.json.j2 +++ /dev/null @@ -1 +0,0 @@ -{%- include 'qos_config.j2' %} diff --git a/tests/qos_config_input/1/qos_config.j2 b/tests/qos_config_input/1/qos_config.j2 deleted file mode 100644 index a7c361d69fa5..000000000000 --- a/tests/qos_config_input/1/qos_config.j2 +++ /dev/null @@ -1,257 +0,0 @@ -{%- set PORT_ALL = [] %} -{%- for port in PORT %} - {%- if PORT_ALL.append(port) %}{% endif %} -{%- endfor %} -{%- if PORT_ALL | sort_by_port_index %}{% endif %} - -{%- set port_names_list_all = [] %} -{%- for port in PORT_ALL %} - {%- if port_names_list_all.append(port) %}{% endif %} -{%- endfor %} -{%- set port_names_all = port_names_list_all | join(',') -%} - - -{%- set PORT_ACTIVE = [] %} -{%- if DEVICE_NEIGHBOR is not defined %} - {%- set PORT_ACTIVE = PORT_ALL %} -{%- else %} - {%- for port in DEVICE_NEIGHBOR.keys() %} - {%- if PORT_ACTIVE.append(port) %}{%- endif %} - {%- endfor %} -{%- endif %} -{%- if PORT_ACTIVE | sort_by_port_index %}{% endif %} - -{%- set port_names_list_active = [] %} -{%- for port in PORT_ACTIVE %} - {%- if port_names_list_active.append(port) %}{%- endif %} -{%- endfor %} -{%- set port_names_active = port_names_list_active | join(',') -%} - - -{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%} -{%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%} - - -{ -{% if generate_tc_to_pg_map is defined %} - {{- generate_tc_to_pg_map() }} -{% else %} - "TC_TO_PRIORITY_GROUP_MAP": { - "AZURE": { - "0": "0", - "1": "0", - "2": "0", - "3": "3", - "4": "4", - "5": "0", - "6": "0", - "7": "7" - } - }, -{% endif %} - "MAP_PFC_PRIORITY_TO_QUEUE": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, - "TC_TO_QUEUE_MAP": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, -{% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] in backend_device_types and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true' %} - "DOT1P_TO_TC_MAP": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, -{% else %} - "DSCP_TO_TC_MAP": { - "AZURE": { - "0" : "1", - "1" : "1", - "2" : "1", - "3" : "3", - "4" : "4", - "5" : "2", - "6" : "1", - "7" : "1", - "8" : "0", - "9" : "1", - "10": "1", - "11": "1", - "12": "1", - "13": "1", - "14": "1", - "15": "1", - "16": "1", - "17": "1", - "18": "1", - "19": "1", - "20": "1", - "21": "1", - "22": "1", - "23": "1", - "24": "1", - "25": "1", - "26": "1", - "27": "1", - "28": "1", - "29": "1", - "30": "1", - "31": "1", - "32": "1", - "33": "1", - "34": "1", - "35": "1", - "36": "1", - "37": "1", - "38": "1", - "39": "1", - "40": "1", - "41": "1", - "42": "1", - "43": "1", - "44": "1", - "45": "1", - "46": "5", - "47": "1", - "48": "6", - "49": "1", - "50": "1", - "51": "1", - "52": "1", - "53": "1", - "54": "1", - "55": "1", - "56": "1", - "57": "1", - "58": "1", - "59": "1", - "60": "1", - "61": "1", - "62": "1", - "63": "1" - } - }, -{% endif %} - "SCHEDULER": { - "scheduler.0": { - "type" : "DWRR", - "weight": "14" - }, - "scheduler.1": { - "type" : "DWRR", - "weight": "15" - } - }, -{% if asic_type in pfc_to_pg_map_supported_asics %} - "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": { - "AZURE": { - "3": "3", - "4": "4" - } - }, -{% endif %} - "PORT_QOS_MAP": { -{% for port in PORT_ACTIVE %} - "{{ port }}": { -{% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] in backend_device_types and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true' %} - "dot1p_to_tc_map" : "[DOT1P_TO_TC_MAP|AZURE]", -{% else %} - "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]", -{% endif %} - "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]", - "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]", - "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]", -{% if asic_type in pfc_to_pg_map_supported_asics %} - "pfc_to_pg_map" : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]", -{% endif %} - "pfc_enable" : "3,4" - }{% if not loop.last %},{% endif %} - -{% endfor %} - }, -{% if generate_wred_profiles is defined %} - {{- generate_wred_profiles() }} -{% else %} - "WRED_PROFILE": { - "AZURE_LOSSLESS" : { - "wred_green_enable" : "true", - "wred_yellow_enable" : "true", - "wred_red_enable" : "true", - "ecn" : "ecn_all", - "green_max_threshold" : "2097152", - "green_min_threshold" : "1048576", - "yellow_max_threshold" : "2097152", - "yellow_min_threshold" : "1048576", - "red_max_threshold" : "2097152", - "red_min_threshold" : "1048576", - "green_drop_probability" : "5", - "yellow_drop_probability": "5", - "red_drop_probability" : "5" - } - }, -{% endif %} - "QUEUE": { -{% for port in PORT_ACTIVE %} - "{{ port }}|3": { - "scheduler" : "[SCHEDULER|scheduler.1]", - "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|4": { - "scheduler" : "[SCHEDULER|scheduler.1]", - "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|0": { - "scheduler": "[SCHEDULER|scheduler.0]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|1": { - "scheduler": "[SCHEDULER|scheduler.0]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|2": { - "scheduler": "[SCHEDULER|scheduler.0]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|5": { - "scheduler": "[SCHEDULER|scheduler.0]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|6": { - "scheduler": "[SCHEDULER|scheduler.0]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - } -} diff --git a/tests/qos_config_input/buffers.json.j2 b/tests/qos_config_input/buffers.json.j2 deleted file mode 100644 index b67cf577ab75..000000000000 --- a/tests/qos_config_input/buffers.json.j2 +++ /dev/null @@ -1,3 +0,0 @@ -{%- set default_topo = 't1' %} -{%- include 'buffers_config.j2' %} - diff --git a/tests/qos_config_input/buffers_config.j2 b/tests/qos_config_input/buffers_config.j2 deleted file mode 100644 index f5dbb9784f64..000000000000 --- a/tests/qos_config_input/buffers_config.j2 +++ /dev/null @@ -1,172 +0,0 @@ -{%- macro set_default_topology() %} -{%- if default_topo is defined %} -{{ default_topo }} -{%- else %} -def -{%- endif %} -{%- endmacro -%} - -{# Determine device topology and filename postfix #} -{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost']['type'] is defined %} -{%- set switch_role = DEVICE_METADATA['localhost']['type'] %} -{%- if 'torrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%} -{%- set filename_postfix = 't0' %} -{%- elif 'leafrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%} -{%- set filename_postfix = 't1' %} -{%- else %} -{%- set filename_postfix = set_default_topology() %} -{%- endif %} -{%- else %} -{%- set filename_postfix = set_default_topology() %} -{%- set switch_role = '' %} -{%- endif -%} - -{# Import default values from device HWSKU folder #} -{%- import 'buffers_defaults_%s.j2' % filename_postfix as defs %} - -{%- set default_cable = defs.default_cable -%} - -{# 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 #} -{%- if defs.ports2cable is defined %} - {%- set ports2cable = defs.ports2cable %} -{%- else %} - {%- set ports2cable = { - 'torrouter_server' : '5m', - 'leafrouter_torrouter' : '40m', - 'spinerouter_leafrouter' : '300m' - } - -%} -{%- endif %} - -{%- macro cable_length(port_name) %} - {%- set cable_len = [] %} - {%- for local_port in DEVICE_NEIGHBOR %} - {%- if local_port == port_name %} - {%- if DEVICE_NEIGHBOR_METADATA is defined and DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] %} - {%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] %} - {%- set neighbor_role = neighbor.type %} - {%- if 'asic' == neighbor_role | lower %} - {%- set roles1 = 'internal' %} - {%- if 'internal' not in ports2cable %} - {%- set _ = ports2cable.update({'internal': '5m'}) %} - {%- endif -%} - {%- else %} - {%- set roles1 = switch_role + '_' + neighbor_role %} - {%- set roles2 = neighbor_role + '_' + switch_role %} - {%- set roles1 = roles1 | lower %} - {%- set roles2 = roles2 | lower %} - {%- endif %} - {%- 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 %} - {%- if 'torrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%} - {%- for local_port in VLAN_MEMBER %} - {%- if local_port[1] == port_name %} - {%- set roles3 = switch_role + '_' + 'server' %} - {%- set roles3 = roles3 | lower %} - {%- if roles3 in ports2cable %} - {%- if cable_len.append(ports2cable[roles3]) %}{% endif %} - {%- endif %} - {%- endif %} - {%- endfor %} - {%- if cable_len -%} - {{ cable_len.0 }} - {%- else -%} - {{ default_cable }} - {%- endif %} - {%- else -%} - {{ default_cable }} - {%- endif %} - {%- endif %} -{%- endmacro %} - -{%- set PORT_ALL = [] %} - -{%- if PORT is not defined %} - {%- if defs.generate_port_lists(PORT_ALL) %} {% endif %} -{%- else %} - {%- for port in PORT %} - {%- if PORT_ALL.append(port) %}{%- endif %} - {%- endfor %} -{%- endif %} - -{%- set PORT_ACTIVE = [] %} -{%- if DEVICE_NEIGHBOR is not defined %} - {%- set PORT_ACTIVE = PORT_ALL %} -{%- else %} - {%- for port in DEVICE_NEIGHBOR.keys() %} - {%- if PORT_ACTIVE.append(port) %}{%- endif %} - {%- endfor %} -{%- endif %} - -{%- set port_names_list_active = [] %} -{%- for port in PORT_ACTIVE %} - {%- if port_names_list_active.append(port) %}{%- endif %} -{%- endfor %} -{%- set port_names_active = port_names_list_active | join(',') %} - -{ - "CABLE_LENGTH": { - "AZURE": { - {% for port in PORT_ALL %} - {%- set cable = cable_length(port) %} - "{{ port }}": "{{ cable }}"{%- if not loop.last %},{% endif %} - - {% endfor %} - } - }, - -{% 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_active) }}, -{% endif %} - -{%- if defs.generate_pg_profils is defined %} -{{ defs.generate_pg_profils(port_names_active) }} -{% else %} - "BUFFER_PG": { -{% for port in PORT_ACTIVE %} - "{{ port }}|0": { - "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - }, -{% endif %} - -{% if defs.generate_queue_buffers is defined %} -{{ defs.generate_queue_buffers(port_names_active) }} -{% else %} - "BUFFER_QUEUE": { -{% for port in PORT_ACTIVE %} - "{{ port }}|3-4": { - "profile" : "[BUFFER_PROFILE|egress_lossless_profile]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|0-2": { - "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|5-6": { - "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - } -{% endif %} -} diff --git a/tests/qos_config_input/buffers_defaults_t1.j2 b/tests/qos_config_input/buffers_defaults_t1.j2 deleted file mode 100644 index 38e34eb571e8..000000000000 --- a/tests/qos_config_input/buffers_defaults_t1.j2 +++ /dev/null @@ -1,45 +0,0 @@ -{%- set default_cable = '300m' %} - -{%- 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 * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "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":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/tests/qos_config_input/config_qos.json b/tests/qos_config_input/config_qos.json deleted file mode 100644 index 40c1903a06ff..000000000000 --- a/tests/qos_config_input/config_qos.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "TC_TO_PRIORITY_GROUP_MAP": { - "AZURE": { - "0": "0", - "1": "0", - "2": "0", - "3": "3", - "4": "4", - "5": "0", - "6": "0", - "7": "7" - } - }, - "MAP_PFC_PRIORITY_TO_QUEUE": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, - "TC_TO_QUEUE_MAP": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, - "DSCP_TO_TC_MAP": { - "AZURE": { - "0" : "1", - "1" : "1", - "2" : "1", - "3" : "3", - "4" : "4", - "5" : "2", - "6" : "1", - "7" : "1", - "8" : "0", - "9" : "1", - "10": "1", - "11": "1", - "12": "1", - "13": "1", - "14": "1", - "15": "1", - "16": "1", - "17": "1", - "18": "1", - "19": "1", - "20": "1", - "21": "1", - "22": "1", - "23": "1", - "24": "1", - "25": "1", - "26": "1", - "27": "1", - "28": "1", - "29": "1", - "30": "1", - "31": "1", - "32": "1", - "33": "1", - "34": "1", - "35": "1", - "36": "1", - "37": "1", - "38": "1", - "39": "1", - "40": "1", - "41": "1", - "42": "1", - "43": "1", - "44": "1", - "45": "1", - "46": "5", - "47": "1", - "48": "6", - "49": "1", - "50": "1", - "51": "1", - "52": "1", - "53": "1", - "54": "1", - "55": "1", - "56": "1", - "57": "1", - "58": "1", - "59": "1", - "60": "1", - "61": "1", - "62": "1", - "63": "1" - } - }, - "SCHEDULER": { - "scheduler.0": { - "type" : "DWRR", - "weight": "14" - }, - "scheduler.1": { - "type" : "DWRR", - "weight": "15" - } - }, - "PORT_QOS_MAP": { - }, - "WRED_PROFILE": { - "AZURE_LOSSLESS" : { - "wred_green_enable" : "true", - "wred_yellow_enable" : "true", - "wred_red_enable" : "true", - "ecn" : "ecn_all", - "green_max_threshold" : "2097152", - "green_min_threshold" : "1048576", - "yellow_max_threshold" : "2097152", - "yellow_min_threshold" : "1048576", - "red_max_threshold" : "2097152", - "red_min_threshold" : "1048576", - "green_drop_probability" : "5", - "yellow_drop_probability": "5", - "red_drop_probability" : "5" - } - }, - "QUEUE": { - } -} diff --git a/tests/qos_config_input/qos.json.j2 b/tests/qos_config_input/qos.json.j2 deleted file mode 100644 index 3e548325ea30..000000000000 --- a/tests/qos_config_input/qos.json.j2 +++ /dev/null @@ -1 +0,0 @@ -{%- include 'qos_config.j2' %} diff --git a/tests/qos_config_input/qos_config.j2 b/tests/qos_config_input/qos_config.j2 deleted file mode 100644 index a7c361d69fa5..000000000000 --- a/tests/qos_config_input/qos_config.j2 +++ /dev/null @@ -1,257 +0,0 @@ -{%- set PORT_ALL = [] %} -{%- for port in PORT %} - {%- if PORT_ALL.append(port) %}{% endif %} -{%- endfor %} -{%- if PORT_ALL | sort_by_port_index %}{% endif %} - -{%- set port_names_list_all = [] %} -{%- for port in PORT_ALL %} - {%- if port_names_list_all.append(port) %}{% endif %} -{%- endfor %} -{%- set port_names_all = port_names_list_all | join(',') -%} - - -{%- set PORT_ACTIVE = [] %} -{%- if DEVICE_NEIGHBOR is not defined %} - {%- set PORT_ACTIVE = PORT_ALL %} -{%- else %} - {%- for port in DEVICE_NEIGHBOR.keys() %} - {%- if PORT_ACTIVE.append(port) %}{%- endif %} - {%- endfor %} -{%- endif %} -{%- if PORT_ACTIVE | sort_by_port_index %}{% endif %} - -{%- set port_names_list_active = [] %} -{%- for port in PORT_ACTIVE %} - {%- if port_names_list_active.append(port) %}{%- endif %} -{%- endfor %} -{%- set port_names_active = port_names_list_active | join(',') -%} - - -{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%} -{%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%} - - -{ -{% if generate_tc_to_pg_map is defined %} - {{- generate_tc_to_pg_map() }} -{% else %} - "TC_TO_PRIORITY_GROUP_MAP": { - "AZURE": { - "0": "0", - "1": "0", - "2": "0", - "3": "3", - "4": "4", - "5": "0", - "6": "0", - "7": "7" - } - }, -{% endif %} - "MAP_PFC_PRIORITY_TO_QUEUE": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, - "TC_TO_QUEUE_MAP": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, -{% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] in backend_device_types and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true' %} - "DOT1P_TO_TC_MAP": { - "AZURE": { - "0": "0", - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7" - } - }, -{% else %} - "DSCP_TO_TC_MAP": { - "AZURE": { - "0" : "1", - "1" : "1", - "2" : "1", - "3" : "3", - "4" : "4", - "5" : "2", - "6" : "1", - "7" : "1", - "8" : "0", - "9" : "1", - "10": "1", - "11": "1", - "12": "1", - "13": "1", - "14": "1", - "15": "1", - "16": "1", - "17": "1", - "18": "1", - "19": "1", - "20": "1", - "21": "1", - "22": "1", - "23": "1", - "24": "1", - "25": "1", - "26": "1", - "27": "1", - "28": "1", - "29": "1", - "30": "1", - "31": "1", - "32": "1", - "33": "1", - "34": "1", - "35": "1", - "36": "1", - "37": "1", - "38": "1", - "39": "1", - "40": "1", - "41": "1", - "42": "1", - "43": "1", - "44": "1", - "45": "1", - "46": "5", - "47": "1", - "48": "6", - "49": "1", - "50": "1", - "51": "1", - "52": "1", - "53": "1", - "54": "1", - "55": "1", - "56": "1", - "57": "1", - "58": "1", - "59": "1", - "60": "1", - "61": "1", - "62": "1", - "63": "1" - } - }, -{% endif %} - "SCHEDULER": { - "scheduler.0": { - "type" : "DWRR", - "weight": "14" - }, - "scheduler.1": { - "type" : "DWRR", - "weight": "15" - } - }, -{% if asic_type in pfc_to_pg_map_supported_asics %} - "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": { - "AZURE": { - "3": "3", - "4": "4" - } - }, -{% endif %} - "PORT_QOS_MAP": { -{% for port in PORT_ACTIVE %} - "{{ port }}": { -{% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] in backend_device_types and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true' %} - "dot1p_to_tc_map" : "[DOT1P_TO_TC_MAP|AZURE]", -{% else %} - "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]", -{% endif %} - "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]", - "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]", - "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]", -{% if asic_type in pfc_to_pg_map_supported_asics %} - "pfc_to_pg_map" : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]", -{% endif %} - "pfc_enable" : "3,4" - }{% if not loop.last %},{% endif %} - -{% endfor %} - }, -{% if generate_wred_profiles is defined %} - {{- generate_wred_profiles() }} -{% else %} - "WRED_PROFILE": { - "AZURE_LOSSLESS" : { - "wred_green_enable" : "true", - "wred_yellow_enable" : "true", - "wred_red_enable" : "true", - "ecn" : "ecn_all", - "green_max_threshold" : "2097152", - "green_min_threshold" : "1048576", - "yellow_max_threshold" : "2097152", - "yellow_min_threshold" : "1048576", - "red_max_threshold" : "2097152", - "red_min_threshold" : "1048576", - "green_drop_probability" : "5", - "yellow_drop_probability": "5", - "red_drop_probability" : "5" - } - }, -{% endif %} - "QUEUE": { -{% for port in PORT_ACTIVE %} - "{{ port }}|3": { - "scheduler" : "[SCHEDULER|scheduler.1]", - "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|4": { - "scheduler" : "[SCHEDULER|scheduler.1]", - "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|0": { - "scheduler": "[SCHEDULER|scheduler.0]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|1": { - "scheduler": "[SCHEDULER|scheduler.0]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|2": { - "scheduler": "[SCHEDULER|scheduler.0]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|5": { - "scheduler": "[SCHEDULER|scheduler.0]" - }, -{% endfor %} -{% for port in PORT_ACTIVE %} - "{{ port }}|6": { - "scheduler": "[SCHEDULER|scheduler.0]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - } -} diff --git a/tests/qos_config_input/sonic_version.yml b/tests/qos_config_input/sonic_version.yml deleted file mode 100644 index 4791f627e7e7..000000000000 --- a/tests/qos_config_input/sonic_version.yml +++ /dev/null @@ -1,8 +0,0 @@ -build_version: 'master.487-a98cf221' -debian_version: '10.6' -kernel_version: '4.19.0-9-2-amd64' -asic_type: broadcom -commit_id: 'a98cf221' -build_date: Thu Nov 12 12:21:45 UTC 2020 -build_number: 487 -built_by: johnar@jenkins-worker-8