diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-11-09 12:13:51 -0800 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-11-09 13:02:19 -0800 |
| commit | 2b8a20c2653864dd4fe90d16caa67e33201ccbe0 (patch) | |
| tree | 9782798fb62e3830258fd7e7e93f3b9b081bac3e /robot/resources/test_templates/vnf_orchestration_test_template.robot | |
| parent | a94b1d5512b72ac1d52e4c8ec9bc6be70d632858 (diff) | |
Get model-invariant-id from AAI for vFWCL
Change-Id: I6364bb71d9ec88e0e0bcb962b9d7531df09652c6
Issue-ID: INT-715
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'robot/resources/test_templates/vnf_orchestration_test_template.robot')
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 26d8eefe..e3c3b7f9 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -67,6 +67,7 @@ Orchestrate VNF Set Test Variable ${SERVICE_INSTANCE_ID} ${service_instance_id} Validate Service Instance ${service_instance_id} ${service} ${customer_name} ${vnflist}= Get From Dictionary ${GLOBAL_SERVICE_VNF_MAPPING} ${service} + ${generic_vnfs}= Create Dictionary :for ${vnf} in @{vnflist} \ ${vnf_name}= Catenate Ete_${vnf}_${uuid} \ ${vf_module_name}= Catenate Vfmodule_Ete_${vnf}_${uuid} @@ -77,13 +78,13 @@ Orchestrate VNF \ ${vf_module_type} ${closedloop_vf_module}= Preload Vnf ${service_instance_id} ${vnf_name} ${vnf_type} ${vf_module_name} ${vf_module} ${vnf} ${uuid} \ ${vf_module_id}= Create VID VNF module ${service_instance_id} ${vf_module_name} ${lcp_region} ${tenant} ${vf_module_type} ${CUSTOMER_NAME} ${vnf_name} \ ${generic_vnf}= Validate Generic VNF ${vnf_name} ${vnf_type} ${service_instance_id} - \ VLB Closed Loop Hack ${service} ${generic_vnf} ${closedloop_vf_module} + \ Set To Dictionary ${generic_vnfs} ${vf_module} ${generic_vnf} + \ Run Keyword If '${service}' == 'vLB' VLB Closed Loop Hack ${service} ${generic_vnf} ${closedloop_vf_module} \ Set Test Variable ${STACK_NAME} ${vf_module_name} - \ Append To List ${STACK_NAMES} ${STACK_NAME} # TODO: Need to look at a better way to default ipv4_oam_interface search for Heatbridge - \ Run Keyword and Ignore Error Execute Heatbridge ${vf_module_name} ${service_instance_id} ${vnf} ipv4_oam_interface - \ Run Keyword and Ignore Error Validate VF Module ${vf_module_name} ${vnf} - [Return] ${vf_module_name} ${service} + \ Execute Heatbridge ${vf_module_name} ${service_instance_id} ${vnf} ipv4_oam_interface + \ Validate VF Module ${vf_module_name} ${vnf} + [Return] ${vf_module_name} ${service} ${generic_vnfs} Orchestrate Demo VNF @@ -110,6 +111,7 @@ Orchestrate Demo VNF Set Test Variable ${SERVICE_INSTANCE_ID} ${service_instance_id} Validate Service Instance ${service_instance_id} ${service} ${customer_name} ${vnflist}= Get From Dictionary ${GLOBAL_SERVICE_VNF_MAPPING} ${service} + ${generic_vnfs}= Create Dictionary :for ${vnf} in @{vnflist} \ ${vnf_name}= Catenate Ete_${vnf}_${uuid} \ ${vf_module_name}= Catenate Vfmodule_Demo_${vnf}_${uuid} @@ -122,13 +124,13 @@ Orchestrate Demo VNF \ ${vf_module_type} ${closedloop_vf_module}= Preload Vnf ${service_instance_id} ${vnf_name} ${vnf_type} ${vf_module_name} ${vf_modules} ${vnf} ${uuid} \ ${vf_module_id}= Create VID VNF module ${service_instance_id} ${vf_module_name} ${lcp_region} ${tenant} ${vf_module_type} ${CUSTOMER_NAME} ${vnf_name} \ ${generic_vnf}= Validate Generic VNF ${vnf_name} ${vnf_type} ${service_instance_id} - \ VLB Closed Loop Hack ${service} ${generic_vnf} ${closedloop_vf_module} + \ Set To Dictionary ${generic_vnfs} ${vf_module} ${generic_vnf} + \ Run Keyword If '${service}' == 'vLB' VLB Closed Loop Hack ${service} ${generic_vnf} ${closedloop_vf_module} \ Set Test Variable ${STACK_NAME} ${vf_module_name} - \ Append To List ${STACK_NAMES} ${STACK_NAME} # TODO: Need to look at a better way to default ipv4_oam_interface search for Heatbridge - \ Run Keyword and Ignore Error Execute Heatbridge ${vf_module_name} ${service_instance_id} ${vnf} ipv4_oam_interface - \ Run Keyword and Ignore Error Validate VF Module ${vf_module_name} ${vnf} - [Return] ${vf_module_name} ${service} + \ Execute Heatbridge ${vf_module_name} ${service_instance_id} ${vnf} ipv4_oam_interface + \ Validate VF Module ${vf_module_name} ${vnf} + [Return] ${vf_module_name} ${service} ${generic_vnfs} Get VNF Type |