Make the pnf registration test cases independent from robot init - fixing failing...

Issue-ID: INT-1407

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

diff --git a/robot/resources/test_templates/pnf_orchestration_test_template.robot b/robot/resources/test_templates/pnf_orchestration_test_template.robot
index af0375d..332849e 100644 (file)
--- a/robot/resources/test_templates/pnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/pnf_orchestration_test_template.robot
@@ -21,7 +21,7 @@ Library               ONAPLibrary.Utilities
 Orchestrate PNF Macro Flow
     [Documentation]   Use ONAP to Orchestrate a PNF Macro service.
     [Arguments]   ${customer_name}    ${service}    ${product_family}    ${pnf_correlation_id}  ${tenant_id}    ${tenant_name}   ${service_model_type}   ${region}  ${project_name}=Project-Demonstration   ${owning_entity}=OE-Demonstration
-    ${lcp_region}=   Set Variable   ${GLOBAL_INJECTED_REGION}
+    ${lcp_region}=   Set Variable   ${region}
     ${uuid}=    Generate UUID4
     ${full_customer_name}=    Catenate    ${customer_name}_${uuid}
     ${service_name}=    Catenate    Service_Ete_Name${uuid}

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 5d38826..fa581b9 100644 (file)
--- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot
+++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
@@ -149,5 +149,4 @@ Send and verify VES integration request in SO and A&AI
 Instantiate PNF_macro service Teardown
     [Arguments]  ${catalog_service_id}    ${catalog_resource_ids}  ${PNF_entry_dict}  ${service_instance_id}  ${service_recipe_id}  ${building_block_flow}
     Teardown Models  ${catalog_service_id}    ${catalog_resource_ids}
-    Run Keyword If  "${building_block_flow}"=='false'  Delete Service Recipe  ${service_recipe_id}
     Cleanup PNF entry in A&AI  ${PNF_entry_dict}
\ No newline at end of file