Pre-commit errors fixed and Replaced noqa with noqa: in tests/dualtor_mgmt (#18746)

Author: v-jessgeorge

tests/dualtor_mgmt/conftest.py

@@ -1,8 +1,8 @@
 import pytest
 
 from tests.common.helpers.assertions import pytest_require as py_require
-from tests.common.fixtures.ptfhost_utils import change_mac_addresses        # noqa F401
-from tests.common.fixtures.ptfhost_utils import run_garp_service            # noqa F401
+from tests.common.fixtures.ptfhost_utils import change_mac_addresses        # noqa: F401
+from tests.common.fixtures.ptfhost_utils import run_garp_service            # noqa: F401
 
 
 def pytest_configure(config):

tests/dualtor_mgmt/test_egress_drop_nvidia.py

@@ -4,12 +4,12 @@
 import ptf.packet as scapy
 import json
 from tests.common.helpers.assertions import pytest_assert
-from tests.common.dualtor.mux_simulator_control import toggle_all_simulator_ports_to_upper_tor  # noqa F401
-from tests.common.dualtor.mux_simulator_control import toggle_simulator_port_to_lower_tor  # noqa F401
+from tests.common.dualtor.mux_simulator_control import toggle_all_simulator_ports_to_upper_tor  # noqa: F401
+from tests.common.dualtor.mux_simulator_control import toggle_simulator_port_to_lower_tor  # noqa: F401
 from tests.common.dualtor.dual_tor_utils import \
-    upper_tor_host, lower_tor_host, dualtor_info, check_muxcable_status  # noqa F401
-from tests.common.fixtures.ptfhost_utils import change_mac_addresses, run_icmp_responder, run_garp_service  # noqa F401
-from tests.common.dualtor.mux_simulator_control import toggle_all_simulator_ports_to_rand_selected_tor # noqa F401
+    upper_tor_host, lower_tor_host, dualtor_info, check_muxcable_status  # noqa: F401
+from tests.common.fixtures.ptfhost_utils import change_mac_addresses, run_icmp_responder, run_garp_service  # noqa: F401
+from tests.common.dualtor.mux_simulator_control import toggle_all_simulator_ports_to_rand_selected_tor  # noqa: F401
 from ptf.mask import Mask
 from ptf import testutils
 from tests.common.utilities import wait_until
@@ -31,9 +31,10 @@
 # These two test cases are to cover the test gap introduced by the egress drop.
 
 
-def test_egress_drop_standby_server_to_active_server(ptfhost, upper_tor_host, lower_tor_host, # noqa F811
-                                 toggle_all_simulator_ports_to_upper_tor, # noqa F811
-                                 toggle_simulator_port_to_lower_tor, tbinfo, ptfadapter): # noqa F811
+def test_egress_drop_standby_server_to_active_server(ptfhost, upper_tor_host, lower_tor_host,  # noqa: F811
+                                                     toggle_all_simulator_ports_to_upper_tor,  # noqa: F811
+                                                     toggle_simulator_port_to_lower_tor,  # noqa: F811
+                                                     tbinfo, ptfadapter):  # noqa: F811
     """
     This test case covers the validation of egress drop rule in active-standby dualtor scenario when server A is active
     on the upper tor and standby on the lower tor, server B is standby on the upper tor and active on the lower tor, and
@@ -131,8 +132,11 @@ def _check_counters():
                     and COUNTER_RANGE[0] <= lower_tor_active_port_tx_counter < COUNTER_RANGE[1])
         pytest_assert(wait_until(15, 5, 0, _check_counters), "The port counters are not as expected.")
 
-def test_egress_drop_standby_server_to_standby_server(ptfhost, upper_tor_host, lower_tor_host, # noqa F811
-                                 toggle_all_simulator_ports_to_upper_tor, tbinfo, ptfadapter): # noqa F811
+
+def test_egress_drop_standby_server_to_standby_server(ptfhost, upper_tor_host,  # noqa: F811
+                                                      lower_tor_host,  # noqa: F811
+                                                      toggle_all_simulator_ports_to_upper_tor,  # noqa: F811
+                                                      tbinfo, ptfadapter):
     """
     This test case covers the validation of egress drop rule in active-standby dualtor scenario when server A and
     server B are active on the upper tor, and standby on the lower tor, and the upstream traffic is sent from
@@ -192,7 +196,7 @@ def test_egress_drop_standby_server_to_standby_server(ptfhost, upper_tor_host, l
             eth_src=lower_tor_host.facts['router_mac'],
             ip_src=lower_tor_loopback0_ip,
             ip_dst=upper_tor_loopback0_ip,
-            inner_frame=pkt[IP])  # noqa F821
+            inner_frame=pkt[IP])  # noqa: F821
         not_expected_tunnel_pkt = get_masked_packet(tunnel_pkt, is_tunnel_packet=True)
         # Send packets again
         ptfadapter.dataplane.flush()

