Removed hardcoded priorities for background flows and incorporated the changes to pick background priorities from available list of priorities. (sonic-net#19593)

Description of PR
Previously, the background priorities are hardcoded.
Now the changes are incorporated to randomly pick priorities from available list of background priorities.
Each time, it will pick different background priorities so that it can cover all different priorities.

Summary:
Fixes # (issue)
Fixed both helper file and test case to pick priorities on the fly.

Type of change
 Bug fix
 Testbed and Framework(new/improvement)
 New Test case
 Skipped for non-supported platforms
[ x] Test case improvement

Approach
What is the motivation for this PR?
To cover all available list of priorities.

How did you do it?
How did you verify/test it?
Tested against a DUT internally

signed-off-by: [email protected]

Signed-off-by: opcoder0 <[email protected]>

Author: kamalsahu0001

tests/snappi_tests/pfc/files/lossless_response_to_external_pause_storms_helper.py

@@ -361,23 +361,21 @@ def __gen_data_flow(testbed_config,
             elif 'Test Flow 2 -> 0' in flow.name:
                 eth.pfc_queue.value = flow_prio[1]
         else:
-            if 'Background Flow' in flow.name:
-                eth.pfc_queue.value = pfcQueueValueDict[1]
-            elif 'Test Flow 1 -> 0' in flow.name:
+            # Adding queue values based on flow_priorities for both test and background flows.
+            if 'Flow 1 -> 0' in flow.name:
                 eth.pfc_queue.value = pfcQueueValueDict[flow_prio[0]]
-            elif 'Test Flow 2 -> 0' in flow.name:
+            elif 'Flow 2 -> 0' in flow.name:
                 eth.pfc_queue.value = pfcQueueValueDict[flow_prio[1]]
 
         ipv4.src.value = tx_port_config.ip
         ipv4.dst.value = gen_data_flow_dest_ip(rx_port_config.ip)
         ipv4.priority.choice = ipv4.priority.DSCP
 
+        # Background flows have dynamic lossy priorities.
         if 'Background Flow 1 -> 0' in flow.name:
-            ipv4.priority.dscp.phb.values = [
-                ipv4.priority.dscp.phb.CS2,
-            ]
+            ipv4.priority.dscp.phb.values = prio_dscp_map[flow_prio[0]]
         elif 'Background Flow 2 -> 0' in flow.name:
-            ipv4.priority.dscp.phb.values = [5]
+            ipv4.priority.dscp.phb.values = prio_dscp_map[flow_prio[1]]
         elif 'Test Flow 1 -> 0' in flow.name:
             ipv4.priority.dscp.phb.values = prio_dscp_map[flow_prio[0]]
         elif 'Test Flow 2 -> 0' in flow.name:

tests/snappi_tests/pfc/files/lossless_response_to_throttling_pause_storms_helper.py

@@ -370,23 +370,19 @@ def __gen_data_flow(testbed_config,
             elif 'Test Flow 2 -> 0' in flow.name:
                 eth.pfc_queue.value = flow_prio[1]
         else:
-            if 'Background Flow' in flow.name:
-                eth.pfc_queue.value = pfcQueueValueDict[1]
-            elif 'Test Flow 1 -> 0' in flow.name:
+            # Adding queue values based on flow_priorities for both test and background flows.
+            if 'Flow 1 -> 0' in flow.name:
                 eth.pfc_queue.value = pfcQueueValueDict[flow_prio[0]]
-            elif 'Test Flow 2 -> 0' in flow.name:
+            elif 'Flow 2 -> 0' in flow.name:
                 eth.pfc_queue.value = pfcQueueValueDict[flow_prio[1]]
 
         ipv4.src.value = tx_port_config.ip
         ipv4.dst.value = gen_data_flow_dest_ip(rx_port_config.ip)
         ipv4.priority.choice = ipv4.priority.DSCP
         if 'Background Flow 1 -> 0' in flow.name:
-            ipv4.priority.dscp.phb.values = [
-                ipv4.priority.dscp.phb.CS2,
-            ]
+            ipv4.priority.dscp.phb.values = prio_dscp_map[flow_prio[0]]
         elif 'Background Flow 2 -> 0' in flow.name:
-            ipv4.priority.dscp.phb.value = ipv4.priority.dscp.phb.DEFAULT
-            ipv4.priority.dscp.phb.value = 5
+            ipv4.priority.dscp.phb.values = prio_dscp_map[flow_prio[1]]
         elif 'Test Flow 1 -> 0' in flow.name:
             ipv4.priority.dscp.phb.values = prio_dscp_map[flow_prio[0]]
         elif 'Test Flow 2 -> 0' in flow.name:

tests/snappi_tests/pfc/files/m2o_fluctuating_lossless_helper.py

@@ -354,11 +354,10 @@ def __gen_data_flow(testbed_config,
         elif 'Test Flow 2 -> 0' in flow.name:
             eth.pfc_queue.value = flow_prio[1]
     else:
-        if 'Background Flow' in flow.name:
-            eth.pfc_queue.value = pfcQueueValueDict[1]
-        elif 'Test Flow 1 -> 0' in flow.name:
+        # Adding queue values based on flow_priorities for both test and background flows.
+        if 'Flow 1 -> 0' in flow.name:
             eth.pfc_queue.value = pfcQueueValueDict[flow_prio[0]]
-        elif 'Test Flow 2 -> 0' in flow.name:
+        elif 'Flow 2 -> 0' in flow.name:
             eth.pfc_queue.value = pfcQueueValueDict[flow_prio[1]]
 
     global UDP_PORT_START
@@ -373,29 +372,17 @@ def __gen_data_flow(testbed_config,
     ipv4.priority.choice = ipv4.priority.DSCP
 
     if '1 Background Flow 1 -> 0' in flow.name:
-        ipv4.priority.dscp.phb.values = [
-            ipv4.priority.dscp.phb.CS2,
-        ]
+        ipv4.priority.dscp.phb.values = prio_dscp_map[flow_prio[0]]
     elif '2 Background Flow 2 -> 0' in flow.name:
-        ipv4.priority.dscp.phb.values = [
-            ipv4.priority.dscp.phb.DEFAULT,
-        ]
-        ipv4.priority.dscp.phb.value = 5
-    elif '3 Background Flow 1 -> 0' in flow.name:
-        ipv4.priority.dscp.phb.values = [
-            ipv4.priority.dscp.phb.CS6,
-        ]
+        ipv4.priority.dscp.phb.values = prio_dscp_map[flow_prio[1]]
+    if '3 Background Flow 1 -> 0' in flow.name:
+        ipv4.priority.dscp.phb.values = prio_dscp_map[flow_prio[2]]
     elif '4 Background Flow 2 -> 0' in flow.name:
-        ipv4.priority.dscp.phb.values = [
-            ipv4.priority.dscp.phb.CS1,
-        ]
+        ipv4.priority.dscp.phb.values = prio_dscp_map[flow_prio[3]]
     elif 'Test Flow 1 -> 0' in flow.name:
         ipv4.priority.dscp.phb.values = [flow_prio[0]]
     elif 'Test Flow 2 -> 0' in flow.name:
-        ipv4.priority.dscp.phb.values = [
-            ipv4.priority.dscp.phb.CS1,
-        ]
-        ipv4.priority.dscp.phb.value = flow_prio[1]
+        ipv4.priority.dscp.phb.values = [flow_prio[1]]
 
     ipv4.priority.dscp.ecn.value = ipv4.priority.dscp.ecn.CAPABLE_TRANSPORT_1
     flow.size.fixed = data_pkt_size

tests/snappi_tests/pfc/test_lossless_response_to_external_pause_storms.py

@@ -1,5 +1,6 @@
 import pytest
 import logging
+import random
 from tests.common.fixtures.conn_graph_facts import conn_graph_facts, fanout_graph_facts, \
     fanout_graph_facts_multidut     # noqa: F401
 from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port, \
@@ -67,7 +68,8 @@ def test_lossless_response_to_external_pause_storms_test(snappi_api,
     all_prio_list = prio_dscp_map.keys()
     test_prio_list = lossless_prio_list
     pause_prio_list = test_prio_list
-    bg_prio_list = [x for x in all_prio_list if x not in pause_prio_list]
+    bg_prio_list = random.sample([x for x in all_prio_list if x not in pause_prio_list], 2)
+    logger.info('Selected two random lossy background priorities:{}'.format(bg_prio_list))
 
     snappi_extra_params = SnappiTestParams()
     snappi_extra_params.multi_dut_params.multi_dut_ports = snappi_ports

tests/snappi_tests/pfc/test_lossless_response_to_throttling_pause_storms.py

@@ -1,5 +1,6 @@
 import pytest
 import logging
+import random
 from tests.common.fixtures.conn_graph_facts import conn_graph_facts, fanout_graph_facts, \
     fanout_graph_facts_multidut     # noqa: F401
 from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port, \
@@ -68,7 +69,8 @@ def test_lossless_response_to_throttling_pause_storms(snappi_api,
     all_prio_list = prio_dscp_map.keys()
     test_prio_list = lossless_prio_list
     pause_prio_list = test_prio_list
-    bg_prio_list = [x for x in all_prio_list if x not in pause_prio_list]
+    bg_prio_list = random.sample([x for x in all_prio_list if x not in pause_prio_list], 2)
+    logger.info('Selected two random lossy background priorities:{}'.format(bg_prio_list))
 
     snappi_extra_params = SnappiTestParams()
     snappi_extra_params.multi_dut_params.multi_dut_ports = snappi_ports

tests/snappi_tests/pfc/test_m2o_fluctuating_lossless.py

@@ -1,5 +1,6 @@
 import pytest
 import logging
+import random
 from tests.common.fixtures.conn_graph_facts import conn_graph_facts, fanout_graph_facts, \
     fanout_graph_facts_multidut     # noqa: F401
 from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port, \
@@ -65,7 +66,8 @@ def test_m2o_fluctuating_lossless(snappi_api,                   # noqa: F811
     all_prio_list = prio_dscp_map.keys()
     test_prio_list = lossless_prio_list
     pause_prio_list = test_prio_list
-    bg_prio_list = [x for x in all_prio_list if x not in pause_prio_list]
+    bg_prio_list = random.sample([x for x in all_prio_list if x not in pause_prio_list], 4)
+    logger.info('Selected two random lossy background priorities:{}'.format(bg_prio_list))
 
     snappi_extra_params = SnappiTestParams()
     snappi_extra_params.multi_dut_params.multi_dut_ports = snappi_ports