summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--robot/resources/test_templates/vnf_orchestration_test_template.robot9
-rw-r--r--robot/resources/vid/create_vid_vnf.robot2
-rw-r--r--[-rwxr-xr-x]robot/testsuites/demo.robot0
-rw-r--r--robot/testsuites/vnf-orchestration.robot6
4 files changed, 10 insertions, 7 deletions
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index 4f0c2dc8..e72211c8 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -51,7 +51,7 @@ Orchestrate VNF
Setup Browser
Login To VID GUI
${service_instance_id}= Wait Until Keyword Succeeds 300s 5s Create VID Service Instance ${customer_name} ${service_model_type} ${service} ${service_name} ${project_name} ${owning_entity}
- Validate Service Instance ${service_instance_id} ${service} ${customer_name}
+ Wait Until Keyword Succeeds 60s 20s Validate Service Instance ${service_instance_id} ${service} ${customer_name}
ServiceMapping.Set Directory default ${GLOBAL_SERVICE_MAPPING_DIRECTORY}
${vnflist}= ServiceMapping.Get Service Vnf Mapping default ${service}
${generic_vnfs}= Create Dictionary
@@ -92,11 +92,12 @@ Orchestrate Demo VNF
${service_name}= Catenate Service_Ete_Name${uuid}
${service_type}= Set Variable ${service}
${vnf_json_resources}= Get SDC Demo Vnf Catalog Resource ${service_model_type}
+ ${server_id}= Run Keyword If '${service}' == 'vVG' Create VVG Server ${uuid}
Create Customer For VNF ${full_customer_name} ${full_customer_name} INFRA ${service_type} ${GLOBAL_AAI_CLOUD_OWNER} ${tenant_id}
Setup Browser
Login To VID GUI
- ${service_instance_id}= Wait Until Keyword Succeeds 300s 5s Create VID Service Instance ${customer_name} ${service_model_type} ${service} ${service_name} ${project_name} ${owning_entity}
- Validate Service Instance ${service_instance_id} ${service} ${customer_name}
+ ${service_instance_id}= Wait Until Keyword Succeeds 300s 5s Create VID Service Instance ${full_customer_name} ${service_model_type} ${service} ${service_name} ${project_name} ${owning_entity}
+ Wait Until Keyword Succeeds 120s 15s Validate Service Instance ${service_instance_id} ${service} ${full_customer_name}
ServiceMapping.Set Directory default ${GLOBAL_SERVICE_MAPPING_DIRECTORY}
${vnflist}= ServiceMapping.Get Service Vnf Mapping default ${service}
${generic_vnfs}= Create Dictionary
@@ -108,7 +109,7 @@ Orchestrate Demo VNF
\ 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}
+ \ ${vf_module_type} ${closedloop_vf_module}= Preload Vnf ${service_instance_id} ${vnf_name} ${vnf_type} ${vf_module_name} ${vf_modules} ${vnf} ${uuid} ${service} ${server_id}
\ ${vf_module_id}= Create VID VNF module ${service_instance_id} ${vf_module_name} ${lcp_region} ${tenant_name} ${vf_module_type} ${full_customer_name} ${vnf_name}
\ ${generic_vnf}= Validate Generic VNF ${vnf_name} ${vnf_type} ${service_instance_id}
\ Set To Dictionary ${generic_vnfs} ${vf_module_type} ${generic_vnf}
diff --git a/robot/resources/vid/create_vid_vnf.robot b/robot/resources/vid/create_vid_vnf.robot
index 5f35b292..2180387b 100644
--- a/robot/resources/vid/create_vid_vnf.robot
+++ b/robot/resources/vid/create_vid_vnf.robot
@@ -25,7 +25,9 @@ Create VID VNF
Click Element xpath=//a[contains(text(), 'View/Edit')]
Wait Until Page Contains View/Edit Service Instance timeout=${GLOBAL_VID_UI_TIMEOUT_MEDIUM}
# in slower environment the background load of data from AAI takes time so that the button is not populated yet
+ Wait Until Page Contains Add node instance timeout=${GLOBAL_VID_UI_TIMEOUT_MEDIUM}
Click On Button When Enabled //button[contains(text(),'Add node instance')]
+ Wait Until Page Contains ${vnf_type} timeout=${GLOBAL_VID_UI_TIMEOUT_MEDIUM}
#01681d02-2304-4c91-ab2d 0
# This is where firefox breaks. Th elink never becomes visible when run with the script.
${dataTestsId}= Catenate AddVNFOption-${vnf_type}
diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot
index c2a0b3e2..c2a0b3e2 100755..100644
--- a/robot/testsuites/demo.robot
+++ b/robot/testsuites/demo.robot
diff --git a/robot/testsuites/vnf-orchestration.robot b/robot/testsuites/vnf-orchestration.robot
index 5e254b85..3e550313 100644
--- a/robot/testsuites/vnf-orchestration.robot
+++ b/robot/testsuites/vnf-orchestration.robot
@@ -8,11 +8,11 @@ Test Template Orchestrate VNF Template
*** Test Cases *** CUSTOMER SERVICE PRODUCT_FAMILY
Instantiate Virtual DNS ETE_Customer vLB vLB
- [Tags] instantiate stability72hr
+ [Tags] instantiate stability72hr stability72hrvLB
Instantiate Virtual Volume Group ETE_Customer vVG vVG
- [Tags] instantiate stability72hr
+ [Tags] instantiate stability72hr stability72hrvVG
Instantiate Virtual FirewallCL ETE_Customer vFWCL vFWCL
- [Tags] instantiate stability72hr
+ [Tags] instantiate stability72hr stability72hrvFWCL
Instantiate Virtual DNS No Delete ETE_Customer vLB vLB KEEP
[Tags] instantiateNoDelete
Instantiate Virtual FirewallCL No Delete ETE_Customer vFWCL vFWCL KEEP