tests/dualtor_mgmt/test_grpc_periodical_sync.py

@@ -5,15 +5,15 @@
 import random
 import time
 
-from tests.common.dualtor.dual_tor_common import active_active_ports                            # noqa F401
+from tests.common.dualtor.dual_tor_common import active_active_ports                            # noqa: F401
 from tests.common.dualtor.dual_tor_common import ActiveActivePortID
-from tests.common.dualtor.dual_tor_utils import upper_tor_host                                  # noqa F401
-from tests.common.dualtor.dual_tor_utils import lower_tor_host                                  # noqa F401
-from tests.common.dualtor.icmp_responder_control import pause_icmp_responder                    # noqa F401
+from tests.common.dualtor.dual_tor_utils import upper_tor_host                                  # noqa: F401
+from tests.common.dualtor.dual_tor_utils import lower_tor_host                                  # noqa: F401
+from tests.common.dualtor.icmp_responder_control import pause_icmp_responder                    # noqa: F401
 from tests.common.dualtor.nic_simulator_control import ForwardingState
-from tests.common.dualtor.nic_simulator_control import mux_status_from_nic_simulator            # noqa F401
-from tests.common.dualtor.nic_simulator_control import toggle_active_active_simulator_ports     # noqa F401
-from tests.common.fixtures.ptfhost_utils import run_icmp_responder                              # noqa F401
+from tests.common.dualtor.nic_simulator_control import mux_status_from_nic_simulator            # noqa: F401
+from tests.common.dualtor.nic_simulator_control import toggle_active_active_simulator_ports     # noqa: F401
+from tests.common.fixtures.ptfhost_utils import run_icmp_responder                              # noqa: F401
 
 from tests.common.helpers.assertions import pytest_assert
 from tests.common.utilities import wait_until
@@ -26,7 +26,7 @@
 
 
 @pytest.fixture(scope="module")
-def test_duthost(upper_tor_host, lower_tor_host):           # noqa F811
+def test_duthost(upper_tor_host, lower_tor_host):           # noqa: F811
     today = datetime.datetime.fromtimestamp(time.time())
     if today.day % 2 == 1:
         duthost = upper_tor_host
@@ -38,7 +38,7 @@ def test_duthost(upper_tor_host, lower_tor_host):           # noqa F811
 
 
 @pytest.fixture(scope="module")
-def test_mux_ports(active_active_ports):                    # noqa F811
+def test_mux_ports(active_active_ports):                    # noqa: F811
     if not active_active_ports:
         pytest.skip("Skip as no 'active-active' mux ports available")
     test_ports = random.sample(active_active_ports, min(len(active_active_ports), TEST_COUNT))
@@ -52,8 +52,8 @@ def init_port_state(request):
 
 
 @pytest.fixture
-def setup_test_ports(init_port_state, mux_status_from_nic_simulator,    # noqa F811
-                     pause_icmp_responder, test_mux_ports):             # noqa F811
+def setup_test_ports(init_port_state, mux_status_from_nic_simulator,    # noqa: F811
+                     pause_icmp_responder, test_mux_ports):             # noqa: F811
 
     def check_forwarding_state(mux_ports, upper_tor_forwarding_state, lower_tor_forwarding_state):
         mux_status = mux_status_from_nic_simulator(mux_ports)
