X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fbgpcep%2Fbgpingest%2Fbgp_app_peer_prefixcount.robot;h=1fb1ced9bdd05fb7d9be2ac6a5704bb4912ba8d9;hb=d9d549a6ef4081096f0d17e57aff1c015e3a5b05;hp=375b499a2177862bd256244037ef1fc3524ee5d7;hpb=08d33d7bcf2b2f20bbbea1beeda2fc3c2316882e;p=integration%2Ftest.git

diff --git a/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot b/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot
index 375b499a21..1fb1ced9bd 100644
--- a/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot
+++ b/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot
@@ -26,8 +26,8 @@ Documentation     BGP performance of ingesting from 1 BGP application peer
 ...               Bug 4791 - BGPSessionImpl: Failed to send message Update logged even all UPDATE mesages received by iBGP peer
 Suite Setup       Setup_Everything
 Suite Teardown    Teardown_Everything
-Test Setup        Setup_Test_With_Logging_And_Without_Fast_Failing
-Test Teardown     FailFast.Start_Failing_Fast_If_This_Failed
+Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
+Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_Test_Failed
 Force Tags        critical
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
@@ -96,13 +96,11 @@ BGP_Application_Peer_Prefill_Routes
 Wait_For_Ipv4_Topology_Is_Prefilled
     [Documentation]    Wait until example-ipv4-topology reaches the target prfix count.
     BuiltIn.Wait Until Keyword Succeeds    ${bgp_filling_timeout}    10s    PrefixCounting.Check_Ipv4_Topology_Count    ${PREFILL}
-    [Teardown]    Report_Failure_Due_To_Bug    4689
 
 Check_Bgp_Peer_Updates_For_Prefilled_Routes
     [Documentation]    Count the routes introduced by updates.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
     BuiltIn.Wait Until Keyword Succeeds    ${bgp_filling_timeout}    1s    Check_File_For_Word_Count    bgp_peer.log    total_received_nlri_prefix_counter: ${PREFILL}    2
-    [Teardown]    Report_Failure_Due_To_Bug    4689
 
 BGP_Application_Peer_Introduce_Single_Routes
     [Documentation]    Start BGP application peer tool and introduce routes.
@@ -114,13 +112,11 @@ BGP_Application_Peer_Introduce_Single_Routes
 Wait_For_Ipv4_Topology_Is_Filled
     [Documentation]    Wait until example-ipv4-topology reaches the target prfix count.
     BuiltIn.Wait Until Keyword Succeeds    ${bgp_filling_timeout}    10s    PrefixCounting.Check_Ipv4_Topology_Count    ${COUNT_APP_PEER_PREFIX_COUNT}
-    [Teardown]    Report_Failure_Due_To_Bug    4689
 
 Check_Bgp_Peer_Updates_For_All_Routes
     [Documentation]    Count the routes introduced by updates.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
     BuiltIn.Wait Until Keyword Succeeds    ${bgp_filling_timeout}    1s    Check_File_For_Word_Count    bgp_peer.log    total_received_nlri_prefix_counter: ${COUNT_APP_PEER_PREFIX_COUNT}    2
-    [Teardown]    Report_Failure_Due_To_Bug    4689
 
 Disconnect_BGP_Peer
     [Documentation]    Stop BGP peer tool
@@ -136,6 +132,7 @@ Reconnect_BGP_Peer
 
 Check_Bgp_Peer_Updates_For_Reintroduced_Routes
     [Documentation]    Count the routes introduced by updates.
+    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
     BuiltIn.Wait Until Keyword Succeeds    ${bgp_filling_timeout}    1s    Check_File_For_Word_Count    bgp_peer.log    total_received_nlri_prefix_counter: ${COUNT_APP_PEER_PREFIX_COUNT}    2
 
 BGP_Application_Peer_Delete_All_Routes
@@ -157,7 +154,6 @@ Check_Bgp_Peer_Updates_For_Prefix_Withdrawals
     [Documentation]    Count the routes withdrawn by updates.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
     BuiltIn.Wait Until Keyword Succeeds    ${bgp_emptying_timeout}    1s    Check_File_For_Word_Count    bgp_peer.log    total_received_withdrawn_prefix_counter: ${COUNT_APP_PEER_PREFIX_COUNT}    2
-    [Teardown]    Report_Failure_Due_To_Bug    4689
 
 Stop_BGP_Peer
     [Documentation]    Stop BGP peer tool
@@ -175,10 +171,9 @@ Delete_Bgp_Application_Peer_Configuration
     ${template_as_string}=    BuiltIn.Set_Variable    {'NAME': 'example-bgp-peer-app'}
     ConfigViaRestconf.Delete_Xml_Template_Folder_Config_Via_Restconf    ${BGP_VARIABLES_FOLDER}${/}bgp_application_peer    ${template_as_string}
 
-Check_Controller_Logs
+Check_Bug_4791
     [Documentation]    Check controller's log for errors
     Check Karaf Log File Does Not Have Messages    ${ODL_SYSTEM_IP}    Failed to send message Update
-    [Teardown]    Report_Failure_Due_To_Bug    4791
 
 *** Keywords ***
 Setup_Everything