X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FCompareStream.robot;h=df880c42021868ee5358e9d3cb7f28f7ebb17599;hb=4588d5f6cd1ccfd6cd903f19d3082718d255aee5;hp=38f3f4f7288f6edeb0fcdcc209f2963c129d6e36;hpb=ee4496fb804ee8ce90ce0a5796ba9484e52bf37a;p=integration%2Ftest.git

diff --git a/csit/libraries/CompareStream.robot b/csit/libraries/CompareStream.robot
index 38f3f4f728..df880c4202 100644
--- a/csit/libraries/CompareStream.robot
+++ b/csit/libraries/CompareStream.robot
@@ -4,6 +4,8 @@ Documentation     This Resource contains list of Keywords Set_Variable_If_At_Lea
 ...               Run_Keyword_If_More_Than*, Run_Keyword_If_Less_Than*,
 ...               for comparison ${ODL_STREAM} to the given ${lower_bound},
 ...               in order to replace ad-hoc conditional execution in suites.
+Library           Collections
+Library           String
 
 *** Variables ***
 &{Stream_dict}    hydrogen=${1}    stable-helium=${2}    stable-lithium=${3}    beryllium=${4}    boron=${5}    carbon=${6}    nitrogen=${7}
@@ -81,24 +83,78 @@ Set_Variable_If_At_Most_Carbon
     ...    return ${value_if_false} otherwise.
     BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Most    carbon    ${value_if_true}    ${value_if_false}
 
+CompareStream__Convert_Input
+    [Arguments]    @{arguments}
+    [Documentation]    Splits arguments into args and kwargs is used in Run_Keyword_If_At_Least_Else and Run_Keyword_If_At_Most_Else.
+    ...    The problem is, when the string contains =, but it is not a named argument (name=value). There can be many values containing =, but
+    ...    for sure it is present in xmls. If the string starts with "<" it will be treated as it is xml and splitting for
+    ...    name and value will not be executed.
+    ...    If named argument is passed into this kw, only string data are supported e.g. name=string. Complex variables such as lists or dictionaries
+    ...    are not supported.
+    ${args}    BuiltIn.Create_List
+    ${kwargs}    BuiltIn.Create_Dictionary
+    : FOR    ${arg}    IN    @{arguments}
+    \    ${removed}    String.Remove_String    ${arg}    \n    ${Space}    \t
+    \    ...    \r
+    \    ${splitted}    BuiltIn.Run_Keyword_If    "${removed[0]}" == "<"    BuiltIn.Create List    ${arg}
+    \    ...    ELSE    String.Split_String    ${arg}    separator==    max_split=1
+    \    ${len}    BuiltIn.Get_Length    ${splitted}
+    \    Run Keyword If    ${len}==1    Collections.Append_To_List    ${args}    @{splitted}[0]
+    \    ...    ELSE    Collections.Set_To_Dictionary    ${kwargs}    @{splitted}
+    BuiltIn.Return_From_Keyword    ${args}    ${kwargs}
+
 Run_Keyword_If_At_Least
     [Arguments]    ${lower_bound}    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare ${lower_bound} to ${ODL_STREAM} and in case ${ODL_STREAM} is at least ${lower_bound},
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
     BuiltIn.Run_Keyword_And_Return_If    &{Stream_dict}[${ODL_STREAM}] >= &{Stream_dict}[${lower_bound}]    ${kw_name}    @{varargs}    &{kwargs}
 
