tests: Refactoring FRR test suites

Signed-off-by: y-bharath14 <y.bharath@samsung.com>

5 files changed, 1 insertions, 52 deletions

diff --git a/tests/topotests/bgp_default_originate/test_bgp_default_originate_2links.py b/tests/topotests/bgp_default_originate/test_bgp_default_originate_2links.py
index 75e66566b7..f4f874f942 100644
--- a/tests/topotests/bgp_default_originate/test_bgp_default_originate_2links.py
+++ b/tests/topotests/bgp_default_originate/test_bgp_default_originate_2links.py
@@ -17,7 +17,6 @@ import sys
 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 test_verify_default_originate_with_2way_ecmp_p2(request):
     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:
diff --git a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py
index 50a1938ae3..142b3e430f 100644
--- a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py
+++ b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py
@@ -18,8 +18,6 @@ import os
 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.topolog import logger
 
 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,
diff --git a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py
index 4e8bda55cf..a6918916df 100644
--- a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py
+++ b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py
@@ -17,8 +17,6 @@ import os
 import sys
 import time
 import pytest
-from time import sleep
-from copy import deepcopy
 from lib.topolog import logger
 
 # pylint: disable=C0413
@@ -31,13 +29,8 @@ 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,
@@ -45,16 +38,12 @@ from lib.bgp import (
     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 @@ from lib.common_config import (
     reset_config_on_routers,
     create_static_routes,
     check_router_status,
-    delete_route_maps,
 )
 
 
diff --git a/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py b/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py
index 4dedac5535..1506b02e5d 100644
--- a/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py
+++ b/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py
@@ -10,8 +10,6 @@ import os
 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.topolog import logger
 
 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 @@ from lib.common_config import (
     reset_config_on_routers,
     create_static_routes,
     check_router_status,
-    delete_route_maps,
 )
 
 pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]
diff --git a/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py b/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py
index f67a431c7e..97a7e62e7c 100644
--- a/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py
+++ b/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py
@@ -19,7 +19,6 @@ import os
 import sys
 import time
 import pytest
-from copy import deepcopy
 from lib.topolog import logger
 
 # pylint: disable=C0413