From 1140cf46a98c366057ccdc6b6bf8ea3e40d1c458 Mon Sep 17 00:00:00 2001 From: "ananth.y" Date: Fri, 29 Mar 2019 18:58:44 +0900 Subject: [PATCH] Fix validations HTTP error Change-Id: I13862722892767fa2be2ab57cb4caf21de8537f2 Signed-off-by: ananth.y --- csit/libraries/CompareStream.robot | 14 ++++++++++++++ .../012__sfc_service_paths_validation.robot | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/csit/libraries/CompareStream.robot b/csit/libraries/CompareStream.robot index e390feb41f..aaa283ee53 100644 --- a/csit/libraries/CompareStream.robot +++ b/csit/libraries/CompareStream.robot @@ -156,6 +156,20 @@ Run_Keyword_If_Equals ... 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_Equals_Else + [Arguments] ${stream} @{varargs} + [Documentation] Compare ${stream} to ${ODL_STREAM} and in case ${ODL_STREAM} equals ${stream}, + ... 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}[${stream}] @{args_if} &{kwargs_if} + ... ELSE @{args_else} &{kwargs_else} + [Return] ${resp} + 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}, diff --git a/csit/suites/sfc/Full_Deploy/012__sfc_service_paths_validation.robot b/csit/suites/sfc/Full_Deploy/012__sfc_service_paths_validation.robot index 2b7a3aa7cf..e2486fc2a0 100644 --- a/csit/suites/sfc/Full_Deploy/012__sfc_service_paths_validation.robot +++ b/csit/suites/sfc/Full_Deploy/012__sfc_service_paths_validation.robot @@ -17,7 +17,7 @@ Resource ../../../variables/sfc/Variables.robot *** Test Cases *** Add Service Function Path referencing a non-existing SF [Documentation] Add Service Function Paths from JSON file - CompareStream.Run_Keyword_If_At_Least_Else neon Add Elements To URI From File And Check Validation Error ${SERVICE_FUNCTION_PATHS_URI} ${SERVICE_FUNCTION_PATHS_WITH_HOP_FILE} + CompareStream.Run_Keyword_If_Equals_Else neon Add Elements To URI From File And Check Validation Error ${SERVICE_FUNCTION_PATHS_URI} ${SERVICE_FUNCTION_PATHS_WITH_HOP_FILE} ... ELSE Add Elements To URI From File And Check Server Error ${SERVICE_FUNCTION_PATHS_URI} ${SERVICE_FUNCTION_PATHS_WITH_HOP_FILE} ${body} OperatingSystem.Get File ${SERVICE_FUNCTION_PATHS_WITH_HOP_FILE} ${jsonbody} To Json ${body} @@ -28,7 +28,7 @@ Add Service Function Path referencing a non-existing SF Add Service Function Path referencing a non-existing SFC [Documentation] Add Service Function Paths from JSON file Add Elements To URI From File ${SERVICE_FUNCTIONS_URI} ${SERVICE_FUNCTIONS_FILE} - CompareStream.Run_Keyword_If_At_Least_Else neon Add Elements To URI From File And Check Validation Error ${SERVICE_FUNCTION_PATHS_URI} ${SERVICE_FUNCTION_PATHS_WITH_HOP_FILE} + CompareStream.Run_Keyword_If_Equals_Else neon Add Elements To URI From File And Check Validation Error ${SERVICE_FUNCTION_PATHS_URI} ${SERVICE_FUNCTION_PATHS_WITH_HOP_FILE} ... ELSE Add Elements To URI From File And Check Server Error ${SERVICE_FUNCTION_PATHS_URI} ${SERVICE_FUNCTION_PATHS_WITH_HOP_FILE} ${body} OperatingSystem.Get File ${SERVICE_FUNCTION_PATHS_WITH_HOP_FILE} ${jsonbody} To Json ${body} -- 2.36.6