aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>2020-07-29 16:19:45 +0200
committerAndreas Geissler <andreas-geissler@telekom.de>2020-08-05 13:53:57 +0000
commit651ac1302c2851b13757cbda4af507985f884d8c (patch)
tree16f8f1ed7f7ba6dab822fc6b491a6c829b22fde6
parent82b5782507d084926fcec62fd8af9666dda8f3d9 (diff)
Fix randomly failing test case for pnf refgstarte in xtetsting daily6.0.1-ONAP
Issue-ID: INT-1668 Signed-off-by: Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com> Change-Id: If437d4c51e7b9d1cb33b8a584569e305fce67b12 (cherry picked from commit a25702ee472d1b081827c80df78840ef6417c1fc)
-rw-r--r--robot/resources/test_templates/pnf_registration_without_SO_template.robot13
1 files changed, 7 insertions, 6 deletions
diff --git a/robot/resources/test_templates/pnf_registration_without_SO_template.robot b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
index fd8aaed1..5d0721d8 100644
--- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot
+++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
@@ -129,12 +129,13 @@ Instantiate PNF_macro service and succesfully registrate PNF template
${UUID}= Get Service Model Parameter from SDC Service Catalog ${service_name} uuid
${service_recipe_id}= Run Keyword If "${building_block_flow}"=='false' Add Service Recipe ${UUID} mso/async/services/CreateVcpeResCustService_simplified
Inventory Tenant If Not Exists CloudOwner ${region} SharedNode OwnerType v1 CloudZone ${tenant_id} ${tenant_name}
- Load OwningEntity project Project-${customer_name}
- Load OwningEntity owningEntity OE-${customer_name}
- Load OwningEntity lineOfBusiness LOB-${customer_name}
- Load OwningEntity platform Platform-${customer_name}
- ${service_instance_id} ${request_id} ${full_customer_name} Run Keyword If "${building_block_flow}"=='false' Orchestrate PNF Macro Flow ${customer_name} ${service} ${product_family} ${pnf_correlation_id} ${tenant_id} ${tenant_name} ${service_name} ${region} Project-${customer_name} OE-${customer_name}
- ... ELSE Orchestrate PNF Building Block Flow ${catalog_service_name} ${customer_name} ${service} ${product_family} ${pnf_correlation_id} ${region} project_name=Project-${customer_name} owning_entity=OE-${customer_name} lineOfBusinessName=LOB-${customer_name} platformName=Platform-${customer_name}
+ ${oe_uuid}= Generate UUID4
+ Load OwningEntity project Project-${customer_name}-${oe_uuid}
+ Load OwningEntity owningEntity OE-${customer_name}-${oe_uuid}
+ Load OwningEntity lineOfBusiness LOB-${customer_name}-${oe_uuid}
+ Load OwningEntity platform Platform-${customer_name}-${oe_uuid}
+ ${service_instance_id} ${request_id} ${full_customer_name} Run Keyword If "${building_block_flow}"=='false' Orchestrate PNF Macro Flow ${customer_name} ${service} ${product_family} ${pnf_correlation_id} ${tenant_id} ${tenant_name} ${service_name} ${region} Project-${customer_name}-${oe_uuid} OE-${customer_name}-${oe_uuid}
+ ... ELSE Orchestrate PNF Building Block Flow ${catalog_service_name} ${customer_name} ${service} ${product_family} ${pnf_correlation_id} ${region} project_name=Project-${customer_name}-${oe_uuid} owning_entity=OE-${customer_name}-${oe_uuid} lineOfBusinessName=LOB-${customer_name}-${oe_uuid} platformName=Platform-${customer_name}-${oe_uuid}
Wait Until Keyword Succeeds 180s 40s Send and verify VES integration request in SO and A&AI ${request_id} ${PNF_entry_dict}
Run Keyword If "${building_block_flow}"=='true' Check PNF orchestration status in A&AI ${pnf_correlation_id} Active
[Teardown] Instantiate PNF_macro service Teardown ${catalog_service_id} ${catalog_resource_ids} ${PNF_entry_dict}