Fix BGPCEP test for 409 code and isolate failures

Some tests fail because exabgp route-refresh capability but this
capability is only required in the route-refresh test, so this
patch disables this capability if not required.

Change-Id: I834f3edfb2a0a757ea2f4c4786dbd5161c1db143
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot b/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
index 785245c12eed8729430c44824630eaa7db30bd0b..9012a96f328bdae0f155624173cc6afebcb4e433 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
+++ b/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
@@ -110,7 +110,7 @@ Upload_Config_Files
     FOR    ${cfgfile}    IN    @{cfgfiles}
         SSHLibrary.Execute_Command    sed -i -e 's/EXABGPIP/${TOOLS_SYSTEM_IP}/g' ${cfgfile}
         SSHLibrary.Execute_Command    sed -i -e 's/ODLIP/${ODL_SYSTEM_IP}/g' ${cfgfile}
-        SSHLibrary.Execute_Command    sed -i -e 's/ROUTEREFRESH/enable/g' ${cfgfile}
+        SSHLibrary.Execute_Command    sed -i -e 's/ROUTEREFRESH/disable/g' ${cfgfile}
         SSHLibrary.Execute_Command    sed -i -e 's/ADDPATH/${addpath}/g' ${cfgfile}
         ${stdout}=    SSHLibrary.Execute_Command    cat ${cfgfile}
         Log    ${stdout}

diff --git a/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot b/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
index d6f58d8e6990db7ee50f6febb61c53fb484e4895..584be5f9ab3d4b53e9bbcafb3d8158ef5533c0d8 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
+++ b/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
@@ -424,7 +424,7 @@ Play_To_Odl_Template
 
 Verify_Test_Preconditions
     ${resp} =    RequestsLibrary.Get_Request    ${CONFIG_SESSION}    ${EVPN_CONF_URL}
-    BuiltIn.Should_Be_Equal_As_Numbers    ${resp.status_code}    404
+    BuiltIn.Should_Contain    ${DELETED_STATUS_CODES}    ${resp.status_code}
     ${rsp} =    RequestsLibrary.Get_Request    ${CONFIG_SESSION}    ${EVPN_FAMILY_LOC_RIB}    headers=${HEADERS}
     TemplatedRequests.Normalize_Jsons_And_Compare    ${EMPTY_ROUTES}    ${rsp.content}
 
@@ -434,7 +434,7 @@ Remove_Configured_Routes
     Log    ${rsp.content}
     ${rsp} =    RequestsLibrary.Get_Request    ${CONFIG_SESSION}    ${EVPN_CONF_URL}    headers=${HEADERS}
     Log    ${rsp.content}
-    BuiltIn.Return_From_Keyword_If    "${rsp.status_code}" == "404"
+    BuiltIn.Return_From_Keyword_If    ${rsp.status_code} in ${DELETED_STATUS_CODES}
     ${resp} =    RequestsLibrary.Delete_Request    ${CONFIG_SESSION}    ${EVPN_CONF_URL}
     BuiltIn.Should_Be_Equal_As_Numbers    ${resp.status_code}    200
 

diff --git a/csit/suites/bgpcep/bgpfunct/bgp_functional_md5.robot b/csit/suites/bgpcep/bgpfunct/bgp_functional_md5.robot
index 057a0943c3d606694189efe9efbec417729ada1c..bc01b17d62996c4dba878a9de961deccd2cc882b 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/bgp_functional_md5.robot
+++ b/csit/suites/bgpcep/bgpfunct/bgp_functional_md5.robot
@@ -90,7 +90,7 @@ Upload_Config_Files
     FOR    ${cfgfile}    IN    @{cfgfiles}
         SSHLibrary.Execute_Command    sed -i -e 's/EXABGPIP/${TOOLS_SYSTEM_IP}/g' ${cfgfile}
         SSHLibrary.Execute_Command    sed -i -e 's/ODLIP/${ODL_SYSTEM_IP}/g' ${cfgfile}
-        SSHLibrary.Execute_Command    sed -i -e 's/ROUTEREFRESH/enable/g' ${cfgfile}
+        SSHLibrary.Execute_Command    sed -i -e 's/ROUTEREFRESH/disable/g' ${cfgfile}
         SSHLibrary.Execute_Command    sed -i -e 's/ADDPATH/disable/g' ${cfgfile}
         SSHLibrary.Execute_Command    sed -i -e 's/PASSWORD/${MD5_SAME_PASSWD}/g' ${cfgfile}
         ${stdout}=    SSHLibrary.Execute_Command    cat ${cfgfile}