diff options
Diffstat (limited to 'robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot')
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot index 1ab5852c..61abb433 100644 --- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot @@ -70,16 +70,17 @@ Orchestrate VNF With CDS ${vnfs}= Get From Dictionary ${jsondata['topology_template']} node_templates ${keys}= Get Dictionary Keys ${vnfs} Templating.Create Environment cds ${GLOBAL_TEMPLATE_FOLDER} - :FOR ${key} IN @{keys} - \ ${vnf}= Get From Dictionary ${vnfs} ${key} - \ Get VNF Info ${key} ${vnf} ${dict} - \ ${vf_modules}= Get From Dictionary ${jsondata['topology_template']} groups - \ ${value}= Evaluate "${key}".replace("-","").replace(" ","") - \ ${value}= Convert To Lowercase ${value} - \ ${vfmodules}= Get VFModule Info ${jsondata} ${value} ${dict} - \ Set To Dictionary ${dict} vf_modules=${vfmodules} - \ ${vnf_payload}= Templating.Apply Template cds ${vnf_template_name} ${dict} - \ ${data}= Catenate [${vnf_payload}] + FOR ${key} IN @{keys} + ${vnf}= Get From Dictionary ${vnfs} ${key} + Get VNF Info ${key} ${vnf} ${dict} + ${vf_modules}= Get From Dictionary ${jsondata['topology_template']} groups + ${value}= Evaluate "${key}".replace("-","").replace(" ","") + ${value}= Convert To Lowercase ${value} + ${vfmodules}= Get VFModule Info ${jsondata} ${value} ${dict} + Set To Dictionary ${dict} vf_modules=${vfmodules} + ${vnf_payload}= Templating.Apply Template cds ${vnf_template_name} ${dict} + ${data}= Catenate [${vnf_payload}] + END Set To Dictionary ${dict} vnfs=${data} ${request}= Templating.Apply Template cds ${so_request_template} ${dict} @@ -117,13 +118,14 @@ Get VFModule Info ${data}= Catenate ${delim}= Catenate Templating.Create Environment cds ${GLOBAL_TEMPLATE_FOLDER} - :FOR ${key} IN @{keys} - \ ${module}= Get From Dictionary ${vfModules} ${key} - \ Log ${vnf} ${key} - \ Run keyword if "${vnf}" in "${key}" set vfmodule param ${key} ${module} ${dict} - \ ${vfmodule_payload}= Templating.Apply Template cds ${vfmodule_template_name} ${dict} - \ ${data}= Catenate ${data} ${delim} ${vfmodule_payload} - \ ${delim}= Catenate , + FOR ${key} IN @{keys} + ${module}= Get From Dictionary ${vfModules} ${key} + Log ${vnf} ${key} + Run keyword if "${vnf}" in "${key}" set vfmodule param ${key} ${module} ${dict} + ${vfmodule_payload}= Templating.Apply Template cds ${vfmodule_template_name} ${dict} + ${data}= Catenate ${data} ${delim} ${vfmodule_payload} + ${delim}= Catenate , + END Log ${data} [Return] ${data} |