X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FPrefixCounting.robot;h=3e0fc146b405faf2b40544b845e9385aafcd10c6;hb=b6e65eac5db0ec0342b2958934ba2fdc4e97b47f;hp=f169a58219c041fbea4ee03e2ffd4b752999ec2d;hpb=5f64af6d5b5290ef5d92e97f6bde4d83e2915f1e;p=integration%2Ftest.git diff --git a/csit/libraries/PrefixCounting.robot b/csit/libraries/PrefixCounting.robot index f169a58219..3e0fc146b4 100644 --- a/csit/libraries/PrefixCounting.robot +++ b/csit/libraries/PrefixCounting.robot @@ -12,13 +12,16 @@ Documentation Robot keyword library (Resource) for common BGP actions concer ... Prefix is identified by simplistic regular expression on JSON data. ... ... This resource assumes that RequestsLibrary has open a connection named "operational" -... which points to (an analogue of) http://:${RESTCONFPORT}/${OPERATIONAL_API} +... which points to (an analogue of) http://:${RESTCONFPORT} ... or user has to provide a similar session. Library RequestsLibrary Resource ${CURDIR}/ShardStability.robot Resource ${CURDIR}/WaitUtils.robot Resource ${CURDIR}/ScalarClosures.robot +*** Variables *** +${PC_NW_TOPOLOGY} ${REST_API}/network-topology:network-topology/topology + *** Keywords *** PC_Setup [Documentation] Call dependency setups and construct suite variables. @@ -29,7 +32,7 @@ Get_Ipv4_Topology [Documentation] GET the ${topology} data, check status is 200, return the topology data. ... ... Contrary to Utils.Get_Data_From_URI, this does not Log the (potentially huge) content. - ${response} = RequestsLibrary.Get_Request ${session} network-topology:network-topology/topology/${topology} + ${response} = RequestsLibrary.Get_Request ${session} ${PC_NW_TOPOLOGY}=${topology}?content=nonconfig Run_Keyword_If ${response.status_code} != 200 Fail Get on ${topology} returned status code ${response.status_code} with message: ${response.text} [Return] ${response.text} @@ -44,7 +47,7 @@ Get_Ipv4_Topology_Count Get_Ipv4_Topology_Count_With_Shards_Check [Arguments] ${shards_list} ${details_exp} ${session}=operational ${topology}=example-ipv4-topology [Documentation] Get topology after the shards stability check passes. If not fail, return number of prefixes in the topology. - ${details_actual}= ShardStability.Shards_Stability_Get_Details ${shards_list} + ${details_actual}= ShardStability.Shards_Stability_Get_Details ${shards_list} http_timeout=125 ShardStability.Shards_Stability_Compare_Same ${details_actual} stateless_details=${details_exp} ${topology} = Get_Ipv4_Topology session=${session} topology=${topology} # Triple quotes are precaution against formatted output.