@@ -89,7 +89,7 @@ def get_mux_status(duthost, mux_ports):
 
 
 def test_grpc_server_failure(init_port_state, setup_test_ports, test_duthost,
-                             toggle_active_active_simulator_ports):             # noqa F811
+                             toggle_active_active_simulator_ports):             # noqa: F811
     """
     This testcase aims to verify that, if the nic_simulator arbitrarily toggles a
     port, SONiC could detect and recover the mux status.
@@ -135,7 +135,7 @@ def check_mux_status_recovery(duthost, mux_ports, orig_mux_status):
 @pytest.mark.skip_active_standby
 @pytest.mark.parametrize("mux_status", ["standby", "active"])
 def test_mux_forwarding_state_consistency(mux_status, test_mux_ports, test_duthost,
-                             toggle_active_active_simulator_ports):             # noqa F811
+                                          toggle_active_active_simulator_ports):             # noqa: F811
     """
     This testcase aims to verify that, if the nic_simulator forwarding state changes incorrectly,
     SONiC could detect and recover the mux status.

tests/dualtor_mgmt/test_ingress_drop.py

@@ -3,19 +3,19 @@
 import pytest
 import random
 
-from tests.common.dualtor.dual_tor_common import active_active_ports        # noqa F401
-from tests.common.dualtor.dual_tor_common import active_standby_ports       # noqa F401
+from tests.common.dualtor.dual_tor_common import active_active_ports        # noqa: F401
+from tests.common.dualtor.dual_tor_common import active_standby_ports       # noqa: F401
 from tests.common.dualtor.dual_tor_common import ActiveActivePortID
-from tests.common.dualtor.dual_tor_common import cable_type                 # noqa F401
+from tests.common.dualtor.dual_tor_common import cable_type                 # noqa: F401
 from tests.common.dualtor.dual_tor_common import CableType
-from tests.common.dualtor.dual_tor_utils import upper_tor_host              # noqa F401
-from tests.common.dualtor.dual_tor_utils import lower_tor_host              # noqa F401
+from tests.common.dualtor.dual_tor_utils import upper_tor_host              # noqa: F401
+from tests.common.dualtor.dual_tor_utils import lower_tor_host              # noqa: F401
 from tests.common.dualtor.dual_tor_utils import verify_upstream_traffic
-from tests.common.dualtor.mux_simulator_control import toggle_all_simulator_ports_to_lower_tor      # noqa F401
+from tests.common.dualtor.mux_simulator_control import toggle_all_simulator_ports_to_lower_tor      # noqa: F401
 from tests.common.dualtor.nic_simulator_control import ForwardingState
-from tests.common.dualtor.nic_simulator_control import mux_status_from_nic_simulator    # noqa F401
-from tests.common.dualtor.nic_simulator_control import stop_nic_simulator               # noqa F401
-from tests.common.fixtures.ptfhost_utils import run_icmp_responder                      # noqa F401
+from tests.common.dualtor.nic_simulator_control import mux_status_from_nic_simulator    # noqa: F401
+from tests.common.dualtor.nic_simulator_control import stop_nic_simulator               # noqa: F401
+from tests.common.fixtures.ptfhost_utils import run_icmp_responder                      # noqa: F401
 from tests.common.helpers.assertions import pytest_assert
 from tests.common.utilities import wait_until
 
@@ -27,11 +27,11 @@
 
 @pytest.fixture
 def setup_mux(
-    active_active_ports, cable_type,            # noqa F811
-    mux_status_from_nic_simulator,              # noqa F811
-    stop_nic_simulator,                         # noqa F811
-    toggle_all_simulator_ports_to_lower_tor,    # noqa F811
-    upper_tor_host, lower_tor_host              # noqa F811
+    active_active_ports, cable_type,            # noqa: F811
+    mux_status_from_nic_simulator,              # noqa: F811
+    stop_nic_simulator,                         # noqa: F811
+    toggle_all_simulator_ports_to_lower_tor,    # noqa: F811
+    upper_tor_host, lower_tor_host              # noqa: F811
 ):
 
     def _check_active_active_mux_status_from_nic_simulator(upper_tor_forwarding_state, lower_tor_forwarding_state):
@@ -91,7 +91,7 @@ def _restore_mux_config_auto():
 
 
 @pytest.fixture
-def selected_mux_port(cable_type, active_active_ports, active_standby_ports):       # noqa F811
+def selected_mux_port(cable_type, active_active_ports, active_standby_ports):       # noqa: F811
     all_ports = []
     if cable_type == CableType.active_active:
         all_ports = active_active_ports
@@ -102,7 +102,7 @@ def selected_mux_port(cable_type, active_active_ports, active_standby_ports):
 
 
 @pytest.mark.enable_active_active
