Fix randomly failing test case for pnf refgstarte in xtetsting daily 96/110696/2
authorKrzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>
Wed, 29 Jul 2020 14:19:45 +0000 (16:19 +0200)
committerKrzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>
Wed, 29 Jul 2020 14:27:36 +0000 (14:27 +0000)
Issue-ID: INT-1668

Signed-off-by: Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>
Change-Id: If437d4c51e7b9d1cb33b8a584569e305fce67b12

robot/resources/test_templates/pnf_registration_without_SO_template.robot

index fd8aaed..5d0721d 100644 (file)
@@ -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}