diff options
Diffstat (limited to 'robot/resources/so')
| -rw-r--r-- | robot/resources/so/add_service_recipe.robot | 7 | ||||
| -rwxr-xr-x | robot/resources/so/direct_instantiate.robot | 21 |
2 files changed, 15 insertions, 13 deletions
diff --git a/robot/resources/so/add_service_recipe.robot b/robot/resources/so/add_service_recipe.robot index 1e342873..bf6b7c9c 100644 --- a/robot/resources/so/add_service_recipe.robot +++ b/robot/resources/so/add_service_recipe.robot @@ -43,9 +43,10 @@ Get First Free Service Recipe Id Log ${source data} ${serviceRecipes}= Set Variable ${source data['_embedded']['serviceRecipe']} ${ids}= Create List - :FOR ${recipe} IN @{serviceRecipes} - \ ${id}= Get From Dictionary ${recipe} id - \ Append To List ${ids} ${id} + FOR ${recipe} IN @{serviceRecipes} + ${id}= Get From Dictionary ${recipe} id + Append To List ${ids} ${id} + END Sort list ${ids} ${biggest_id}= Get From List ${ids} -1 Log Biggest id is ${biggest_id} first free is ${biggest_id+1} diff --git a/robot/resources/so/direct_instantiate.robot b/robot/resources/so/direct_instantiate.robot index 15f583ad..3a8c6e74 100755 --- a/robot/resources/so/direct_instantiate.robot +++ b/robot/resources/so/direct_instantiate.robot @@ -33,16 +33,17 @@ Instantiate Service Direct To SO ${template}= Create Dictionary @{keys}= Get Dictionary Keys ${preload_dict} ${parameters}= Get Globally Injected Parameters - :FOR ${key} IN @{keys} - \ ${value}= Get From Dictionary ${preload_dict} ${key} - \ ${tmp_value}= Set Variable If 'GLOBAL_' in $value ${value} - \ ${tmp_value}= Run Keyword If 'GLOBAL_' in $value Replace String ${tmp_value} \$ ${EMPTY} - \ ${tmp_value}= Run Keyword If 'GLOBAL_' in $value Replace String ${tmp_value} { ${EMPTY} - \ ${tmp_value}= Run Keyword If 'GLOBAL_' in $value Replace String ${tmp_value} } ${EMPTY} - \ ${value}= Set Variable If 'GLOBAL_' in $value ${parameters["${tmp_value}"]} ${value} - \ ${new_key}= Catenate \$ { ${key} } - \ ${new_key}= Evaluate '${new_key}'.replace(' ','') - \ Set To Dictionary ${template} ${new_key} ${value} + FOR ${key} IN @{keys} + ${value}= Get From Dictionary ${preload_dict} ${key} + ${tmp_value}= Set Variable If 'GLOBAL_' in $value ${value} + ${tmp_value}= Run Keyword If 'GLOBAL_' in $value Replace String ${tmp_value} \$ ${EMPTY} + ${tmp_value}= Run Keyword If 'GLOBAL_' in $value Replace String ${tmp_value} { ${EMPTY} + ${tmp_value}= Run Keyword If 'GLOBAL_' in $value Replace String ${tmp_value} } ${EMPTY} + ${value}= Set Variable If 'GLOBAL_' in $value ${parameters["${tmp_value}"]} ${value} + ${new_key}= Catenate \$ { ${key} } + ${new_key}= Evaluate '${new_key}'.replace(' ','') + Set To Dictionary ${template} ${new_key} ${value} + END ${tmp_key1}= Catenate \$ { ecompnet } ${tmp_key1}= Evaluate '${tmp_key1}'.replace(' ','') |