-def test_ingress_drop(cable_type, ptfadapter, setup_mux, tbinfo, selected_mux_port, upper_tor_host):    # noqa F811
+def test_ingress_drop(cable_type, ptfadapter, setup_mux, tbinfo, selected_mux_port, upper_tor_host):    # noqa: F811
     """
     Aims to verify if orchagent installs ingress drop ACL when the port comes to standby.
 

tests/dualtor_mgmt/test_server_failure.py

@@ -4,20 +4,20 @@
 
 from tests.common.dualtor.mux_simulator_control import toggle_simulator_port_to_upper_tor, \
                                                        simulator_flap_counter, simulator_server_down, \
-                                                       toggle_all_simulator_ports                       # noqa F401
+                                                       toggle_all_simulator_ports                       # noqa: F401
 from tests.common.helpers.assertions import pytest_assert
 from tests.common.dualtor.dual_tor_utils import show_muxcable_status                                    # noqa: F401
-from tests.common.dualtor.dual_tor_common import active_active_ports                                    # noqa F401
-from tests.common.dualtor.dual_tor_common import active_standby_ports                                   # noqa F401
-from tests.common.dualtor.dual_tor_common import cable_type                                             # noqa F401
+from tests.common.dualtor.dual_tor_common import active_active_ports                                    # noqa: F401
+from tests.common.dualtor.dual_tor_common import active_standby_ports                                   # noqa: F401
+from tests.common.dualtor.dual_tor_common import cable_type                                             # noqa: F401
 from tests.common.dualtor.dual_tor_common import CableType
-from tests.common.dualtor.dual_tor_utils import validate_active_active_dualtor_setup                    # noqa F401
-from tests.common.dualtor.dual_tor_utils import upper_tor_host                                          # noqa F401
-from tests.common.dualtor.dual_tor_utils import lower_tor_host                                          # noqa F401
-from tests.common.dualtor.dual_tor_utils import lower_tor_fanouthosts, fanout_lower_tor_port_control    # noqa F401
-from tests.common.dualtor.dual_tor_utils import upper_tor_fanouthosts, fanout_upper_tor_port_control    # noqa F401
-from tests.common.dualtor.dual_tor_utils import show_muxcable_status                                    # noqa F401
-from tests.common.dualtor.nic_simulator_control import simulator_server_down_active_active              # noqa F401
+from tests.common.dualtor.dual_tor_utils import validate_active_active_dualtor_setup                    # noqa: F401
+from tests.common.dualtor.dual_tor_utils import upper_tor_host                                          # noqa: F401
+from tests.common.dualtor.dual_tor_utils import lower_tor_host                                          # noqa: F401
+from tests.common.dualtor.dual_tor_utils import lower_tor_fanouthosts, fanout_lower_tor_port_control    # noqa: F401
+from tests.common.dualtor.dual_tor_utils import upper_tor_fanouthosts, fanout_upper_tor_port_control    # noqa: F401
+from tests.common.dualtor.dual_tor_utils import show_muxcable_status  # noqa: F401, F811
+from tests.common.dualtor.nic_simulator_control import simulator_server_down_active_active              # noqa: F401
 from tests.common.fixtures.ptfhost_utils import change_mac_addresses, run_garp_service, \
                                                 run_icmp_responder                                      # noqa: F401
 from tests.common.utilities import wait_until
@@ -34,10 +34,10 @@
 
 
 @pytest.mark.enable_active_active
-def test_server_down(cable_type, duthosts, tbinfo, active_active_ports, active_standby_ports,               # noqa F811
-                     simulator_flap_counter, simulator_server_down, toggle_simulator_port_to_upper_tor,     # noqa F811
-                     loganalyzer, validate_active_active_dualtor_setup, upper_tor_host, lower_tor_host,     # noqa F811
-                     simulator_server_down_active_active):                                                  # noqa F811
+def test_server_down(cable_type, duthosts, tbinfo, active_active_ports, active_standby_ports,               # noqa: F811
+                     simulator_flap_counter, simulator_server_down, toggle_simulator_port_to_upper_tor,     # noqa: F811
+                     loganalyzer, validate_active_active_dualtor_setup, upper_tor_host, lower_tor_host,     # noqa: F811
+                     simulator_server_down_active_active):                                                  # noqa: F811
     """
     Verify that mux cable is not toggled excessively.
     """