+Run_Keyword_If_At_Least_Else
+    [Arguments]    ${lower_bound}    @{varargs}
+    [Documentation]    Compare ${lower_bound} to ${ODL_STREAM} and in case ${ODL_STREAM} is at least ${lower_bound},
+    ...    run keyword defined before ELSE statement otherwise run keyword defined after ELSE statement and return its value.
+    ${position}    Collections.Get_Index_From_List    ${varargs}    \ELSE
+    BuiltIn.Run_Keyword_If    "${position}" == "-1"    BuiltIn.Fail    Missing else statement in defined expresion
+    ${varargs_if}    Collections.Get_Slice_From_List    ${varargs}    0    ${position}
+    ${varargs_else}    Collections.Get_Slice_From_List    ${varargs}    ${position+1}
+    ${args_if}    ${kwargs_if}    CompareStream__Convert_Input    @{varargs_if}
+    ${args_else}    ${kwargs_else}    CompareStream__Convert_Input    @{varargs_else}
+    ${resp}    BuiltIn.Run_Keyword_If    &{Stream_dict}[${ODL_STREAM}] >= &{Stream_dict}[${lower_bound}]    @{args_if}    &{kwargs_if}
+    ...    ELSE    @{args_else}    &{kwargs_else}
+    [Return]    ${resp}
+
 Run_Keyword_If_At_Most
     [Arguments]    ${upper_bound}    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare ${upper_bound} to ${ODL_STREAM} and in case ${ODL_STREAM} is at most ${upper_bound},
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
     BuiltIn.Run_Keyword_And_Return_If    &{Stream_dict}[${ODL_STREAM}] <= &{Stream_dict}[${upper_bound}]    ${kw_name}    @{varargs}    &{kwargs}
 
+Run_Keyword_If_At_Most_Else
+    [Arguments]    ${upper_bound}    @{varargs}
+    [Documentation]    Compare ${upper_bound} to ${ODL_STREAM} and in case ${ODL_STREAM} is at most ${upper_bound},
+    ...    run keyword defined before ELSE statement otherwise run keyword defined after ELSE statement and return its value.
+    ${position}    Collections.Get_Index_From_List    ${varargs}    \ELSE
+    BuiltIn.Run_Keyword_If    "${position}" == "-1"    BuiltIn.Fail    Missing else statement in defined expresion
+    ${varargs_if}    Collections.Get_Slice_From_List    ${varargs}    0    ${position}
+    ${varargs_else}    Collections.Get_Slice_From_List    ${varargs}    ${position+1}
+    ${args_if}    ${kwargs_if}    CompareStream__Convert_Input    @{varargs_if}
+    ${args_else}    ${kwargs_else}    CompareStream__Convert_Input    @{varargs_else}
+    ${resp}    BuiltIn.Run_Keyword_If    &{Stream_dict}[${ODL_STREAM}] >= &{Stream_dict}[${lower_bound}]    @{args_if}    &{kwargs_if}
+    ...    ELSE    @{args_else}    &{kwargs_else}
+    [Return]    ${resp}
+
 Run_Keyword_If_More_Than
     [Arguments]    ${lower_bound}    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare ${lower_bound} to ${ODL_STREAM} and in case ${ODL_STREAM} is more than ${lower_bound},
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
     BuiltIn.Run_Keyword_And_Return_If    &{Stream_dict}[${ODL_STREAM}] > &{Stream_dict}[${lower_bound}]    ${kw_name}    @{varargs}    &{kwargs}
 
+Run_Keyword_If_Equals
+    [Arguments]    ${stream}    ${kw_name}    @{varargs}    &{kwargs}
+    [Documentation]    Compare ${stream} to ${ODL_STREAM} and in case ${ODL_STREAM} equals ${stream},
+    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
+    BuiltIn.Run_Keyword_And_Return_If    &{Stream_dict}[${ODL_STREAM}] == &{Stream_dict}[${stream}]    ${kw_name}    @{varargs}    &{kwargs}
+
 Run_Keyword_If_Less_Than
     [Arguments]    ${lower_bound}    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare ${lower_bound} to ${ODL_STREAM} and in case ${ODL_STREAM} is less than ${lower_bound},
