Merge pull request #12645 from gpnaveen/ospf_error_msg_enhancements

tests: [topojson] Update assert/error messages for ospf scripts

1 files changed, 40 insertions, 40 deletions

diff --git a/tests/topotests/ospfv3_basic_functionality/test_ospfv3_authentication.py b/tests/topotests/ospfv3_basic_functionality/test_ospfv3_authentication.py
index 2f90c98785..58608e249b 100644
--- a/tests/topotests/ospfv3_basic_functionality/test_ospfv3_authentication.py
+++ b/tests/topotests/ospfv3_basic_functionality/test_ospfv3_authentication.py
@@ -111,7 +111,7 @@ def setup_module(mod):
         pytest.skip(tgen.errors)
 
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo)
-    assert ospf6_covergence is True, "setup_module :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "setup_module :Failed \n Error:  {}".format(
         ospf6_covergence
     )
 
@@ -182,7 +182,7 @@ def test_ospf6_auth_trailer_tc1_md5(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -214,7 +214,7 @@ def test_ospf6_auth_trailer_tc1_md5(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -244,7 +244,7 @@ def test_ospf6_auth_trailer_tc1_md5(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=5
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -272,7 +272,7 @@ def test_ospf6_auth_trailer_tc1_md5(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -287,7 +287,7 @@ def test_ospf6_auth_trailer_tc1_md5(request):
         "show ip ospf6 neighbor cmd."
     )
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut, expected=False)
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -301,7 +301,7 @@ def test_ospf6_auth_trailer_tc1_md5(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -348,7 +348,7 @@ def test_ospf6_auth_trailer_tc2_sha256(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -380,7 +380,7 @@ def test_ospf6_auth_trailer_tc2_sha256(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -410,7 +410,7 @@ def test_ospf6_auth_trailer_tc2_sha256(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=5
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -438,7 +438,7 @@ def test_ospf6_auth_trailer_tc2_sha256(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -453,7 +453,7 @@ def test_ospf6_auth_trailer_tc2_sha256(request):
         "show ip ospf6 neighbor cmd."
     )
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut, expected=False)
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -467,7 +467,7 @@ def test_ospf6_auth_trailer_tc2_sha256(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -531,7 +531,7 @@ def test_ospf6_auth_trailer_tc3_keychain_md5(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -561,7 +561,7 @@ def test_ospf6_auth_trailer_tc3_keychain_md5(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -580,7 +580,7 @@ def test_ospf6_auth_trailer_tc3_keychain_md5(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=5
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -606,7 +606,7 @@ def test_ospf6_auth_trailer_tc3_keychain_md5(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -621,7 +621,7 @@ def test_ospf6_auth_trailer_tc3_keychain_md5(request):
         "show ip ospf6 neighbor cmd."
     )
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut, expected=False)
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -635,7 +635,7 @@ def test_ospf6_auth_trailer_tc3_keychain_md5(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -699,7 +699,7 @@ def test_ospf6_auth_trailer_tc4_keychain_sha256(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -729,7 +729,7 @@ def test_ospf6_auth_trailer_tc4_keychain_sha256(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -748,7 +748,7 @@ def test_ospf6_auth_trailer_tc4_keychain_sha256(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=5
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -774,7 +774,7 @@ def test_ospf6_auth_trailer_tc4_keychain_sha256(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -789,7 +789,7 @@ def test_ospf6_auth_trailer_tc4_keychain_sha256(request):
         "show ip ospf6 neighbor cmd."
     )
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut, expected=False)
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -803,7 +803,7 @@ def test_ospf6_auth_trailer_tc4_keychain_sha256(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -850,7 +850,7 @@ def test_ospf6_auth_trailer_tc5_md5_keymissmatch(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -887,7 +887,7 @@ def test_ospf6_auth_trailer_tc5_md5_keymissmatch(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -919,7 +919,7 @@ def test_ospf6_auth_trailer_tc5_md5_keymissmatch(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -966,7 +966,7 @@ def test_ospf6_auth_trailer_tc6_sha256_mismatch(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -998,7 +998,7 @@ def test_ospf6_auth_trailer_tc6_sha256_mismatch(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -1030,7 +1030,7 @@ def test_ospf6_auth_trailer_tc6_sha256_mismatch(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -1102,7 +1102,7 @@ def test_ospf6_auth_trailer_tc7_keychain_md5_missmatch(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -1132,7 +1132,7 @@ def test_ospf6_auth_trailer_tc7_keychain_md5_missmatch(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -1162,7 +1162,7 @@ def test_ospf6_auth_trailer_tc7_keychain_md5_missmatch(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -1234,7 +1234,7 @@ def test_ospf6_auth_trailer_tc8_keychain_sha256_missmatch(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -1264,7 +1264,7 @@ def test_ospf6_auth_trailer_tc8_keychain_sha256_missmatch(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -1294,7 +1294,7 @@ def test_ospf6_auth_trailer_tc8_keychain_sha256_missmatch(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -1342,7 +1342,7 @@ def test_ospf6_auth_trailer_tc9_keychain_not_configured(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -1372,7 +1372,7 @@ def test_ospf6_auth_trailer_tc9_keychain_not_configured(request):
     ospf6_covergence = verify_ospf6_neighbor(
         tgen, topo, dut=dut, expected=False, retry_timeout=3
     )
-    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is not True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )
 
@@ -1402,7 +1402,7 @@ def test_ospf6_auth_trailer_tc10_no_auth_trailer(request):
 
     dut = "r2"
     ospf6_covergence = verify_ospf6_neighbor(tgen, topo, dut=dut)
-    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:" " {}".format(
+    assert ospf6_covergence is True, "Testcase {} :Failed \n Error:  {}".format(
         tc_name, ospf6_covergence
     )