From 4588d5f6cd1ccfd6cd903f19d3082718d255aee5 Mon Sep 17 00:00:00 2001 From: Peter Gubka Date: Mon, 23 Jan 2017 13:43:01 +0100 Subject: [PATCH] Remove ODL_STREAM variable from libraries/ChangeCounter.robot Change-Id: Ibeacf103b4c6bb68c04d78e548647544c78b8256 Signed-off-by: Peter Gubka --- csit/libraries/ChangeCounter.robot | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/csit/libraries/ChangeCounter.robot b/csit/libraries/ChangeCounter.robot index c2c7d116b5..2ea0be21dd 100644 --- a/csit/libraries/ChangeCounter.robot +++ b/csit/libraries/ChangeCounter.robot @@ -11,6 +11,7 @@ Documentation Robot keyword library (Resource) for common handling of data c ... This resource creates a "default" session using TemplatedRequests.Create_Default_Session ... which points to (an analogue of) http://${ODL_SYSTEM_IP}:${RESTCONFPORT} Library RequestsLibrary +Resource ${CURDIR}/CompareStream.robot Resource ${CURDIR}/ScalarClosures.robot Resource ${CURDIR}/TemplatedRequests.robot Resource ${CURDIR}/WaitUtils.robot @@ -30,10 +31,11 @@ Get_Change_Count [Documentation] GET data change request, assert status 200, return the value. ${response} = RequestsLibrary.Get_Request operational data-change-counter:data-change-counter BuiltIn.Should_Be_Equal ${response.status_code} ${200} Got status: ${response.status_code} and message: ${response.text} - # TODO: The following line can be insecure. Should we use regexp instead? - # TODO: beware of new releases (carbon ...) and mind if more counters are used - ${count} = BuiltIn.Run Keyword If "${ODL_STREAM}" in ["beryllium", "stable-lithium"] BuiltIn.Evaluate ${response.text}["data-change-counter"]["count"] - ... ELSE BuiltIn.Evaluate ${response.text}["data-change-counter"]["counter"][0]["count"] + # CompareStream.Set_Variable_If_At_Least_Else cannot be used direcly, because ${response.text}["data-change-counter"]["count"] would be + # evaluated before the stream comparison and it causes failures + ${at_least_boron}= CompareStream.Set_Variable_If_At_Least_Boron ${True} ${False} + ${count} = BuiltIn.Run Keyword If ${at_least_boron} BuiltIn.Evaluate ${response.text}["data-change-counter"]["counter"][0]["count"] + ... ELSE BuiltIn.Evaluate ${response.text}["data-change-counter"]["count"] [Return] ${count} Reconfigure_Topology_Name -- 2.36.6