diff --git a/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/qos.json.j2 b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/qos.json.j2 index 5c5fc6e4969..ae0c1878100 100644 --- a/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/qos.json.j2 +++ b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/qos.json.j2 @@ -116,7 +116,10 @@ "yellow_max_threshold":"628320", "yellow_min_threshold":"78400", "green_max_threshold": "642656", - "green_min_threshold": "80192" + "green_min_threshold": "80192", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" }, "AZURE_LOSSLESS" : { "wred_green_enable":"true", @@ -128,7 +131,10 @@ "yellow_max_threshold":"628320", "yellow_min_threshold":"78400", "green_max_threshold": "642656", - "green_min_threshold": "80192" + "green_min_threshold": "80192", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/accton/x86_64-accton_as7212_54x-r0/AS7212-54x/qos.json.j2 b/device/accton/x86_64-accton_as7212_54x-r0/AS7212-54x/qos.json.j2 index 3e01af3f2c6..4d5b77901a0 100755 --- a/device/accton/x86_64-accton_as7212_54x-r0/AS7212-54x/qos.json.j2 +++ b/device/accton/x86_64-accton_as7212_54x-r0/AS7212-54x/qos.json.j2 @@ -133,7 +133,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" }, "AZURE_LOSSLESS": { "wred_green_enable":"true", @@ -144,7 +147,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2 index 926911ab59d..b5e04da671a 100644 --- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2 +++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2 @@ -125,7 +125,10 @@ "yellow_max_threshold":"312000", "yellow_min_threshold":"104000", "green_max_threshold":"312000", - "green_min_threshold":"104000" + "green_min_threshold":"104000", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2 index 926911ab59d..b5e04da671a 100644 --- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2 +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2 @@ -125,7 +125,10 @@ "yellow_max_threshold":"312000", "yellow_min_threshold":"104000", "green_max_threshold":"312000", - "green_min_threshold":"104000" + "green_min_threshold":"104000", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2 index 84f74ecab3b..01a91de3618 100644 --- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2 +++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2 @@ -137,7 +137,10 @@ "yellow_max_threshold":"312000", "yellow_min_threshold":"104000", "green_max_threshold": "312000", - "green_min_threshold": "104000" + "green_min_threshold": "104000", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2 index 5142832ecae..3e37a842f02 100644 --- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2 +++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2 @@ -137,7 +137,10 @@ "yellow_max_threshold":"312000", "yellow_min_threshold":"104000", "green_max_threshold": "312000", - "green_min_threshold": "104000" + "green_min_threshold": "104000", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2 b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2 index 84f74ecab3b..01a91de3618 100644 --- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2 +++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2 @@ -137,7 +137,10 @@ "yellow_max_threshold":"312000", "yellow_min_threshold":"104000", "green_max_threshold": "312000", - "green_min_threshold": "104000" + "green_min_threshold": "104000", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2 index 06efa359177..45ca4d949dc 100644 --- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2 +++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/qos.json.j2 @@ -137,7 +137,10 @@ "yellow_max_threshold":"312000", "yellow_min_threshold":"104000", "green_max_threshold": "312000", - "green_min_threshold": "104000" + "green_min_threshold": "104000", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/qos.json.j2 b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/qos.json.j2 index 7b8732e2e12..82df79ed097 100644 --- a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/qos.json.j2 +++ b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/qos.json.j2 @@ -129,7 +129,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" }, "AZURE_LOSSLESS": { "wred_green_enable":"true", @@ -140,7 +143,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/qos.json.j2 b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/qos.json.j2 index 7b8732e2e12..82df79ed097 100644 --- a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/qos.json.j2 +++ b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/qos.json.j2 @@ -129,7 +129,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" }, "AZURE_LOSSLESS": { "wred_green_enable":"true", @@ -140,7 +143,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2 index 926911ab59d..b5e04da671a 100644 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2 +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2 @@ -125,7 +125,10 @@ "yellow_max_threshold":"312000", "yellow_min_threshold":"104000", "green_max_threshold":"312000", - "green_min_threshold":"104000" + "green_min_threshold":"104000", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2 b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2 index 054a8f832cd..3fa7bdb2e1c 100644 --- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2 +++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2 @@ -164,7 +164,10 @@ "yellow_max_threshold":"312000", "yellow_min_threshold":"104000", "green_max_threshold": "312000", - "green_min_threshold": "104000" + "green_min_threshold": "104000", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-T0/qos.json.j2 b/device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-T0/qos.json.j2 index 57bb4c53217..b56833cc122 100644 --- a/device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-T0/qos.json.j2 +++ b/device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-T0/qos.json.j2 @@ -137,7 +137,10 @@ "yellow_max_threshold":"312000", "yellow_min_threshold":"104000", "green_max_threshold": "312000", - "green_min_threshold": "104000" + "green_min_threshold": "104000", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100/qos.json.j2 b/device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100/qos.json.j2 index 84f74ecab3b..01a91de3618 100644 --- a/device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100/qos.json.j2 +++ b/device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100/qos.json.j2 @@ -137,7 +137,10 @@ "yellow_max_threshold":"312000", "yellow_min_threshold":"104000", "green_max_threshold": "312000", - "green_min_threshold": "104000" + "green_min_threshold": "104000", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/INGRASYS-S9130-32X/qos.json.j2 b/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/INGRASYS-S9130-32X/qos.json.j2 index 5c5fc6e4969..ae0c1878100 100644 --- a/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/INGRASYS-S9130-32X/qos.json.j2 +++ b/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/INGRASYS-S9130-32X/qos.json.j2 @@ -116,7 +116,10 @@ "yellow_max_threshold":"628320", "yellow_min_threshold":"78400", "green_max_threshold": "642656", - "green_min_threshold": "80192" + "green_min_threshold": "80192", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" }, "AZURE_LOSSLESS" : { "wred_green_enable":"true", @@ -128,7 +131,10 @@ "yellow_max_threshold":"628320", "yellow_min_threshold":"78400", "green_max_threshold": "642656", - "green_min_threshold": "80192" + "green_min_threshold": "80192", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/INGRASYS-S9230-64X/qos.json.j2 b/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/INGRASYS-S9230-64X/qos.json.j2 index 5c5fc6e4969..ae0c1878100 100644 --- a/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/INGRASYS-S9230-64X/qos.json.j2 +++ b/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/INGRASYS-S9230-64X/qos.json.j2 @@ -116,7 +116,10 @@ "yellow_max_threshold":"628320", "yellow_min_threshold":"78400", "green_max_threshold": "642656", - "green_min_threshold": "80192" + "green_min_threshold": "80192", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" }, "AZURE_LOSSLESS" : { "wred_green_enable":"true", @@ -128,7 +131,10 @@ "yellow_max_threshold":"628320", "yellow_min_threshold":"78400", "green_max_threshold": "642656", - "green_min_threshold": "80192" + "green_min_threshold": "80192", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json.j2 b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json.j2 index 3e01af3f2c6..4d5b77901a0 100644 --- a/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json.j2 +++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json.j2 @@ -133,7 +133,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" }, "AZURE_LOSSLESS": { "wred_green_enable":"true", @@ -144,7 +147,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json.j2 index 74045469dbf..28e73de1bf5 100644 --- a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json.j2 +++ b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json.j2 @@ -133,7 +133,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" }, "AZURE_LOSSLESS": { "wred_green_enable":"true", @@ -144,7 +147,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json.j2 index 95652cf96f4..94aa552ad81 100644 --- a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json.j2 +++ b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json.j2 @@ -133,7 +133,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" }, "AZURE_LOSSLESS": { "wred_green_enable":"true", @@ -144,7 +147,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2 index 3e01af3f2c6..4d5b77901a0 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2 +++ b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2 @@ -133,7 +133,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" }, "AZURE_LOSSLESS": { "wred_green_enable":"true", @@ -144,7 +147,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json.j2 index d35f614de63..e1f2f7b6181 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json.j2 +++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json.j2 @@ -133,7 +133,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" }, "AZURE_LOSSLESS": { "wred_green_enable":"true", @@ -144,7 +147,10 @@ "yellow_max_threshold":"516096", "yellow_min_threshold":"516096", "green_max_threshold": "184320", - "green_min_threshold": "184320" + "green_min_threshold": "184320", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": { diff --git a/src/sonic-config-engine/tests/sample_output/qos-dell6100.json b/src/sonic-config-engine/tests/sample_output/qos-dell6100.json index 0db51148bdc..cc5b5e61b72 100644 --- a/src/sonic-config-engine/tests/sample_output/qos-dell6100.json +++ b/src/sonic-config-engine/tests/sample_output/qos-dell6100.json @@ -138,7 +138,10 @@ "yellow_max_threshold":"312000", "yellow_min_threshold":"104000", "green_max_threshold": "312000", - "green_min_threshold": "104000" + "green_min_threshold": "104000", + "green_drop_probability":"100", + "yellow_drop_probability":"100", + "red_drop_probability":"100" } }, "QUEUE": {