X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FPrefixCounting.robot;h=9465e41925e8e268f348fd0b43f241dbb28a2d7f;hb=HEAD;hp=1cdf80053af3d58ba1427e8f0866f7629aadeebe;hpb=a33b3319276f4b606f7966e178ec067cb6c30339;p=integration%2Ftest.git

diff --git a/csit/libraries/PrefixCounting.robot b/csit/libraries/PrefixCounting.robot
index 1cdf80053a..9465e41925 100644
--- a/csit/libraries/PrefixCounting.robot
+++ b/csit/libraries/PrefixCounting.robot
@@ -1,23 +1,29 @@
 *** Settings ***
-Documentation     Robot keyword library (Resource) for common BGP actions concerned with counting prefixes.
+Documentation       Robot keyword library (Resource) for common BGP actions concerned with counting prefixes.
 ...
-...               Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved.
+...                 Copyright (c) 2016 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
 ...
 ...
-...               Currently, all keywords count prefixes only in ${topology}.
-...               Prefix is identified by simplistic regular expression on JSON data.
+...                 Currently, all keywords count prefixes only in ${topology}.
+...                 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://<ip-addr>:${RESTCONFPORT}/${OPERATIONAL_API}
-...               or user has to provide a similar session.
-Library           RequestsLibrary
-Resource          ${CURDIR}/ShardStability.robot
-Resource          ${CURDIR}/WaitUtils.robot
-Resource          ${CURDIR}/ScalarClosures.robot
+...                 This resource assumes that RequestsLibrary has open a connection named "operational"
+...                 which points to (an analogue of) http://<ip-addr>:${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
@@ -25,54 +31,81 @@ PC_Setup
     WaitUtils.WU_Setup    # includes ScalarClosures.SC_Setup
 
 Get_Ipv4_Topology
-    [Arguments]    ${session}=operational    ${topology}=example-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}
-    Run_Keyword_If    ${response.status_code} != 200    Fail    Get on ${topology} returned status code ${response.status_code} with message: ${response.text}
-    [Return]    ${response.text}
+    [Arguments]    ${session}=operational    ${topology}=example-ipv4-topology
+    ${response} =    RequestsLibrary.GET On Session
+    ...    ${session}
+    ...    url=${PC_NW_TOPOLOGY}=${topology}?content=nonconfig
+    ...    expected_status=anything
+    IF    ${response.status_code} != 200
+        Fail    Get on ${topology} returned status code ${response.status_code} with message: ${response.text}
+    END
+    RETURN    ${response.text}
 
 Get_Ipv4_Topology_Count
-    [Arguments]    ${session}=operational    ${topology}=example-ipv4-topology
     [Documentation]    Get topology. If not fail, return number of prefixes in the topology.
+    [Arguments]    ${session}=operational    ${topology}=example-ipv4-topology
     ${topology} =    Get_Ipv4_Topology    session=${session}    topology=${topology}
     # Triple quotes are precaution against formatted output.
     ${prefix_count} =    Builtin.Evaluate    len(re.findall('"prefix":"', '''${topology}'''))    modules=re
