X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FBgpOperations.robot;h=0614d80011dd839ffcded16e5e03e622dd244e65;hb=bf53c6c85bb53ee48269e4cd22453d3963aae90e;hp=9937c33afed3d9ad17ff32ef2eddc1be6308ccde;hpb=a96c1608fbe75392943549bf790f37411cc43841;p=integration%2Ftest.git diff --git a/csit/libraries/BgpOperations.robot b/csit/libraries/BgpOperations.robot index 9937c33afe..0614d80011 100644 --- a/csit/libraries/BgpOperations.robot +++ b/csit/libraries/BgpOperations.robot @@ -18,11 +18,7 @@ ${BGP_RIB_URI} bgp-rib:bgp-rib/rib=example-bgp-rib ${BGP_TOPOLOGY_URI} ${TOPOLOGY_URL}=example-ipv4-topology ${VAR_BASE_BGP} ${CURDIR}/../variables/bgpfunctional ${RIB_NAME} example-bgp-rib -${OLD_AS_PATH} \n"as-path": {}, -${NEW_AS_PATH} ${EMPTY} &{APP_PEER} IP=${ODL_SYSTEM_IP} BGP_RIB=${RIB_NAME} -${NEW_IPV4_ROUTES_LINE} ${EMPTY} -${OLD_IPV4_ROUTES_LINE} \n"bgp-inet:ipv4-routes": {}, ${BGP_CONFIG_SERVER_CMD} bgp-connect -h ${ODL_SYSTEM_IP} -p 7644 add ${VPNV4_ADDR_FAMILY} vpnv4 ${DISPLAY_VPN4_ALL} show-bgp --cmd "ip bgp ${VPNV4_ADDR_FAMILY} all" @@ -367,10 +363,7 @@ Bmp_Monitor_Precondition Bmp_Monitor_Postcondition [Documentation] Verifies if example-bmp-monitor data contains one peer. [Arguments] ${session} - ${routes_line} = CompareStream.Set_Variable_If_At_Least_Neon - ... ${NEW_IPV4_ROUTES_LINE} - ... ${OLD_IPV4_ROUTES_LINE} - &{mapping} = BuiltIn.Create_Dictionary TOOL_IP=${TOOLS_SYSTEM_IP} ROUTES_LINE=${routes_line} + &{mapping} = BuiltIn.Create_Dictionary TOOL_IP=${TOOLS_SYSTEM_IP} ${output} = BuiltIn.Wait_Until_Keyword_Succeeds ... 10x ... 5s @@ -399,16 +392,13 @@ Odl_To_Play_Template Play_To_Odl_Template [Arguments] ${totest} ${dir} ${ipv}=ipv4 - ${as_path} = CompareStream.Set_Variable_If_At_Least_Neon ${NEW_AS_PATH} ${OLD_AS_PATH} &{adj_rib_in} = BuiltIn.Create_Dictionary ... PATH=peer\=bgp:%2F%2F${TOOLS_SYSTEM_IP}/adj-rib-in ... BGP_RIB=${RIB_NAME} - ... AS_PATH=${as_path} &{effective_rib_in} = BuiltIn.Create_Dictionary ... PATH=peer\=bgp:%2F%2F${TOOLS_SYSTEM_IP}/effective-rib-in ... BGP_RIB=${RIB_NAME} - ... AS_PATH=${as_path} - &{loc_rib} = BuiltIn.Create_Dictionary PATH=loc-rib BGP_RIB=${RIB_NAME} AS_PATH=${as_path} + &{loc_rib} = BuiltIn.Create_Dictionary PATH=loc-rib BGP_RIB=${RIB_NAME} ${announce_hex} = OperatingSystem.Get_File ${dir}/${totest}/announce_${totest}.hex ${withdraw_hex} = OperatingSystem.Get_File ${dir}/${totest}/withdraw_${totest}.hex BgpRpcClient.play_clean @@ -453,8 +443,7 @@ Play_To_Odl_Non_Removal_Template ${announce_hex} = OperatingSystem.Get_File ${dir}/${totest}/announce_${totest}.hex BgpRpcClient.play_clean BgpRpcClient.play_send ${announce_hex} - ${as_path} = CompareStream.Set_Variable_If_At_Least_Neon ${NEW_AS_PATH} ${OLD_AS_PATH} - &{loc_rib} = BuiltIn.Create_Dictionary PATH=loc-rib BGP_RIB=${RIB_NAME} AS_PATH=${as_path} + &{loc_rib} = BuiltIn.Create_Dictionary PATH=loc-rib BGP_RIB=${RIB_NAME} BuiltIn.Wait_Until_Keyword_Succeeds ... 3x ... 2s