From 4256a20961308bda6528ee1313063ac4396e6e94 Mon Sep 17 00:00:00 2001 From: naveen Date: Tue, 28 Jul 2020 20:32:17 +0530 Subject: tests: ospf_basic_functionality topojson testcases. 1. Adding 18 ospf testcases to topojson. 2. Adding ospf.py library. Test suite execution time is ~18 minutes. Signed-off-by: naveen --- .../ospf_basic_functionality/test_ospf_rte_calc.py | 612 +++++++++++++++++++++ 1 file changed, 612 insertions(+) create mode 100644 tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py (limited to 'tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py') diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py b/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py new file mode 100644 index 0000000000..aceae4ae20 --- /dev/null +++ b/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py @@ -0,0 +1,612 @@ +#!/usr/bin/python + +# +# Copyright (c) 2020 by VMware, Inc. ("VMware") +# Used Copyright (c) 2018 by Network Device Education Foundation, Inc. +# ("NetDEF") in this file. +# +# Permission to use, copy, modify, and/or distribute this software +# for any purpose with or without fee is hereby granted, provided +# that the above copyright notice and this permission notice appear +# in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND VMWARE DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL VMWARE BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY +# DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +# OF THIS SOFTWARE. +# + + +"""OSPF Basic Functionality Automation.""" +import os +import sys +import time +import pytest +from time import sleep +import ipaddress +import json + +# Save the Current Working Directory to find configuration files. +CWD = os.path.dirname(os.path.realpath(__file__)) +sys.path.append(os.path.join(CWD, "../")) +sys.path.append(os.path.join(CWD, "../lib/")) + +# pylint: disable=C0413 +# Import topogen and topotest helpers +from mininet.topo import Topo +from lib.topogen import Topogen, get_topogen + +# Import topoJson from lib, to create topology and initial configuration +from lib.common_config import ( + start_topology, + write_test_header, + create_interfaces_cfg, + write_test_footer, + reset_config_on_routers, + verify_rib, + create_static_routes, + step, + shutdown_bringup_interface, +) +from lib.bgp import verify_bgp_convergence, create_router_bgp +from lib.topolog import logger +from lib.topojson import build_topo_from_json, build_config_from_json + +from lib.ospf import ( + verify_ospf_neighbor, + clear_ospf, + verify_ospf_rib, + create_router_ospf, +) + +# Global variables +topo = None +# Reading the data from JSON File for topology creation +jsonFile = "{}/ospf_rte_calc.json".format(CWD) +try: + with open(jsonFile, "r") as topoJson: + topo = json.load(topoJson) +except IOError: + assert False, "Could not read file {}".format(jsonFile) + +NETWORK = { + "ipv4": [ + "11.0.20.1/32", + "11.0.20.2/32", + "11.0.20.3/32", + "11.0.20.4/32", + "11.0.20.5/32", + ] +} +TOPOOLOGY = """ + Please view in a fixed-width font such as Courier. + +---+ A1 +---+ + +R1 +------------+R2 | + +-+-+- +--++ + | -- -- | + | -- A0 -- | + A0| ---- | + | ---- | A2 + | -- -- | + | -- -- | + +-+-+- +-+-+ + +R0 +-------------+R3 | + +---+ A3 +---+ +""" + +TESTCASES = """ +1. Test OSPF intra area route calculations. +2. Test OSPF inter area route calculations. +3. Test OSPF redistribution of connected routes. +""" + + +class CreateTopo(Topo): + """ + Test topology builder. + + * `Topo`: Topology object + """ + + def build(self, *_args, **_opts): + """Build function.""" + tgen = get_topogen(self) + + # Building topology from json file + build_topo_from_json(tgen, topo) + + +def setup_module(mod): + """ + Sets up the pytest environment + + * `mod`: module name + """ + global topo + testsuite_run_time = time.asctime(time.localtime(time.time())) + logger.info("Testsuite start time: {}".format(testsuite_run_time)) + logger.info("=" * 40) + + logger.info("Running setup_module to create topology") + + # This function initiates the topology build with Topogen... + tgen = Topogen(CreateTopo, mod.__name__) + # ... and here it calls Mininet initialization functions. + + # Starting topology, create tmp files which are loaded to routers + # to start deamons and then start routers + start_topology(tgen) + + # Creating configuration from JSON + build_config_from_json(tgen, topo) + + # Don't run this test if we have any failure. + if tgen.routers_have_failure(): + pytest.skip(tgen.errors) + # Api call verify whether OSPF is converged + ospf_covergence = verify_ospf_neighbor(tgen, topo) + assert ospf_covergence is True, "setup_module :Failed \n Error:" " {}".format( + ospf_covergence + ) + + logger.info("Running setup_module() done") + + +def teardown_module(mod): + """ + Teardown the pytest environment. + + * `mod`: module name + """ + + logger.info("Running teardown_module to delete topology") + + tgen = get_topogen() + + # Stop toplogy and Remove tmp files + tgen.stop_topology() + + logger.info( + "Testsuite end time: {}".format(time.asctime(time.localtime(time.time()))) + ) + logger.info("=" * 40) + + +def red_static(dut, config=True): + """Local def for Redstribute static routes inside ospf.""" + global topo + tgen = get_topogen() + if config: + ospf_red = {dut: {"ospf": {"redistribute": [{"redist_type": "static"}]}}} + else: + ospf_red = { + dut: { + "ospf": { + "redistribute": [{"redist_type": "static", "del_action": True}] + } + } + } + result = create_router_ospf(tgen, topo, ospf_red) + assert result is True, "Testcase : Failed \n Error: {}".format(result) + + +def red_connected(dut, config=True): + """Local def for Redstribute connected routes inside ospf.""" + global topo + tgen = get_topogen() + if config: + ospf_red = {dut: {"ospf": {"redistribute": [{"redist_type": "connected"}]}}} + else: + ospf_red = { + dut: { + "ospf": { + "redistribute": [{"redist_type": "connected", "del_action": True}] + } + } + } + result = create_router_ospf(tgen, topo, ospf_red) + assert result is True, "Testcase: Failed \n Error: {}".format(result) + + +# ################################## +# Test cases start here. +# ################################## + + +@pytest.mark.precommit +def test_ospf_redistribution_tc5_p0(request): + """Test OSPF intra area route calculations.""" + tc_name = request.node.name + write_test_header(tc_name) + tgen = get_topogen() + + # Don't run this test if we have any failure. + if tgen.routers_have_failure(): + pytest.skip(tgen.errors) + + global topo + step("Bring up the base config.") + reset_config_on_routers(tgen) + + step("Verify that OSPF neighbors are FULL.") + ospf_covergence = verify_ospf_neighbor(tgen, topo) + assert ospf_covergence is True, "setup_module :Failed \n Error:" " {}".format( + ospf_covergence + ) + + step("verify intra area route is calculated for r0-r3 interface ip in R1") + ip = topo["routers"]["r0"]["links"]["r3"]["ipv4"] + ip_net = str(ipaddress.ip_interface(u"{}".format(ip)).network) + nh = topo["routers"]["r0"]["links"]["r1"]["ipv4"].split("/")[0] + input_dict = { + "r1": {"static_routes": [{"network": ip_net, "no_of_ip": 1, "routeType": "N"}]} + } + + dut = "r1" + result = verify_ospf_rib(tgen, dut, input_dict, next_hop=nh) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + protocol = "ospf" + result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + step("Delete the ip address on newly configured loopback of R0") + topo1 = { + "r0": { + "links": { + "r3": { + "ipv4": topo["routers"]["r0"]["links"]["r3"]["ipv4"], + "interface": topo["routers"]["r0"]["links"]["r3"]["interface"], + "delete": True, + } + } + } + } + + result = create_interfaces_cfg(tgen, topo1) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + dut = "r1" + result = verify_ospf_rib(tgen, dut, input_dict, next_hop=nh) + assert result is not True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) + + protocol = "ospf" + result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + assert result is not True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) + + step("Add back the deleted ip address on newly configured interface of R0") + topo1 = { + "r0": { + "links": { + "r3": { + "ipv4": topo["routers"]["r0"]["links"]["r3"]["ipv4"], + "interface": topo["routers"]["r0"]["links"]["r3"]["interface"], + } + } + } + } + + result = create_interfaces_cfg(tgen, topo1) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + dut = "r1" + result = verify_ospf_rib(tgen, dut, input_dict, next_hop=nh) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + protocol = "ospf" + result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + step("Shut no shut interface on R0") + dut = "r0" + intf = topo["routers"]["r0"]["links"]["r3"]["interface"] + shutdown_bringup_interface(tgen, dut, intf, False) + + step("Verify that intraroute calculated for R1 intf on R0 is deleted.") + dut = "r1" + + # sleep is added so that neighbor gets deleted after interface shut. + sleep(12) + + result = verify_ospf_rib(tgen, dut, input_dict, expected=False) + assert result is not True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) + + protocol = "ospf" + result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + assert result is not True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) + + step("un shut the OSPF interface on R0") + dut = "r0" + shutdown_bringup_interface(tgen, dut, intf, True) + + dut = "r1" + result = verify_ospf_rib(tgen, dut, input_dict) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + protocol = "ospf" + result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + write_test_footer(tc_name) + + +def test_ospf_redistribution_tc6_p0(request): + """Test OSPF inter area route calculations.""" + tc_name = request.node.name + write_test_header(tc_name) + tgen = get_topogen() + + # Don't run this test if we have any failure. + if tgen.routers_have_failure(): + pytest.skip(tgen.errors) + + global topo + step("Bring up the base config.") + reset_config_on_routers(tgen) + + step("Verify that OSPF neighbors are FULL.") + ospf_covergence = verify_ospf_neighbor(tgen, topo) + assert ospf_covergence is True, "setup_module :Failed \n Error:" " {}".format( + ospf_covergence + ) + + step("verify intra area route is calculated for r0-r3 interface ip in R1") + ip = topo["routers"]["r0"]["links"]["r3"]["ipv4"] + ip_net = str(ipaddress.ip_interface(u"{}".format(ip)).network) + nh = topo["routers"]["r0"]["links"]["r1"]["ipv4"].split("/")[0] + input_dict = { + "r1": {"static_routes": [{"network": ip_net, "no_of_ip": 1, "routeType": "N"}]} + } + + dut = "r1" + result = verify_ospf_rib(tgen, dut, input_dict, next_hop=nh) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + protocol = "ospf" + result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + step("Delete the ip address on newly configured loopback of R0") + topo1 = { + "r0": { + "links": { + "r3": { + "ipv4": topo["routers"]["r0"]["links"]["r3"]["ipv4"], + "interface": topo["routers"]["r0"]["links"]["r3"]["interface"], + "delete": True, + } + } + } + } + + result = create_interfaces_cfg(tgen, topo1) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + dut = "r1" + result = verify_ospf_rib(tgen, dut, input_dict, next_hop=nh) + assert result is not True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) + + protocol = "ospf" + result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + assert result is not True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) + + step("Add back the deleted ip address on newly configured interface of R0") + topo1 = { + "r0": { + "links": { + "r3": { + "ipv4": topo["routers"]["r0"]["links"]["r3"]["ipv4"], + "interface": topo["routers"]["r0"]["links"]["r3"]["interface"], + } + } + } + } + + result = create_interfaces_cfg(tgen, topo1) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + dut = "r1" + result = verify_ospf_rib(tgen, dut, input_dict, next_hop=nh) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + protocol = "ospf" + result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + step("Shut no shut interface on R0") + dut = "r0" + intf = topo["routers"]["r0"]["links"]["r3"]["interface"] + shutdown_bringup_interface(tgen, dut, intf, False) + + step("Verify that intraroute calculated for R1 intf on R0 is deleted.") + dut = "r1" + + sleep(10) + result = verify_ospf_rib(tgen, dut, input_dict) + assert result is not True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) + + protocol = "ospf" + result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + assert result is not True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) + + step("un shut the OSPF interface on R0") + dut = "r0" + shutdown_bringup_interface(tgen, dut, intf, True) + + dut = "r1" + result = verify_ospf_rib(tgen, dut, input_dict) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + protocol = "ospf" + result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + write_test_footer(tc_name) + + +def test_ospf_redistribution_tc8_p1(request): + """ + Test OSPF redistribution of connected routes. + + Verify OSPF redistribution of connected routes when bgp multi hop + neighbor is configured using ospf routes + + """ + tc_name = request.node.name + write_test_header(tc_name) + tgen = get_topogen() + global topo + step("Bring up the base config.") + step( + "Configure loopback interface on all routers, and redistribut" + "e connected routes into ospf" + ) + reset_config_on_routers(tgen) + + step( + "verify that connected routes -loopback is found in all routers" + "advertised/exchaged via ospf" + ) + for rtr in topo["routers"]: + red_static(rtr) + red_connected(rtr) + for node in topo["routers"]: + input_dict = { + "r0": { + "static_routes": [ + { + "network": topo["routers"][node]["links"]["lo"]["ipv4"], + "no_of_ip": 1, + } + ] + } + } + for rtr in topo["routers"]: + result = verify_rib(tgen, "ipv4", rtr, input_dict) + assert result is True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) + + step("Configure E BGP multi hop using the loopback addresses.") + as_num = 100 + for node in topo["routers"]: + as_num += 1 + topo["routers"][node].update( + { + "bgp": { + "local_as": as_num, + "address_family": {"ipv4": {"unicast": {"neighbor": {}}}}, + } + } + ) + for node in topo["routers"]: + for rtr in topo["routers"]: + if node is not rtr: + topo["routers"][node]["bgp"]["address_family"]["ipv4"]["unicast"][ + "neighbor" + ].update( + { + rtr: { + "dest_link": { + "lo": {"source_link": "lo", "ebgp_multihop": 2} + } + } + } + ) + + result = create_router_bgp(tgen, topo, topo["routers"]) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + step("Verify that BGP neighbor is ESTABLISHED") + result = verify_bgp_convergence(tgen, topo) + assert result is True, "Testcase {} :Failed \n Error: {}".format(tc_name, result) + step( + "Configure couple of static routes in R0 and " + "Redistribute static routes in R1 bgp." + ) + + for rtr in topo["routers"]: + ospf_red = { + rtr: {"ospf": {"redistribute": [{"redist_type": "static", "delete": True}]}} + } + result = create_router_ospf(tgen, topo, ospf_red) + assert result is True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) + + input_dict = { + "r0": { + "static_routes": [ + {"network": NETWORK["ipv4"][0], "no_of_ip": 5, "next_hop": "Null0",} + ] + } + } + result = create_static_routes(tgen, input_dict) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + + configure_bgp_on_r0 = { + "r0": { + "bgp": { + "address_family": { + "ipv4": {"unicast": {"redistribute": [{"redist_type": "static"}]}} + } + } + } + } + result = create_router_bgp(tgen, topo, configure_bgp_on_r0) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) + protocol = "bgp" + for rtr in ["r1", "r2", "r3"]: + result = verify_rib(tgen, "ipv4", rtr, input_dict, protocol=protocol) + assert result is True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) + + step("Clear ospf neighbours in R0") + for rtr in topo["routers"]: + clear_ospf(tgen, rtr) + + step("Verify that OSPF neighbours are reset and forms new adjacencies.") + # Api call verify whether OSPF is converged + ospf_covergence = verify_ospf_neighbor(tgen, topo) + assert ospf_covergence is True, "setup_module :Failed \n Error:" " {}".format( + ospf_covergence + ) + + step("Verify that BGP neighbours are reset and forms new adjacencies.") + result = verify_bgp_convergence(tgen, topo) + assert result is True, "Testcase {} :Failed \n Error: {}".format(tc_name, result) + + protocol = "bgp" + for rtr in ["r1", "r2", "r3"]: + result = verify_rib(tgen, "ipv4", rtr, input_dict, protocol=protocol) + assert result is True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) + + write_test_footer(tc_name) + + +if __name__ == "__main__": + args = ["-s"] + sys.argv[1:] + sys.exit(pytest.main(args)) -- cgit v1.2.3 From a81774ec7d67f36f1380b9130cbc45a7e8001d1b Mon Sep 17 00:00:00 2001 From: naveen Date: Tue, 18 Aug 2020 15:58:34 +0530 Subject: tests: ospf basic functionality topojson testcases. 1. Removed static sleeps. Signed-off-by: naveen --- .../test_ospf_authentication.py | 46 +++++++------- .../ospf_basic_functionality/test_ospf_ecmp.py | 26 +++++++- .../ospf_basic_functionality/test_ospf_ecmp_lan.py | 18 ++++-- .../ospf_basic_functionality/test_ospf_lan.py | 1 - .../ospf_basic_functionality/test_ospf_nssa.py | 2 - .../test_ospf_routemaps.py | 7 ++- .../ospf_basic_functionality/test_ospf_rte_calc.py | 63 ++++++++----------- .../test_ospf_single_area.py | 71 +--------------------- 8 files changed, 90 insertions(+), 144 deletions(-) (limited to 'tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py') diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_authentication.py b/tests/topotests/ospf_basic_functionality/test_ospf_authentication.py index 5f6412c997..e6485de250 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_authentication.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_authentication.py @@ -196,7 +196,7 @@ def test_ospf_authentication_simple_pass_tc28_p1(request): step("Verify that the neighbour is not FULL between R1 and R2.") dut = "r1" - ospf_covergence = verify_ospf_neighbor(tgen, topo, dut=dut) + ospf_covergence = verify_ospf_neighbor(tgen, topo, dut=dut, expected=False) assert ospf_covergence is not True, "setup_module :Failed \n Error:" " {}".format( ospf_covergence ) @@ -248,12 +248,12 @@ def test_ospf_authentication_simple_pass_tc28_p1(request): assert result is True, "Testcase {} :Failed \n Error: {}".format(tc_name, result) step("Verify on R1 neighbour is deleted for R2 after dead interval expiry") - - step("Waiting for dead time expiry....") - sleep(10) - + # wait till the dead time expiry + sleep(6) dut = "r2" - ospf_covergence = verify_ospf_neighbor(tgen, topo, dut=dut, expected=False) + ospf_covergence = verify_ospf_neighbor( + tgen, topo, dut=dut, expected=False, attempts=5 + ) assert ospf_covergence is not True, "setup_module :Failed \n Error:" " {}".format( ospf_covergence ) @@ -323,7 +323,6 @@ def test_ospf_authentication_simple_pass_tc28_p1(request): dut = "r1" intf = topo["routers"]["r1"]["links"]["r2"]["interface"] shutdown_bringup_interface(tgen, dut, intf, False) - sleep(5) shutdown_bringup_interface(tgen, dut, intf, True) # clear ip ospf after configuring the authentication. @@ -386,13 +385,13 @@ def test_ospf_authentication_md5_tc29_p1(request): result = config_ospf_interface(tgen, topo, r1_ospf_auth) assert result is True, "Testcase {} :Failed \n Error: {}".format(tc_name, result) - # Wait for 2 dead interval timer to check neighbor. - sleep(8) - step("Verify that the neighbour is not FULL between R1 and R2.") - + # wait for dead time expiry. + sleep(6) dut = "r1" - ospf_covergence = verify_ospf_neighbor(tgen, topo, dut=dut, expected=False) + ospf_covergence = verify_ospf_neighbor( + tgen, topo, dut=dut, expected=False, attempts=3 + ) assert ospf_covergence is not True, "setup_module :Failed \n Error:" " {}".format( ospf_covergence ) @@ -452,12 +451,12 @@ def test_ospf_authentication_md5_tc29_p1(request): assert result is True, "Testcase {} :Failed \n Error: {}".format(tc_name, result) step("Verify on R1 ,nbr is deleted for R2 after dead interval expiry") - - step("Waiting for dead time expiry....") - sleep(10) - + # wait till the dead timer expiry + sleep(6) dut = "r2" - ospf_covergence = verify_ospf_neighbor(tgen, topo, dut=dut, expected=False) + ospf_covergence = verify_ospf_neighbor( + tgen, topo, dut=dut, expected=False, attempts=5 + ) assert ospf_covergence is not True, "setup_module :Failed \n Error:" " {}".format( ospf_covergence ) @@ -535,7 +534,6 @@ def test_ospf_authentication_md5_tc29_p1(request): dut = "r1" intf = topo["routers"]["r1"]["links"]["r2"]["interface"] shutdown_bringup_interface(tgen, dut, intf, False) - sleep(5) shutdown_bringup_interface(tgen, dut, intf, True) clear_ospf(tgen, "r1") r1_ospf_auth = { @@ -602,15 +600,13 @@ def test_ospf_authentication_different_auths_tc30_p1(request): result = config_ospf_interface(tgen, topo, r1_ospf_auth) assert result is True, "Testcase {} :Failed \n Error: {}".format(tc_name, result) - # Wait for 2 dead interval timer to check neighbor. - sleep(8) - # clear ip ospf after configuring the authentication. - # clear_ospf(tgen, "r1") - + # wait for dead timer expiry + sleep(6) step("Verify that the neighbour is not FULL between R1 and R2.") - dut = "r1" - ospf_covergence = verify_ospf_neighbor(tgen, topo, dut=dut, expected=False) + ospf_covergence = verify_ospf_neighbor( + tgen, topo, dut=dut, expected=False, attempts=5 + ) assert ospf_covergence is not True, "setup_module :Failed \n Error:" " {}".format( ospf_covergence ) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py index 51be52bd26..30f50a78c4 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py @@ -352,7 +352,16 @@ def test_ospf_ecmp_tc16_p0(request): ) protocol = "ospf" - result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + result = verify_rib( + tgen, + "ipv4", + dut, + input_dict, + protocol=protocol, + next_hop=nh, + attempts=5, + expected=False, + ) assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) @@ -435,13 +444,24 @@ def test_ospf_ecmp_tc17_p0(request): step("Verify that route is withdrawn from R2.") dut = "r1" - result = verify_ospf_rib(tgen, dut, input_dict, next_hop=nh) + result = verify_ospf_rib( + tgen, dut, input_dict, next_hop=nh, attempts=5, expected=False + ) assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) protocol = "ospf" - result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + result = verify_rib( + tgen, + "ipv4", + dut, + input_dict, + protocol=protocol, + next_hop=nh, + attempts=5, + expected=False, + ) assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp_lan.py b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp_lan.py index b663b224e4..c31f7f2bfd 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp_lan.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp_lan.py @@ -27,9 +27,6 @@ import sys import time import pytest import json -from time import sleep -from copy import deepcopy -import ipaddress # Save the Current Working Directory to find configuration files. CWD = os.path.dirname(os.path.realpath(__file__)) @@ -337,13 +334,24 @@ def test_ospf_lan_ecmp_tc18_p0(request): step("Verify that all the routes are withdrawn from R0") dut = "r1" - result = verify_ospf_rib(tgen, dut, input_dict, next_hop=nh) + result = verify_ospf_rib( + tgen, dut, input_dict, next_hop=nh, attempts=5, expected=False + ) assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) protocol = "ospf" - result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + result = verify_rib( + tgen, + "ipv4", + dut, + input_dict, + protocol=protocol, + next_hop=nh, + attempts=5, + expected=False, + ) assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_lan.py b/tests/topotests/ospf_basic_functionality/test_ospf_lan.py index 6f49e782b7..f1c24ae50d 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_lan.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_lan.py @@ -27,7 +27,6 @@ import sys import time import pytest import json -from time import sleep from copy import deepcopy import ipaddress diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_nssa.py b/tests/topotests/ospf_basic_functionality/test_ospf_nssa.py index 728fc2b8f1..557549db71 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_nssa.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_nssa.py @@ -53,8 +53,6 @@ import sys import time import pytest import json -from time import sleep -from copy import deepcopy # Save the Current Working Directory to find configuration files. CWD = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_routemaps.py b/tests/topotests/ospf_basic_functionality/test_ospf_routemaps.py index 373dcc29bc..ee7acf535d 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_routemaps.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_routemaps.py @@ -27,7 +27,6 @@ import sys import time import pytest import json -from time import sleep from copy import deepcopy # Save the Current Working Directory to find configuration files. @@ -240,12 +239,14 @@ def test_ospf_routemaps_functionality_tc20_p0(request): dut = "r1" protocol = "ospf" - result = verify_ospf_rib(tgen, dut, input_dict) + result = verify_ospf_rib(tgen, dut, input_dict, attempts=2, expected=False) assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) - result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol) + result = verify_rib( + tgen, "ipv4", dut, input_dict, protocol=protocol, attempts=2, expected=False + ) assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py b/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py index aceae4ae20..a46fa6fcce 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py @@ -26,7 +26,6 @@ import os import sys import time import pytest -from time import sleep import ipaddress import json @@ -271,13 +270,24 @@ def test_ospf_redistribution_tc5_p0(request): assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) dut = "r1" - result = verify_ospf_rib(tgen, dut, input_dict, next_hop=nh) + result = verify_ospf_rib( + tgen, dut, input_dict, next_hop=nh, attempts=5, expected=False + ) assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) protocol = "ospf" - result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + result = verify_rib( + tgen, + "ipv4", + dut, + input_dict, + protocol=protocol, + next_hop=nh, + attempts=5, + expected=False, + ) assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) @@ -310,23 +320,6 @@ def test_ospf_redistribution_tc5_p0(request): intf = topo["routers"]["r0"]["links"]["r3"]["interface"] shutdown_bringup_interface(tgen, dut, intf, False) - step("Verify that intraroute calculated for R1 intf on R0 is deleted.") - dut = "r1" - - # sleep is added so that neighbor gets deleted after interface shut. - sleep(12) - - result = verify_ospf_rib(tgen, dut, input_dict, expected=False) - assert result is not True, "Testcase {} : Failed \n Error: {}".format( - tc_name, result - ) - - protocol = "ospf" - result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) - assert result is not True, "Testcase {} : Failed \n Error: {}".format( - tc_name, result - ) - step("un shut the OSPF interface on R0") dut = "r0" shutdown_bringup_interface(tgen, dut, intf, True) @@ -395,13 +388,24 @@ def test_ospf_redistribution_tc6_p0(request): assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) dut = "r1" - result = verify_ospf_rib(tgen, dut, input_dict, next_hop=nh) + result = verify_ospf_rib( + tgen, dut, input_dict, next_hop=nh, attempts=5, expected=False + ) assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) protocol = "ospf" - result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) + result = verify_rib( + tgen, + "ipv4", + dut, + input_dict, + protocol=protocol, + next_hop=nh, + attempts=5, + expected=False, + ) assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) @@ -434,21 +438,6 @@ def test_ospf_redistribution_tc6_p0(request): intf = topo["routers"]["r0"]["links"]["r3"]["interface"] shutdown_bringup_interface(tgen, dut, intf, False) - step("Verify that intraroute calculated for R1 intf on R0 is deleted.") - dut = "r1" - - sleep(10) - result = verify_ospf_rib(tgen, dut, input_dict) - assert result is not True, "Testcase {} : Failed \n Error: {}".format( - tc_name, result - ) - - protocol = "ospf" - result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) - assert result is not True, "Testcase {} : Failed \n Error: {}".format( - tc_name, result - ) - step("un shut the OSPF interface on R0") dut = "r0" shutdown_bringup_interface(tgen, dut, intf, True) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_single_area.py b/tests/topotests/ospf_basic_functionality/test_ospf_single_area.py index 87b1b22c0f..29f61827f9 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_single_area.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_single_area.py @@ -27,7 +27,6 @@ import sys import time import pytest import json -from time import sleep from copy import deepcopy from ipaddress import IPv4Address @@ -451,18 +450,6 @@ def test_ospf_hello_tc10_p0(request): result = verify_ospf_interface(tgen, topo, dut=dut, input_dict=input_dict) assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) - # sleep for 20 secs for hello timer expiry - sleep(20) - - step("verify that ospf neighbours are not full - hello timer mis match.") - dut = "r1" - ospf_covergence = verify_ospf_neighbor( - tgen, topo, dut=dut, expected=False, attempts=10 - ) - assert ospf_covergence is not True, "setup_module :Failed \n Error:" " {}".format( - ospf_covergence - ) - step("modify hello timer from default value to r1 hello timer on r2") topo1 = { @@ -745,7 +732,7 @@ def test_ospf_dead_tc11_p0(request): "links": { "r0": { "interface": topo["routers"]["r1"]["links"]["r0"]["interface"], - "ospf": {"hello_interval": 12, "dead_interval": 48}, + "ospf": {"hello_interval": 2, "dead_interval": 8}, } } } @@ -759,71 +746,19 @@ def test_ospf_dead_tc11_p0(request): "the show ip ospf interface command." ) dut = "r1" - input_dict = {"r1": {"links": {"r0": {"ospf": {"timerDeadSecs": 48}}}}} - result = verify_ospf_interface(tgen, topo, dut=dut, input_dict=input_dict) - assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) - - sleep(50) - step("verify that ospf neighbours are not full - dead timer mis match.") - dut = "r1" - ospf_covergence = verify_ospf_neighbor( - tgen, topo, dut=dut, expected=False, attempts=10 - ) - assert ospf_covergence is not True, "setup_module :Failed \n Error:" " {}".format( - ospf_covergence - ) - - step("modify dead interval from default value to r1" "dead interval timer on r2") - - topo1 = { - "r0": { - "links": { - "r1": { - "interface": topo["routers"]["r0"]["links"]["r1"]["interface"], - "ospf": {"dead_interval": 48, "hello_interval": 12}, - } - } - } - } - - result = create_interfaces_cfg(tgen, topo1) - assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) - - step("verify that new timer value is configured.") - input_dict = {"r0": {"links": {"r1": {"ospf": {"timerDeadSecs": 48}}}}} - dut = "r0" + input_dict = {"r1": {"links": {"r0": {"ospf": {"timerDeadSecs": 8}}}}} result = verify_ospf_interface(tgen, topo, dut=dut, input_dict=input_dict) assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) - step("verify that ospf neighbours are full") - ospf_covergence = verify_ospf_neighbor(tgen, topo, dut=dut) - assert ospf_covergence is True, "setup_module :Failed \n Error:" " {}".format( - ospf_covergence - ) - step("remove ospf on R1") ospf_del = {"r0": {"ospf": {"delete": True}}} result = create_router_ospf(tgen, topo, ospf_del) assert result is True, "Testcase : Failed \n Error: {}".format(result) - step("verify that on R2 ospf neighbour is full till dead time expiry.") - dut = "r1" - ospf_covergence = verify_ospf_neighbor(tgen, topo, dut=dut) - assert ospf_covergence is True, "setup_module :Failed \n Error:" " {}".format( - ospf_covergence - ) - sleep(50) - - step("Verify that nbr on r2 gets deleted after dead interval expiry.") - ospf_covergence = verify_ospf_neighbor(tgen, topo, dut=dut) - assert ospf_covergence is not True, "setup_module :Failed \n Error:" " {}".format( - ospf_covergence - ) - # reconfiguring deleted ospf process by resetting the configs. reset_config_on_routers(tgen) - step("reconfigure the default dead interval timer value to " "default on r1 and r2") + step("reconfigure the default dead interval timer value to default on r1 and r2") topo1 = { "r0": { "links": { -- cgit v1.2.3 From 035267a3745bbe1f92b612a4414adb0ab65c3596 Mon Sep 17 00:00:00 2001 From: nguggarigoud Date: Tue, 8 Sep 2020 11:29:21 +0530 Subject: tests: Adding daemon check for ospfd in common_config.py start ospfd only when ospf config is used. Signed-off-by: nguggarigoud --- tests/topotests/lib/common_config.py | 32 ++++++++++++++++++---- .../test_ospf_authentication.py | 6 +++- .../ospf_basic_functionality/test_ospf_ecmp.py | 6 +++- .../ospf_basic_functionality/test_ospf_ecmp_lan.py | 7 ++++- .../ospf_basic_functionality/test_ospf_lan.py | 6 +++- .../ospf_basic_functionality/test_ospf_nssa.py | 7 ++++- .../test_ospf_routemaps.py | 6 +++- .../ospf_basic_functionality/test_ospf_rte_calc.py | 6 +++- .../test_ospf_single_area.py | 6 +++- 9 files changed, 68 insertions(+), 14 deletions(-) (limited to 'tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py') diff --git a/tests/topotests/lib/common_config.py b/tests/topotests/lib/common_config.py index 09e7fa7873..9a79693840 100644 --- a/tests/topotests/lib/common_config.py +++ b/tests/topotests/lib/common_config.py @@ -685,7 +685,7 @@ def generate_support_bundle(): return True -def start_topology(tgen): +def start_topology(tgen, daemon=None): """ Starting topology, create tmp files which are loaded to routers to start deamons and then start routers @@ -737,14 +737,16 @@ def start_topology(tgen): router.load_config( TopoRouter.RD_ZEBRA, "{}/{}/zebra.conf".format(TMPDIR, rname) ) + # Loading empty bgpd.conf file to router, to start the bgp deamon router.load_config(TopoRouter.RD_BGP, "{}/{}/bgpd.conf".format(TMPDIR, rname)) - # Loading empty ospf.conf file to router, to start the bgp deamon - router.load_config( - TopoRouter.RD_OSPF, - '{}/{}/ospfd.conf'.format(TMPDIR, rname) - ) + if daemon and 'ospfd' in daemon: + # Loading empty ospf.conf file to router, to start the bgp deamon + router.load_config( + TopoRouter.RD_OSPF, + '{}/{}/ospfd.conf'.format(TMPDIR, rname) + ) # Starting routers logger.info("Starting all routers once topology is created") tgen.start_router() @@ -817,6 +819,24 @@ def number_to_column(routerName): return ord(routerName[0]) - 97 +def topo_daemons(tgen, topo): + """ + Returns daemon list required for the suite based on topojson. + """ + daemon_list = [] + + router_list = tgen.routers() + ROUTER_LIST = sorted( + router_list.keys(), key=lambda x: int(re_search("\d+", x).group(0)) + ) + + for rtr in ROUTER_LIST: + if 'ospf' in topo['routers'][rtr] and 'ospfd' not in daemon_list: + daemon_list.append('ospfd') + + return daemon_list + + ############################################# # Common APIs, will be used by all protocols ############################################# diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_authentication.py b/tests/topotests/ospf_basic_functionality/test_ospf_authentication.py index e6485de250..a2f9c03ab4 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_authentication.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_authentication.py @@ -48,6 +48,7 @@ from lib.common_config import ( reset_config_on_routers, step, shutdown_bringup_interface, + topo_daemons ) from lib.topolog import logger from lib.topojson import build_topo_from_json, build_config_from_json @@ -119,9 +120,12 @@ def setup_module(mod): tgen = Topogen(CreateTopo, mod.__name__) # ... and here it calls Mininet initialization functions. + # get list of daemons needs to be started for this suite. + daemons = topo_daemons(tgen, topo) + # Starting topology, create tmp files which are loaded to routers # to start deamons and then start routers - start_topology(tgen) + start_topology(tgen, daemons) # Creating configuration from JSON build_config_from_json(tgen, topo) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py index 30f50a78c4..399fa02230 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py @@ -53,6 +53,7 @@ from lib.common_config import ( create_route_maps, shutdown_bringup_interface, create_interfaces_cfg, + topo_daemons ) from lib.topolog import logger @@ -141,9 +142,12 @@ def setup_module(mod): tgen = Topogen(CreateTopo, mod.__name__) # ... and here it calls Mininet initialization functions. + # get list of daemons needs to be started for this suite. + daemons = topo_daemons(tgen, topo) + # Starting topology, create tmp files which are loaded to routers # to start deamons and then start routers - start_topology(tgen) + start_topology(tgen, daemons) # Creating configuration from JSON build_config_from_json(tgen, topo) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp_lan.py b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp_lan.py index c31f7f2bfd..17a3676e2e 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp_lan.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp_lan.py @@ -53,6 +53,7 @@ from lib.common_config import ( shutdown_bringup_interface, stop_router, start_router, + topo_daemons ) from lib.bgp import verify_bgp_convergence, create_router_bgp from lib.topolog import logger @@ -146,9 +147,13 @@ def setup_module(mod): tgen = Topogen(CreateTopo, mod.__name__) # ... and here it calls Mininet initialization functions. + # get list of daemons needs to be started for this suite. + daemons = topo_daemons(tgen, topo) + # Starting topology, create tmp files which are loaded to routers # to start deamons and then start routers - start_topology(tgen) + start_topology(tgen, daemons) + # Creating configuration from JSON build_config_from_json(tgen, topo) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_lan.py b/tests/topotests/ospf_basic_functionality/test_ospf_lan.py index f1c24ae50d..968cb608e8 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_lan.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_lan.py @@ -55,6 +55,7 @@ from lib.common_config import ( shutdown_bringup_interface, stop_router, start_router, + topo_daemons ) from lib.bgp import verify_bgp_convergence, create_router_bgp from lib.topolog import logger @@ -141,9 +142,12 @@ def setup_module(mod): tgen = Topogen(CreateTopo, mod.__name__) # ... and here it calls Mininet initialization functions. + # get list of daemons needs to be started for this suite. + daemons = topo_daemons(tgen, topo) + # Starting topology, create tmp files which are loaded to routers # to start deamons and then start routers - start_topology(tgen) + start_topology(tgen, daemons) # Creating configuration from JSON build_config_from_json(tgen, topo) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_nssa.py b/tests/topotests/ospf_basic_functionality/test_ospf_nssa.py index 557549db71..ff4399f19e 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_nssa.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_nssa.py @@ -44,6 +44,7 @@ from lib.common_config import ( create_route_maps, shutdown_bringup_interface, create_interfaces_cfg, + topo_daemons ) from ipaddress import IPv4Address from lib.topogen import Topogen, get_topogen @@ -138,9 +139,13 @@ def setup_module(mod): tgen = Topogen(CreateTopo, mod.__name__) # ... and here it calls Mininet initialization functions. + # get list of daemons needs to be started for this suite. + daemons = topo_daemons(tgen, topo) + # Starting topology, create tmp files which are loaded to routers # to start deamons and then start routers - start_topology(tgen) + start_topology(tgen, daemons) + # Creating configuration from JSON build_config_from_json(tgen, topo) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_routemaps.py b/tests/topotests/ospf_basic_functionality/test_ospf_routemaps.py index ee7acf535d..6ebc74a013 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_routemaps.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_routemaps.py @@ -52,6 +52,7 @@ from lib.common_config import ( step, create_route_maps, verify_prefix_lists, + topo_daemons ) from lib.topolog import logger from lib.topojson import build_topo_from_json, build_config_from_json @@ -150,9 +151,12 @@ def setup_module(mod): tgen = Topogen(CreateTopo, mod.__name__) # ... and here it calls Mininet initialization functions. + # get list of daemons needs to be started for this suite. + daemons = topo_daemons(tgen, topo) + # Starting topology, create tmp files which are loaded to routers # to start deamons and then start routers - start_topology(tgen) + start_topology(tgen, daemons) # Creating configuration from JSON build_config_from_json(tgen, topo) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py b/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py index a46fa6fcce..5e0e35854e 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py @@ -50,6 +50,7 @@ from lib.common_config import ( create_static_routes, step, shutdown_bringup_interface, + topo_daemons ) from lib.bgp import verify_bgp_convergence, create_router_bgp from lib.topolog import logger @@ -136,9 +137,12 @@ def setup_module(mod): tgen = Topogen(CreateTopo, mod.__name__) # ... and here it calls Mininet initialization functions. + # get list of daemons needs to be started for this suite. + daemons = topo_daemons(tgen, topo) + # Starting topology, create tmp files which are loaded to routers # to start deamons and then start routers - start_topology(tgen) + start_topology(tgen, daemons) # Creating configuration from JSON build_config_from_json(tgen, topo) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_single_area.py b/tests/topotests/ospf_basic_functionality/test_ospf_single_area.py index 29f61827f9..b70c25ff1e 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_single_area.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_single_area.py @@ -53,6 +53,7 @@ from lib.common_config import ( create_route_maps, shutdown_bringup_interface, create_interfaces_cfg, + topo_daemons ) from lib.topolog import logger from lib.topojson import build_topo_from_json, build_config_from_json @@ -134,9 +135,12 @@ def setup_module(mod): tgen = Topogen(CreateTopo, mod.__name__) # ... and here it calls Mininet initialization functions. + # get list of daemons needs to be started for this suite. + daemons = topo_daemons(tgen, topo) + # Starting topology, create tmp files which are loaded to routers # to start deamons and then start routers - start_topology(tgen) + start_topology(tgen, daemons) # Creating configuration from JSON build_config_from_json(tgen, topo) -- cgit v1.2.3 From dd2da503cdad1f75cd9539f47e9d308a3f2a26f5 Mon Sep 17 00:00:00 2001 From: nguggarigoud Date: Fri, 18 Sep 2020 15:10:54 +0530 Subject: tests: Optimising a step for not true case. 1. Optimising a step for not true case. 2. Fixing a timing issue in route calculation script. Signed-off-by: nguggarigoud --- .../ospf_basic_functionality/test_ospf_lan.py | 2 +- .../ospf_basic_functionality/test_ospf_rte_calc.py | 25 ++++++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) (limited to 'tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py') diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_lan.py b/tests/topotests/ospf_basic_functionality/test_ospf_lan.py index 968cb608e8..f261104206 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_lan.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_lan.py @@ -431,7 +431,7 @@ def test_ospf_lan_tc1_p0(request): intf = topo["routers"]["r0"]["links"]["s1"]["interface"] shutdown_bringup_interface(tgen, dut, intf, False) - result = verify_ospf_neighbor(tgen, topo, dut, lan=True) + result = verify_ospf_neighbor(tgen, topo, dut, lan=True, expected=False) assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py b/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py index 5e0e35854e..2c6bcf0162 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_rte_calc.py @@ -65,6 +65,10 @@ from lib.ospf import ( # Global variables topo = None + +# number of retries. +nretry = 5 + # Reading the data from JSON File for topology creation jsonFile = "{}/ospf_rte_calc.json".format(CWD) try: @@ -220,7 +224,6 @@ def red_connected(dut, config=True): # ################################## -@pytest.mark.precommit def test_ospf_redistribution_tc5_p0(request): """Test OSPF intra area route calculations.""" tc_name = request.node.name @@ -257,7 +260,7 @@ def test_ospf_redistribution_tc5_p0(request): result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, next_hop=nh) assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) - step("Delete the ip address on newly configured loopback of R0") + step("Delete the ip address on newly configured interface of R0") topo1 = { "r0": { "links": { @@ -274,9 +277,12 @@ def test_ospf_redistribution_tc5_p0(request): assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) dut = "r1" - result = verify_ospf_rib( - tgen, dut, input_dict, next_hop=nh, attempts=5, expected=False - ) + for num in range(0, nretry): + result = verify_ospf_rib( + tgen, dut, input_dict, next_hop=nh, expected=False) + if result is not True: + break + assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) @@ -392,9 +398,11 @@ def test_ospf_redistribution_tc6_p0(request): assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) dut = "r1" - result = verify_ospf_rib( - tgen, dut, input_dict, next_hop=nh, attempts=5, expected=False - ) + for num in range(0, nretry): + result = verify_ospf_rib( + tgen, dut, input_dict, next_hop=nh, expected=False) + if result is not True: + break assert result is not True, "Testcase {} : Failed \n Error: {}".format( tc_name, result ) @@ -407,7 +415,6 @@ def test_ospf_redistribution_tc6_p0(request): input_dict, protocol=protocol, next_hop=nh, - attempts=5, expected=False, ) assert result is not True, "Testcase {} : Failed \n Error: {}".format( -- cgit v1.2.3