tests: Refactoring FRR test suites

Signed-off-by: y-bharath14 <[email protected]>

tests/topotests/all_protocol_startup/test_all_protocol_startup.py

@@ -38,7 +38,6 @@
     required_linux_kernel_version,
 )
 
-from lib.topolog import logger
 import json
 
 fatal_error = ""
@@ -153,7 +152,6 @@ def test_error_messages_vtysh():
     print("\n\n** Check for error messages on VTYSH")
     print("******************************************\n")
 
-    failures = 0
     for i in range(1, 2):
         #
         # First checking Standard Output

tests/topotests/babel_topo1/test_babel_topo1.py

@@ -15,7 +15,6 @@
 """
 
 import os
-import re
 import sys
 import pytest
 import json
@@ -130,7 +129,6 @@ def test_zebra_ipv4_routingTable():
     if tgen.routers_have_failure():
         pytest.skip(tgen.errors)
 
-    failures = 0
     router_list = tgen.routers().values()
     for router in router_list:
         assertmsg = "Zebra IPv4 Routing Table verification failed for router {}".format(

tests/topotests/bfd_ospf_topo1/test_bfd_ospf_topo1.py

@@ -59,7 +59,6 @@
 import sys
 import pytest
 import json
-from time import sleep
 from functools import partial
 
 # Save the Current Working Directory to find configuration files.

tests/topotests/bgp_6vpe_ebgp_topo1/test_bgp_6vpe_ebgp_topo1.py

@@ -12,7 +12,6 @@
 import os
 import sys
 import json
-import functools
 from functools import partial
 import pytest
 

tests/topotests/bgp_addpath_paths_limit/test_bgp_addpath_paths_limit.py

@@ -20,7 +20,7 @@
 
 # pylint: disable=C0413
 from lib import topotest
-from lib.topogen import Topogen, TopoRouter, get_topogen
+from lib.topogen import Topogen, get_topogen
 
 pytestmark = [pytest.mark.bgpd]
 

tests/topotests/bgp_aigp/test_bgp_aigp.py

@@ -29,7 +29,6 @@
 # pylint: disable=C0413
 from lib import topotest
 from lib.topogen import Topogen, TopoRouter, get_topogen
-from lib.common_config import step
 
 pytestmark = [pytest.mark.bgpd]
 

tests/topotests/bgp_as_allow_in/test_bgp_as_allow_in.py

@@ -28,7 +28,6 @@
 import os
 import sys
 import time
-import json
 import pytest
 
 # Save the Current Working Directory to find configuration files.
@@ -59,7 +58,7 @@
     create_router_bgp,
     verify_bgp_rib,
 )
-from lib.topojson import build_topo_from_json, build_config_from_json
+from lib.topojson import build_config_from_json
 
 pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
 

tests/topotests/bgp_auth/bgp_auth_common.py

@@ -34,16 +34,9 @@
 
 import json
 import os
-import platform
-import sys
-from time import sleep
-
-from lib import common_config, topotest
-from lib.common_config import (
-    save_initial_config_on_routers,
-    reset_with_new_configs,
-)
-from lib.topogen import Topogen, TopoRouter, get_topogen
+
+from lib import common_config
+from lib.topogen import get_topogen
 
 CWD = os.path.dirname(os.path.realpath(__file__))
 

tests/topotests/bgp_auth/test_bgp_auth1.py

@@ -32,14 +32,12 @@
 """
 # pylint: disable=C0413
 
-import json
 import os
 import platform
 import sys
-from time import sleep
 
 import pytest
