diff options
| author |   DR695H <dr695h@att.com> | 2019-07-30 17:25:33 -0400 |
|---|---|---|
| committer | DR695H <dr695h@att.com> | 2019-07-31 15:27:35 -0400 |
| commit | 70861af6430f2bf04917e2e08925f85774668417 (patch) | |
| tree | 8e3a54fc9091d634c0a73d0540722e10bcfb9996 /robot/resources/test_templates | |
| parent | e9bd8e9d0f2bc7f54440fcf899b0a8fb00a47b77 (diff) | |
add vnf and service to vnf orch
Issue-ID: TEST-174
Change-Id: If58e3fb7c3d9ddb86a0dd29bc2412b91d4bf3fed
Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/resources/test_templates')
| -rw-r--r-- | robot/resources/test_templates/model_test_template.robot | 2 | ||||
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/robot/resources/test_templates/model_test_template.robot b/robot/resources/test_templates/model_test_template.robot index 8ba9349e..8cfecc25 100644 --- a/robot/resources/test_templates/model_test_template.robot +++ b/robot/resources/test_templates/model_test_template.robot @@ -14,7 +14,7 @@ ${SDC_ZIP_DIRECTORY} ${SDC_ASSETS_DIRECTORY}/temp *** Keywords *** Model Distribution For Directory With Teardown - [Arguments] ${service} ${catalog_service_name}= ${cds}= + [Arguments] ${service} ${catalog_service_name}= ${cds}=None ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resources} ${catalog_resource_ids} ${catalog_service_id}= Model Distribution For Directory ${service} ${catalog_service_name} ${cds} [Teardown] Teardown Models ${catalog_service_id} ${catalog_resource_ids} diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 190f64ac..8842b408 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -66,7 +66,7 @@ Orchestrate VNF \ ${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} - \ ${vf_module_type} ${closedloop_vf_module}= Preload Vnf ${service_instance_id} ${vnf_name} ${vnf_type} ${vf_module_name} ${vf_module} ${vnf} ${uuid} + \ ${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} \ Set To Dictionary ${generic_vnfs} ${vf_module_type} ${generic_vnf} @@ -108,7 +108,7 @@ Orchestrate Demo VNF \ 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} \ ${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} + \ ${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_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} |