[snappi][master only] add enum with completeness_level back in (sonic…

…-net#15538)

Summary:
The fix in sonic-net#15057 was overwritten by recent changes. This PR add it back into master. sonic-net#15539 add it back into 202405.
Will open another PR for 202405 as the fix will be slight different.

test_pfc_pause_single_lossless_prio_reboot:

the parameter/fixture sequence is different between master and 202405 branch.
this change moves the enum_dut_lossless_prio_with_completeness_level back to original position. so it will be same as 202405 branch.
test_pfc_pause_single_lossy_prio_reboot:

add enum_dut_lossy_prio_with_completeness_level back in.

tests/snappi_tests/multidut/pfc/test_multidut_pfc_pause_lossless_with_snappi.py

@@ -141,12 +141,12 @@ def test_pfc_pause_single_lossless_prio_reboot(snappi_api,                   # n
                                                fanout_graph_facts_multidut,  # noqa: F811
                                                duthosts,
                                                localhost,
+                                               enum_dut_lossless_prio_with_completeness_level,    # noqa: F811
                                                prio_dscp_map,            # noqa: F811
                                                lossless_prio_list,         # noqa: F811
                                                all_prio_list,        # noqa: F811
                                                get_snappi_ports,         # noqa: F811
                                                tbinfo,              # noqa: F811
-                                               enum_dut_lossless_prio_with_completeness_level,    # noqa: F811
                                                setup_ports_and_dut,          # noqa: F811
                                                disable_pfcwd,                # noqa: F811
                                                reboot_duts):                 # noqa: F811
@@ -159,10 +159,10 @@ def test_pfc_pause_single_lossless_prio_reboot(snappi_api,                   # n
         fanout_graph_facts_multidut (pytest fixture): fanout graph
         duthosts (pytest fixture): list of DUTs
         localhost (pytest fixture): localhost handle
+        enum_dut_lossless_prio_with_completeness_level (str): lossless priority to test, e.g., 's6100-1|3'
         all_prio_list (pytest fixture): list of all the priorities
         prio_dscp_map (pytest fixture): priority vs. DSCP map (key = priority).
         lossless_prio_list (pytest fixture): list of all the lossless priorities
-        enum_dut_lossless_prio_with_completeness_level (str): lossless priority to test, e.g., 's6100-1|3'
         tbinfo (pytest fixture): fixture provides information about testbed
         get_snappi_ports (pytest fixture): gets snappi ports and connected DUT port info and returns as a list
     Returns:

tests/snappi_tests/multidut/pfc/test_multidut_pfc_pause_lossy_with_snappi.py

@@ -136,7 +136,7 @@ def test_pfc_pause_single_lossy_prio_reboot(snappi_api,             # noqa: F811
                                             fanout_graph_facts_multidut,     # noqa: F811
                                             duthosts,
                                             localhost,
-                                            enum_dut_lossy_prio,
+                                            enum_dut_lossy_prio_with_completeness_level,
                                             prio_dscp_map,          # noqa: F811
                                             lossy_prio_list,        # noqa: F811
                                             all_prio_list,          # noqa: F811
@@ -154,7 +154,7 @@ def test_pfc_pause_single_lossy_prio_reboot(snappi_api,             # noqa: F811
         fanout_graph_facts_multidut (pytest fixture): fanout graph
         duthosts (pytest fixture): list of DUTs
         localhost (pytest fixture): localhost handle
-        enum_dut_lossy_prio (str): name of lossy priority to test, e.g., 's6100-1|2'
+        enum_dut_lossy_prio_with_completeness_level (str): name of lossy priority to test, e.g., 's6100-1|2'
         prio_dscp_map (pytest fixture): priority vs. DSCP map (key = priority).
         lossy_prio_list (pytest fixture): list of all the lossy priorities
         all_prio_list (pytest fixture): list of all the priorities
@@ -166,7 +166,7 @@ def test_pfc_pause_single_lossy_prio_reboot(snappi_api,             # noqa: F811
     """
     testbed_config, port_config_list, snappi_ports = setup_ports_and_dut
 
-    _, lossy_prio = enum_dut_lossy_prio.split('|')
+    _, lossy_prio = enum_dut_lossy_prio_with_completeness_level.split('|')
     lossy_prio = int(lossy_prio)
     pause_prio_list = [lossy_prio]
     test_prio_list = [lossy_prio]