X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FChangeCounter.robot;h=55e23983f20b3183839e7300759fc907d9d049f6;hb=ae47f944cd8a56bcc40c9bcd0172a0e04a2c208b;hp=2f02fc74d43d6f45d25737f332d133f17ed599e2;hpb=b151662e97fd32fcd3336f947e7d2f22de58380e;p=integration%2Ftest.git

diff --git a/csit/libraries/ChangeCounter.robot b/csit/libraries/ChangeCounter.robot
index 2f02fc74d4..55e23983f2 100644
--- a/csit/libraries/ChangeCounter.robot
+++ b/csit/libraries/ChangeCounter.robot
@@ -1,52 +1,65 @@
 *** Settings ***
-Documentation     Robot keyword library (Resource) for common handling of data change counter.
+Documentation       Robot keyword library (Resource) for common handling of data change counter.
 ...
-...               Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+...                 Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
 ...
-...               This program and the accompanying materials are made available under the
-...               terms of the Eclipse Public License v1.0 which accompanies this distribution,
-...               and is available at http://www.eclipse.org/legal/epl-v10.html
+...                 This program and the accompanying materials are made available under the
+...                 terms of the Eclipse Public License v1.0 which accompanies this distribution,
+...                 and is available at http://www.eclipse.org/legal/epl-v10.html
 ...
 ...
-...               This resource assumes that RequestsLibrary has open a connection named "operational"
-...               which points to (an analogue of) http://${ODL_SYSTEM_IP}:${RESTCONFPORT}/${OPERATIONAL_API}
-Library           RequestsLibrary
-Resource          ${CURDIR}/ConfigViaRestconf.robot
-Resource          ${CURDIR}/ScalarClosures.robot
-Resource          ${CURDIR}/WaitUtils.robot
+...                 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
+
 
 *** Variables ***
-${CHANGE_COUNTER_TEMPLATE_FOLDER}    ${CURDIR}/../variables/bgpuser
+${CHANGE_COUNTER_TEMPLATE_FOLDER}       ${CURDIR}/../variables/bgpuser
+${CC_DATA_CHANGE_COUNTER_URL}           ${REST_API}/data-change-counter:data-change-counter?content=nonconfig
+
 
 *** Keywords ***
 CC_Setup
     [Documentation]    Initialize dependency libraries.
-    ConfigViaRestconf.Setup_Config_Via_Restconf
+    TemplatedRequests.Create_Default_Session
     WaitUtils.WU_Setup    # includes ScalarClosures.SC_Setup
     ${counter} =    ScalarClosures.Closure_From_Keyword_And_Arguments    Get_Change_Count
     BuiltIn.Set_Suite_Variable    ${ChangeCounter__getter}    ${counter}
 
 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"]
-    [Return]    ${count}
+    [Arguments]    ${session}=operational
+    ${response} =    RequestsLibrary.GET On Session    ${session}    url=${CC_DATA_CHANGE_COUNTER_URL}    expected_status=200
+    # 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
+    BuiltIn.Log    ${response.text}
+    ${count} =    BuiltIn.Evaluate
+    ...    json.loads('${response.text}')["data-change-counter:data-change-counter"]["counter"][0]["count"]
+    ...    modules=json
+    RETURN    ${count}
 
 Reconfigure_Topology_Name
-    [Arguments]    ${topology_name}=example-linkstate-topology
     [Documentation]    Configure data change counter to count transactions affecting
     ...    ${topology_name} instead of previously configured topology name.
-    ${template_as_string}=    BuiltIn.Set_Variable    {'TOPOLOGY_NAME': '${topology_name}'}
-    ConfigViaRestconf.Put_Xml_Template_Folder_Config_Via_Restconf    ${CHANGE_COUNTER_TEMPLATE_FOLDER}${/}change_counter    ${template_as_string}
+    [Arguments]    ${topology_name}=example-linkstate-topology
+    &{mapping} =    Create Dictionary    DEVICE_NAME=${DEVICE_NAME}    TOPOLOGY_NAME=${topology_name}
+    TemplatedRequests.Put_As_Xml_Templated    ${CHANGE_COUNTER_TEMPLATE_FOLDER}${/}change_counter    mapping=${mapping}
 
 Wait_For_Change_Count_To_Become_Stable
-    [Arguments]    ${timeout}=60s    ${period}=1s    ${repetitions}=4    ${count_to_overcome}=-1
     [Documentation]    Each ${period} get count. After ${repetitions} of constant value above ${count_to_overcome} within ${timeout}, Return validator output. Fail early on getter error.
-    ${validator} =    WaitUtils.Create_Limiting_Stability_Safe_Stateful_Validator_From_Value_To_Overcome    maximum_invalid=${count_to_overcome}
-    ${result} =    WaitUtils.Wait_For_Getter_Error_Or_Safe_Stateful_Validator_Consecutive_Success    timeout=${timeout}    period=${period}    count=${repetitions}    getter=${ChangeCounter__getter}    safe_validator=${validator}
+    [Arguments]    ${timeout}=60s    ${period}=1s    ${repetitions}=4    ${count_to_overcome}=-1
+    ${validator} =    WaitUtils.Create_Limiting_Stability_Safe_Stateful_Validator_From_Value_To_Overcome
+    ...    maximum_invalid=${count_to_overcome}
+    ${result} =    WaitUtils.Wait_For_Getter_Error_Or_Safe_Stateful_Validator_Consecutive_Success
+    ...    timeout=${timeout}
+    ...    period=${period}
+    ...    count=${repetitions}
+    ...    getter=${ChangeCounter__getter}
+    ...    safe_validator=${validator}
     ...    initial_state=${count_to_overcome}
-    [Return]    ${result}
+    RETURN    ${result}