diff options
| author |   bdfreeman1421 <bf1936@att.com> | 2019-09-17 07:16:14 -0400 |
|---|---|---|
| committer | bdfreeman1421 <bf1936@att.com> | 2019-09-17 07:16:20 -0400 |
| commit | 6d269fdcbcf374a273f7ac0b68559951ea336654 (patch) | |
| tree | da8bc8e3584d4c7dfaf3d82f10aae2548a1e08c7 | |
| parent | b721c30484849bed5e2aa4af73d4fb8f8f7cdb56 (diff) | |
Fix Create VID VNF
Issue-ID: INT-1263
Change-Id: I1d53494704811871f508ba6e0b3006ca63ccb396
Signed-off-by: bdfreeman1421 <bf1936@att.com>
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 4 | ||||
| -rw-r--r-- | robot/resources/vid/create_vid_vnf.robot | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index ef9593c2..b7f3e975 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -65,7 +65,7 @@ Orchestrate VNF \ ${vnf_name_index}= Evaluate ${vnf_name_index} + 1 \ ${vnf_type}= Get VNF Type ${catalog_resources} ${vnf} ${service} \ ${vf_module}= Get VF Module ${catalog_resources} ${vnf} ${service} - \ Wait Until Keyword Succeeds 300s 5s Create VID VNF ${service_instance_id} ${vnf_name} ${product_family} ${lcp_region} ${tenant_name} ${vnf_type} ${customer_name} + \ Create VID VNF ${service_instance_id} ${vnf_name} ${product_family} ${lcp_region} ${tenant_name} ${vnf_type} ${customer_name} \ ${vf_module_type} ${closedloop_vf_module}= Preload Vnf ${service_instance_id} ${vnf_name} ${vnf_type} ${vf_module_name} ${vf_module} ${vnf} ${uuid} ${service} \ ${vf_module_id}= Create VID VNF module ${service_instance_id} ${vf_module_name} ${lcp_region} ${tenant_name} ${vf_module_type} ${customer_name} ${vnf_name} \ ${generic_vnf}= Validate Generic VNF ${vnf_name} ${vnf_type} ${service_instance_id} @@ -105,7 +105,7 @@ Orchestrate Demo VNF \ ${vf_module_name}= Catenate Vfmodule_Demo_${vnf}_${uuid} \ ${vnf_type}= Set Variable ${vnf_json_resources['${vnf}']['vnf_type']} \ ${vf_module}= Set Variable ${vnf_json_resources['${vnf}']['vf_module']} - \ Wait Until Keyword Succeeds 300s 5s Create VID VNF ${service_instance_id} ${vnf_name} ${product_family} ${lcp_region} ${tenant_name} ${vnf_type} ${full_customer_name} + \ Create VID VNF ${service_instance_id} ${vnf_name} ${product_family} ${lcp_region} ${tenant_name} ${vnf_type} ${full_customer_name} \ ${vf_module_entry}= Create Dictionary name=${vf_module} \ ${vf_modules}= Create List ${vf_module_entry} \ ${vf_module_type} ${closedloop_vf_module}= Preload Vnf ${service_instance_id} ${vnf_name} ${vnf_type} ${vf_module_name} ${vf_modules} ${vnf} ${uuid} ${service} diff --git a/robot/resources/vid/create_vid_vnf.robot b/robot/resources/vid/create_vid_vnf.robot index 7fc497d3..5f35b292 100644 --- a/robot/resources/vid/create_vid_vnf.robot +++ b/robot/resources/vid/create_vid_vnf.robot @@ -50,7 +50,8 @@ Create VID VNF Should Not Contain ${response text} FAILED Click On Button When Enabled //button[contains(text(),'Close')] ${instance_id}= Parse Instance Id ${response text} - Wait Until Page Contains ${service_instance_name} ${GLOBAL_VID_UI_TIMEOUT_MEDIUM} + # sometimes the page refreshes - a reload is required on timeout but next step for VF Module does that + Run Keyword And Ignore Error Wait Until Page Contains ${service_instance_name} ${GLOBAL_VID_UI_TIMEOUT_LONG} [Return] ${instance_id} Delete VID VNF |