-    [Return]    ${prefix_count}
+    RETURN    ${prefix_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}    http_timeout=125
+    [Arguments]    ${shards_list}    ${details_exp}    ${session}=operational    ${topology}=example-ipv4-topology
+    ${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.
     ${prefix_count} =    Builtin.Evaluate    len(re.findall('"prefix":"', '''${topology}'''))    modules=re
-    [Return]    ${prefix_count}
+    RETURN    ${prefix_count}
 
 Check_Ipv4_Topology_Count
-    [Arguments]    ${expected_count}    ${session}=operational    ${topology}=example-ipv4-topology
     [Documentation]    Check that the count of prefixes matches the expected count. Fails if it does not. In either case, collect garbage.
-    ${actual_count} =    ScalarClosures.Run_Keyword_And_Collect_Garbage    Get_Ipv4_Topology_Count    session=${session}    topology=${topology}
+    [Arguments]    ${expected_count}    ${session}=operational    ${topology}=example-ipv4-topology
+    ${actual_count} =    ScalarClosures.Run_Keyword_And_Collect_Garbage
+    ...    Get_Ipv4_Topology_Count
+    ...    session=${session}
+    ...    topology=${topology}
     BuiltIn.Should_Be_Equal_As_Strings    ${actual_count}    ${expected_count}
 
 Check_Ipv4_Topology_Is_Empty
-    [Arguments]    ${session}=operational    ${topology}=example-ipv4-topology
     [Documentation]    Example_Ipv4_Topology has to give status 200 with zero prefixes.
     ...
     ...    Functional suites should use a more strict Keyword which tests for the whole JSON structure.
+    [Arguments]    ${session}=operational    ${topology}=example-ipv4-topology
     Check_Ipv4_Topology_Count    0    session=${session}    topology=${topology}
 
 Wait_For_Ipv4_Topology_Prefixes_To_Become_Stable
+    [Documentation]    Each ${period} get prefix count. When called with shard list, the check is done before the count is get. After ${repetitions} of stable different from ${excluded_count} within ${timeout}, Return validator output. Fail early on getter error.
     [Arguments]    ${timeout}=60s    ${period}=5s    ${repetitions}=1    ${excluded_count}=-1    ${session}=operational    ${topology}=example-ipv4-topology
     ...    ${shards_list}=${EMPTY}    ${shards_details}=${EMPTY}
-    [Documentation]    Each ${period} get prefix count. When called with shard list, the check is done before the count is get. After ${repetitions} of stable different from ${excluded_count} within ${timeout}, Return validator output. Fail early on getter error.
     # This is very similar to ChangeCounter keyword, but attempt to extract common code would increase overall code size.
-    ${getter} =    BuiltIn.Run_Keyword_If    """${shards_list}"""=="""${EMPTY}"""    ScalarClosures.Closure_From_Keyword_And_Arguments    Get_Ipv4_Topology_Count    session=${session}    topology=${topology}
-    ...    ELSE    ScalarClosures.Closure_From_Keyword_And_Arguments    Get_Ipv4_Topology_Count_With_Shards_Check    ${shards_list}    ${shards_details}    session=${session}
-    ...    topology=${topology}
-    ${validator} =    ScalarClosures.Closure_From_Keyword_And_Arguments    WaitUtils.Excluding_Stability_Safe_Stateful_Validator_As_Keyword    state_holder    data_holder    excluded_value=${excluded_count}
-    ${result} =    WaitUtils.Wait_For_Getter_Error_Or_Safe_Stateful_Validator_Consecutive_Success    timeout=${timeout}    period=${period}    count=${repetitions}    getter=${getter}    safe_validator=${validator}
+    IF    """${shards_list}"""=="""${EMPTY}"""
+        ${getter} =    ScalarClosures.Closure_From_Keyword_And_Arguments
+        ...    Get_Ipv4_Topology_Count
+        ...    session=${session}
+        ...    topology=${topology}
+    ELSE
+        ${getter} =    ScalarClosures.Closure_From_Keyword_And_Arguments
+        ...    Get_Ipv4_Topology_Count_With_Shards_Check
+        ...    ${shards_list}
+        ...    ${shards_details}
+        ...    session=${session}
+        ...    topology=${topology}
+    END
+    ${validator} =    ScalarClosures.Closure_From_Keyword_And_Arguments
+    ...    WaitUtils.Excluding_Stability_Safe_Stateful_Validator_As_Keyword
+    ...    state_holder
+    ...    data_holder
+    ...    excluded_value=${excluded_count}
+    ${result} =    WaitUtils.Wait_For_Getter_Error_Or_Safe_Stateful_Validator_Consecutive_Success
+    ...    timeout=${timeout}
+    ...    period=${period}
+    ...    count=${repetitions}
+    ...    getter=${getter}
+    ...    safe_validator=${validator}
     ...    initial_state=${excluded_count}
-    [Return]    ${result}
+    RETURN    ${result}