@@ -109,118 +165,118 @@ Run_Keyword_If_At_Least_Helium
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare stable-helium to ${ODL_STREAM} and in case ${ODL_STREAM} is at least stable-helium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_At_Least    stable-helium    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Least    stable-helium    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_At_Least_Lithium
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare stable-lithium to ${ODL_STREAM} and in case ${ODL_STREAM} is at least stable-lithium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_At_Least    stable-lithium    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Least    stable-lithium    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_At_Least_Beryllium
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare beryllium to ${ODL_STREAM} and in case ${ODL_STREAM} is at least beryllium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_At_Least    beryllium    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Least    beryllium    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_At_Least_Boron
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare boron to ${ODL_STREAM} and in case ${ODL_STREAM} is at least boron,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_At_Least    boron    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Least    boron    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_At_Least_Carbon
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare carbon to ${ODL_STREAM} and in case ${ODL_STREAM} is at least carbon,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_At_Least    carbon    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Least    carbon    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_At_Most_Helium
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare stable-helium to ${ODL_STREAM} and in case ${ODL_STREAM} is at most stable-helium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_At_Most    stable-helium    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Most    stable-helium    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_At_Most_Lithium
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare stable-lithium to ${ODL_STREAM} and in case ${ODL_STREAM} is at most stable-lithium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_At_Most    stable-lithium    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Most    stable-lithium    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_At_Most_Beryllium
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare beryllium to ${ODL_STREAM} and in case ${ODL_STREAM} is at most beryllium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_At_Most    beryllium    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Most    beryllium    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_At_Most_Boron
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare boron to ${ODL_STREAM} and in case ${ODL_STREAM} is at most boron,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_At_Most    boron    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Most    boron    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_At_Most_Carbon
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare carbon to ${ODL_STREAM} and in case ${ODL_STREAM} is at most carbon,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_At_Most    carbon    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Most    carbon    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_More_Than_Helium
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare stable-helium to ${ODL_STREAM} and in case ${ODL_STREAM} is more than stable-helium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_More_Than    stable-helium    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_More_Than    stable-helium    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_Less_Than_Helium
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare stable-helium to ${ODL_STREAM} and in case ${ODL_STREAM} is less than stable-helium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_Less_Than    stable-helium    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_Less_Than    stable-helium    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_More_Than_Lithium
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare stable-lithium to ${ODL_STREAM} and in case ${ODL_STREAM} is more than stable-lithium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_More_Than    stable-lithium    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_More_Than    stable-lithium    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_Less_Than_Lithium
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare stable-lithium to ${ODL_STREAM} and in case ${ODL_STREAM} is less than stable-lithium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_Less_Than    stable-lithium    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_Less_Than    stable-lithium    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_More_Than_Beryllium
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare beryllium to ${ODL_STREAM} and in case ${ODL_STREAM} is more than beryllium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_More_Than    beryllium    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_More_Than    beryllium    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_Less_Than_Beryllium
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare beryllium to ${ODL_STREAM} and in case ${ODL_STREAM} is less than beryllium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_Less_Than    beryllium    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_Less_Than    beryllium    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_More_Than_Boron
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare boron to ${ODL_STREAM} and in case ${ODL_STREAM} is more than boron,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_More_Than    boron    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_More_Than    boron    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_Less_Than_Boron
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare boron to ${ODL_STREAM} and in case ${ODL_STREAM} is less than boron,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_Less_Than    boron    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_Less_Than    boron    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_More_Than_Carbon
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare carbon to ${ODL_STREAM} and in case ${ODL_STREAM} is more than carbon,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_More_Than    carbon    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_More_Than    carbon    ${kw_name}    @{varargs}    &{kwargs}
 
 Run_Keyword_If_Less_Than_Carbon
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     [Documentation]    Compare carbon to ${ODL_STREAM} and in case ${ODL_STREAM} is less than carbon,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    BuiltIn.Run_Keyword_And_Return_If    Run_Keyword_If_Less_Than    carbon    ${kw_name}    @{varargs}    &{kwargs}
+    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_Less_Than    carbon    ${kw_name}    @{varargs}    &{kwargs}