-from lib import common_config, topotest
+from lib import topotest
 from lib.common_config import (
     save_initial_config_on_routers,
     reset_with_new_configs,

tests/topotests/bgp_auth/test_bgp_auth2.py

@@ -32,14 +32,12 @@
 """
 # pylint: disable=C0413
 
-import json
 import os
 import platform
 import sys
-from time import sleep
 
 import pytest
-from lib import common_config, topotest
+from lib import topotest
 from lib.common_config import (
     save_initial_config_on_routers,
     reset_with_new_configs,

tests/topotests/bgp_auth/test_bgp_auth3.py

@@ -32,14 +32,12 @@
 """
 # pylint: disable=C0413
 
-import json
 import os
 import platform
 import sys
-from time import sleep
 
 import pytest
-from lib import common_config, topotest
+from lib import topotest
 from lib.common_config import (
     save_initial_config_on_routers,
     reset_with_new_configs,

tests/topotests/bgp_auth/test_bgp_auth4.py

@@ -32,14 +32,12 @@
 """
 # pylint: disable=C0413
 
-import json
 import os
 import platform
 import sys
-from time import sleep
 
 import pytest
-from lib import common_config, topotest
+from lib import topotest
 from lib.common_config import (
     save_initial_config_on_routers,
     reset_with_new_configs,

tests/topotests/bgp_bmp/test_bgp_bmp.py

@@ -26,7 +26,6 @@
 from ipaddress import ip_network
 import json
 import os
-import platform
 import pytest
 import sys
 

tests/topotests/bgp_color_extcommunities/test_bgp_color_extcommunities.py

@@ -16,7 +16,6 @@
 import sys
 import json
 import functools
-from functools import partial
 import pytest
 
 # Save the Current Working Directory to find configuration files.

tests/topotests/bgp_communities_topo1/test_bgp_communities_topo2.py

@@ -171,7 +171,6 @@ def test_bgp_no_export_local_as_communities_p0(request):
         )
 
     for comm_type in ["no-export", "local-AS"]:
-
         step("Create a route-map on R1 to set community as {}".format(comm_type))
 
         seq_id = 10

tests/topotests/bgp_conditional_advertisement_static_route/test_bgp_conditional_advertisement_static_route.py

@@ -11,7 +11,6 @@
 """
 
 import os
-import re
 import sys
 import json
 import pytest
@@ -24,7 +23,7 @@
 
 # pylint: disable=C0413
 from lib import topotest
-from lib.topogen import Topogen, TopoRouter, get_topogen
+from lib.topogen import Topogen, get_topogen
 from lib.common_config import step
 
 

tests/topotests/bgp_dampening_per_peer/test_bgp_dampening_per_peer.py

@@ -6,7 +6,6 @@
 #
 
 import os
-import re
 import sys
 import json
 import pytest

tests/topotests/bgp_default_originate/test_bgp_default_originate_2links.py

@@ -17,7 +17,6 @@
 import time
 import pytest
 import datetime
-from copy import deepcopy
 from lib.topolog import logger
 from time import sleep
 
@@ -214,7 +213,6 @@ def get_rib_route_uptime(tgen, addr_type, dut, input_dict):
 
     logger.info("Entering lib API: get_rib_route_uptime()")
     route_time = []
-    out_route_dict = {}
     router_list = tgen.routers()
     for routerInput in input_dict.keys():
         for router, rnode in router_list.items():
@@ -234,7 +232,6 @@ def get_rib_route_uptime(tgen, addr_type, dut, input_dict):
 
                 for static_route in static_routes:
                     if "vrf" in static_route and static_route["vrf"] is not None:
-
                         logger.info(
                             "[DUT: {}]: Verifying routes for VRF:"
                             " {}".format(router, static_route["vrf"])
@@ -307,7 +304,6 @@ def get_best_path_route_in_FIB(tgen, topo, dut, network):
     on failure : return error message with boolean False
     """
     is_ipv4_best_path_found = False
-    is_ipv6_best_path_found = False
     rnode = tgen.routers()[dut]
     ipv4_show_bgp_json = run_frr_cmd(rnode, "sh ip bgp  json ", isjson=True)
     ipv6_show_bgp_json = run_frr_cmd(
@@ -1575,7 +1571,7 @@ def ping_router():
     ipv_dict = get_best_path_route_in_FIB(tgen, topo, dut="r2", network=network)
     dut_links = topo["routers"]["r1"]["links"]
     active_interface = None
-    for key, values in dut_links.items():
+    for key, _ in dut_links.items():
         ipv4_address = dut_links[key]["ipv4"].split("/")[0]
         ipv6_address = dut_links[key]["ipv6"].split("/")[0]
         if ipv_dict["ipv4"] == ipv4_address and ipv_dict["ipv6"] == ipv6_address:

tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py

@@ -18,8 +18,6 @@
 import sys
 import time
 import pytest
-from time import sleep
-from copy import deepcopy
 from lib.topolog import logger
 
 # pylint: disable=C0413
@@ -30,32 +28,18 @@
 
 from lib.bgp import (
     verify_bgp_convergence,
-    verify_graceful_restart,
     create_router_bgp,
-    verify_router_id,
     modify_as_number,
-    verify_as_numbers,
-    clear_bgp_and_verify,
-    clear_bgp,
     verify_bgp_rib,
     get_prefix_count_route,
     get_dut_as_number,
     verify_rib_default_route,
-    verify_fib_default_route,
-    verify_bgp_advertised_routes_from_neighbor,
-    verify_bgp_received_routes_from_neighbor,
 )
 from lib.common_config import (
-    interface_status,
     verify_prefix_lists,
     verify_fib_routes,
-    kill_router_daemons,
-    start_router_daemons,
-    shutdown_bringup_interface,
     step,
     required_linux_kernel_version,
-    stop_router,
-    start_router,
     create_route_maps,
     create_prefix_lists,
     get_frr_ipv6_linklocal,

tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py

@@ -17,8 +17,6 @@
 import sys
 import time
 import pytest
-from time import sleep
-from copy import deepcopy
 from lib.topolog import logger
 
 # pylint: disable=C0413
@@ -31,30 +29,21 @@
     verify_bgp_convergence,
     verify_graceful_restart,
     create_router_bgp,
-    verify_router_id,
     modify_as_number,
-    verify_as_numbers,
-    clear_bgp_and_verify,
-    clear_bgp,
     verify_bgp_rib,
-    get_prefix_count_route,
     get_dut_as_number,
     verify_rib_default_route,
     verify_fib_default_route,
     verify_bgp_advertised_routes_from_neighbor,
     verify_bgp_received_routes_from_neighbor,
 )
 from lib.common_config import (
-    interface_status,
     verify_prefix_lists,
     verify_fib_routes,
     kill_router_daemons,
     start_router_daemons,
-    shutdown_bringup_interface,
     step,
     required_linux_kernel_version,
-    stop_router,
-    start_router,
     create_route_maps,
     create_prefix_lists,
     get_frr_ipv6_linklocal,
@@ -65,7 +54,6 @@
     reset_config_on_routers,
     create_static_routes,
     check_router_status,
-    delete_route_maps,
 )
 
 

tests/topotests/bgp_default_originate/test_default_orginate_vrf.py

@@ -10,8 +10,6 @@
 import sys
 import time
 import pytest
-from time import sleep
-from copy import deepcopy
 from lib.topolog import logger
 
 # pylint: disable=C0413
@@ -22,32 +20,17 @@
 
 from lib.bgp import (
     verify_bgp_convergence,
-    verify_graceful_restart,
     create_router_bgp,
-    verify_router_id,
     modify_as_number,
-    verify_as_numbers,
-    clear_bgp_and_verify,
-    clear_bgp,
     verify_bgp_rib,
     get_prefix_count_route,
     get_dut_as_number,
-    verify_rib_default_route,
-    verify_fib_default_route,
-    verify_bgp_advertised_routes_from_neighbor,
-    verify_bgp_received_routes_from_neighbor,
 )
 from lib.common_config import (
-    interface_status,
     verify_prefix_lists,
     verify_rib,
-    kill_router_daemons,
-    start_router_daemons,
-    shutdown_bringup_interface,
     step,
     required_linux_kernel_version,
-    stop_router,
-    start_router,
     create_route_maps,
     create_prefix_lists,
     get_frr_ipv6_linklocal,
@@ -58,7 +41,6 @@
     reset_config_on_routers,
     create_static_routes,
     check_router_status,
-    delete_route_maps,
 )
 
 pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]