Fix randomly failing test case for pnf refgstartefrankfurt

Issue-ID: INT-1668

Signed-off-by: Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>
Change-Id: I746acb7c5631332339b59da88af6ccf042b58f85
(cherry picked from commit b229b9ce98b3244f07dafb694e946264be6bf214)

2 files changed, 7 insertions, 7 deletions

diff --git a/robot/resources/aai/create_customer.robot b/robot/resources/aai/create_customer.robot
index f5e73d36..c51048c9 100644
--- a/robot/resources/aai/create_customer.robot
+++ b/robot/resources/aai/create_customer.robot
@@ -41,6 +41,7 @@ Get OwningEntity Id
     ${resp}=    AAI.Run Get Request    ${AAI_FRONTEND_ENDPOINT}    /aai/v11/business/owning-entities   auth=${GLOBAL_AAI_AUTHENTICATION}
   	${resp_json}=  Set Variable  ${resp.json()}
     @{list}=  Copy List   ${resp_json['owning-entity']}
+    ${id}=  Set Variable
     :FOR   ${map}    IN    @{list}
     \    ${owning_entity_name}=       Get From Dictionary    ${map}    owning-entity-name
     \    ${owning_entity_id}=       Get From Dictionary    ${map}    owning-entity-id
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 5d0721d8..fd8aaed1 100644
--- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot
+++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
@@ -129,13 +129,12 @@ 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}
-    ${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}
+    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}
     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}