ROBOT test cases correction due to failing test case

Issue-ID: INT-1348

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

2 files changed, 10 insertions, 5 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 34f6b5c6..e8725986 100644
--- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot
+++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
@@ -109,7 +109,7 @@ Check SO service completition status
     Should Be Equal As Strings  ${so_status}     ${so_expected_status}
 
 
-Design, create, instantiate PNF/macro service and succesfully registrate PNF template
+Instantiate PNF_macro service and succesfully registrate PNF template
     [Documentation]   Test case template for design, create, instantiate PNF/macro service and succesfully registrate PNF
     [Arguments]    ${service_name}   ${PNF_entry_dict}   ${pnf_correlation_id}   ${service}=pNF    ${product_family}=gNB
 
@@ -128,7 +128,12 @@ Design, create, instantiate PNF/macro service and succesfully registrate PNF tem
     ...    ELSE  Log To Console   Check Service Recipe for TOSCA Based PNF Model assignmenta
     ${tenant_id}    ${tenant_name}=    Setup Orchestrate VNF    ${GLOBAL_AAI_CLOUD_OWNER}    SharedNode    OwnerType    v1    CloudZone
     ${service}  ${request_id}  ${full_customer_name}   Orchestrate PNF   ETE_Customer    ${service}    ${product_family}  ${pnf_correlation_id}  ${tenant_id}   ${tenant_name}  ${service_name}
+    Wait Until Keyword Succeeds   120s  40s  Send and verify VES integration request in SO and A&AI   ${request_id}   ${PNF_entry_dict}
+
+
+Send and verify VES integration request in SO and A&AI
+    [Documentation]   Gets service status and compares with expected status
+    [Arguments]    ${request_id}   ${PNF_entry_dict}
     Send VES integration request  ${PNF_entry_dict}
     Verify PNF Integration Request in A&AI  ${PNF_entry_dict}
-    Wait Until Keyword Succeeds   30s  5s  Check SO service completition status   ${request_id}   COMPLETE
-    ${auth}=	Create List  ${GLOBAL_SO_USERNAME}    ${GLOBAL_SO_PASSWORD}
+    Wait Until Keyword Succeeds   30s  10s  Check SO service completition status   ${request_id}   COMPLETE
\ No newline at end of file
diff --git a/robot/testsuites/pnf-registration.robot b/robot/testsuites/pnf-registration.robot
index 6217ed52..8fd0d824 100644
--- a/robot/testsuites/pnf-registration.robot
+++ b/robot/testsuites/pnf-registration.robot
@@ -23,7 +23,7 @@ PNF Registration only DCAE part: AAI, VES, PRH, DMaaP
 
 
 
-Design, create, instantiate PNF/macro service and succesfully registrate PNF
+Instantiate PNF_macro service and succesfully registrate PNF
      [Documentation]
      ...  This test case creates TOSCA csar software package for PNF. Imports it as VSP package.
      ...  Cretaes PNF resource, cretaes Macro service, attach PNF resource and distributes it.
@@ -35,4 +35,4 @@ Design, create, instantiate PNF/macro service and succesfully registrate PNF
      [Tags]   pnf_registrate   ete
      ${pnf_correlation_id}=    Generate Random String  20  [LETTERS][NUMBERS]
      ${PNF_entry_dict}=  Create Dictionary  correlation_id=${pnf_correlation_id}  PNF_IPv4_address=13.13.13.13  PNF_IPv6_address=2001:0db8:0:0:0:0:1428:57ab
-     Design, create, instantiate PNF/macro service and succesfully registrate PNF template   Demo_pNF   ${PNF_entry_dict}   ${pnf_correlation_id}
\ No newline at end of file
+     Instantiate PNF_macro service and succesfully registrate PNF template   Demo_pNF   ${PNF_entry_dict}   ${pnf_correlation_id}
\ No newline at end of file