Add module to the augmented node in the URL path

[integration/test.git] / csit / libraries / ChangeCounter.robot

diff --git a/csit/libraries/ChangeCounter.robot b/csit/libraries/ChangeCounter.robot
index 2ea0be21dd52e780e88d788159b7ef3664854150..f2a0b349644eb24e5e871ad04f51c66053cdd404 100644 (file)
--- a/csit/libraries/ChangeCounter.robot
+++ b/csit/libraries/ChangeCounter.robot
@@ -18,6 +18,7 @@ Resource          ${CURDIR}/WaitUtils.robot
 
 *** Variables ***
 ${CHANGE_COUNTER_TEMPLATE_FOLDER}    ${CURDIR}/../variables/bgpuser
+${CC_DATA_CHANGE_COUNTER_URL}    /restconf/operational/data-change-counter:data-change-counter
 
 *** Keywords ***
 CC_Setup
@@ -28,14 +29,14 @@ CC_Setup
     BuiltIn.Set_Suite_Variable    ${ChangeCounter__getter}    ${counter}
 
 Get_Change_Count
+    [Arguments]    ${session}=operational
     [Documentation]    GET data change request, assert status 200, return the value.
-    ${response} =    RequestsLibrary.Get_Request    operational    data-change-counter:data-change-counter
+    ${response} =    RequestsLibrary.Get_Request    ${session}    ${CC_DATA_CHANGE_COUNTER_URL}
     BuiltIn.Should_Be_Equal    ${response.status_code}    ${200}    Got status: ${response.status_code} and message: ${response.text}
     # 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"]
+    BuiltIn.Log    ${response.text}
+    ${count} =    BuiltIn.Evaluate    json.loads('${response.text}')["data-change-counter"]["counter"][0]["count"]    modules=json
     [Return]    ${count}
 
 Reconfigure_Topology_Name