diff options
Diffstat (limited to 'robot/resources')
| -rw-r--r-- | robot/resources/sdngc_interface.robot | 3 | ||||
| -rw-r--r-- | robot/resources/so/direct_instantiate.robot | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/robot/resources/sdngc_interface.robot b/robot/resources/sdngc_interface.robot index 779611e3..ff85c69d 100644 --- a/robot/resources/sdngc_interface.robot +++ b/robot/resources/sdngc_interface.robot @@ -157,8 +157,7 @@ Get Template Parameters ${ecompnet}= Evaluate (${GLOBAL_BUILD_NUMBER}%128)+128 - # Initialize the value map with the properties generated from the Robot VM /opt/config folder - ${valuemap}= Copy Dictionary ${GLOBAL_INJECTED_PROPERTIES} + ${valuemap}= Get Globally Injected Parameters # These should be deprecated by the above.... Set To Dictionary ${valuemap} artifacts_version=${GLOBAL_INJECTED_ARTIFACTS_VERSION} diff --git a/robot/resources/so/direct_instantiate.robot b/robot/resources/so/direct_instantiate.robot index 0c74d5f6..31deab96 100644 --- a/robot/resources/so/direct_instantiate.robot +++ b/robot/resources/so/direct_instantiate.robot @@ -6,7 +6,8 @@ Library Collections Library String Library DateTime Library SoUtils -Library ONAPLibrary.PreloadData +Library ONAPLibrary.PreloadData +Library ONAPLibrary.Utilities Resource ../global_properties.robot *** Keywords *** @@ -19,13 +20,14 @@ Instantiate Service Direct To SO ${preload_dict}= Get Default Preload Data preload ${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 ${GLOBAL_INJECTED_PROPERTIES["${tmp_value}"]} ${value} + \ ${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} |