Merge "SO CSIT failing due to invalid syntax"

diff --combined tests/so/etsi/etsi_tests.robot
index 684034b,d418608..6aebd13
--- 1/tests/so/etsi/etsi_tests.robot
--- 2/tests/so/etsi/etsi_tests.robot
+++ b/tests/so/etsi/etsi_tests.robot
@@@ -30,16 -30,17 +30,17 @@@ Invoke Service Instantiatio
      SET GLOBAL VARIABLE       ${service_instance_Id}
      ${actual_request_state}=    Set Variable    ""
  
-     : FOR    ${INDEX}    IN RANGE    ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
-     \   ${orchestration_status_request}=   Get Request  api_handler_session   /onap/so/infra/orchestrationRequests/v7/${request_ID}
-     \   Run Keyword If  '${orchestration_status_request.status_code}' == '200'  log to console   \nexecuted with expected result
-     \   log to console      ${orchestration_status_request.content}
-     \   ${orchestration_json_response}=    Evaluate     json.loads(r"""${orchestration_status_request.content}""", strict=False)    json
-     \   ${actual_request_state}=     SET VARIABLE       ${orchestration_json_response}[request][requestStatus][requestState]
-     \   Log To Console    Received actual repsonse status:${actual_request_state}
-     \   RUN KEYWORD IF   '${actual_request_state}' == 'COMPLETE' or '${actual_request_state}' == 'FAILED'      Exit For Loop
-     \   log to console  Will try again after ${SLEEP_INTERVAL_SEC} seconds
-     \   SLEEP   ${SLEEP_INTERVAL_SEC}s
+     FOR    ${INDEX}    IN RANGE    ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
+        ${orchestration_status_request}=   Get Request  api_handler_session   /onap/so/infra/orchestrationRequests/v7/${request_ID}
+        Run Keyword If  '${orchestration_status_request.status_code}' == '200'  log to console   \nexecuted with expected result
+        log to console      ${orchestration_status_request.content}
+        ${orchestration_json_response}=    Evaluate     json.loads(r"""${orchestration_status_request.content}""", strict=False)    json
+        ${actual_request_state}=     SET VARIABLE       ${orchestration_json_response}[request][requestStatus][requestState]
+        Log To Console    Received actual repsonse status:${actual_request_state}
+        RUN KEYWORD IF   '${actual_request_state}' == 'COMPLETE' or '${actual_request_state}' == 'FAILED'      Exit For Loop
+        log to console  Will try again after ${SLEEP_INTERVAL_SEC} seconds
+        SLEEP   ${SLEEP_INTERVAL_SEC}s
+     END
  
      Log To Console     final repsonse status received: ${actual_request_state}
      Run Keyword If  '${actual_request_state}' == 'COMPLETE'  log to console   \nexecuted with expected result
@@@ -63,21 -64,31 +64,22 @@@ Invoke VNF Instantiatio
      ${vnf_instance_Id}=     Set Variable       ${vnf_instantiate_json_response}[requestReferences][instanceId]
      SET GLOBAL VARIABLE       ${vnf_instance_Id}
  
-     : FOR    ${INDEX}    IN RANGE    ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
-     \   ${orchestration_status_request}=   Get Request  api_handler_session   /onap/so/infra/orchestrationRequests/v7/${request_ID}
-     \   Run Keyword If  '${orchestration_status_request.status_code}' == '200'  log to console   \nexecuted with expected result
-     \   Log To Console      ${orchestration_status_request.content}
-     \   ${orchestration_json_response}=    Evaluate     json.loads(r"""${orchestration_status_request.content}""", strict=False)    json
-     \   ${actual_request_state}=     SET VARIABLE       ${orchestration_json_response}[request][requestStatus][requestState]
-     \   RUN KEYWORD IF   '${actual_request_state}' == 'COMPLETE' or '${actual_request_state}' == 'FAILED'      Exit For Loop
-     \   Log To Console  Will try again after ${SLEEP_INTERVAL_SEC} seconds
-     \   SLEEP   ${SLEEP_INTERVAL_SEC}s
+     FOR    ${INDEX}    IN RANGE    ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
+        ${orchestration_status_request}=   Get Request  api_handler_session   /onap/so/infra/orchestrationRequests/v7/${request_ID}
+        Run Keyword If  '${orchestration_status_request.status_code}' == '200'  log to console   \nexecuted with expected result
+        Log To Console      ${orchestration_status_request.content}
+        ${orchestration_json_response}=    Evaluate     json.loads(r"""${orchestration_status_request.content}""", strict=False)    json
+        ${actual_request_state}=     SET VARIABLE       ${orchestration_json_response}[request][requestStatus][requestState]
+        RUN KEYWORD IF   '${actual_request_state}' == 'COMPLETE' or '${actual_request_state}' == 'FAILED'      Exit For Loop
+        Log To Console  Will try again after ${SLEEP_INTERVAL_SEC} seconds
+        SLEEP   ${SLEEP_INTERVAL_SEC}s
+     END
  
      ${service_instance_Id}=     SET VARIABLE       ${orchestration_json_response}[request][instanceReferences][serviceInstanceId]
      Log To Console     final repsonse status received: ${actual_request_state}
      Run Keyword If  '${actual_request_state}' == 'COMPLETE'  log to console   \nexecuted with expected result
      Should Be Equal As Strings    '${actual_request_state}'    'COMPLETE'
  
 -Invoke VNF Notification for SOL002
 -    Create Session    ve-vnfm-adapter-session    http://${REPO_IP}:9098
 -    ${data}=    Get Binary File    ${CURDIR}${/}data${/}notification.json
 -    &{headers}=    Create Dictionary    Content-Type=application/json    Accept=application/json    Authorization=Basic YWRtaW46YTRiM2MyZDE=
 -    ${notification_request}=    Post Request    ve-vnfm-adapter-session    /lcm/v1/vnf/instances/notifications    data=${data}    headers=${headers}
 -    Log To Console    ${notification_request}
 -    Run Keyword If    '${notification_request.status_code}' == '200'    Log To Console    \nexecuted with expected result
 -    Should Be Equal As Strings    '${notification_request.status_code}'    '200'
 -
  Delete VNF Instance
      Run Keyword If      "${vnf_instance_Id}" != "${EMPTY}"      Log to Console    VNF Instance ID :${vnf_instance_Id} received
      ...                ELSE      Fail           Log to Console  Invalid VNF Instance ID :${vnf_instance_Id} recieved
@@@ -93,15 -104,16 +95,16 @@@
      ${request_ID}=          Set Variable         ${vnf_delete_json_response}[requestReferences][requestId]
      ${actual_request_state}=    Set Variable    ""
  
-     : FOR    ${INDEX}    IN RANGE    ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
-     \   ${orchestration_status_request}=   Get Request  api_handler_session   /onap/so/infra/orchestrationRequests/v7/${request_ID}
-     \   Run Keyword If  '${orchestration_status_request.status_code}' == '200'  log to console   \nexecuted with expected result
-     \   Log To Console      ${orchestration_status_request.content}
-     \   ${orchestration_json_response}=    Evaluate     json.loads(r"""${orchestration_status_request.content}""")    json
-     \   ${actual_request_state}=     SET VARIABLE       ${orchestration_json_response}[request][requestStatus][requestState]
-     \   RUN KEYWORD IF   '${actual_request_state}' == 'COMPLETE' or '${actual_request_state}' == 'FAILED'      Exit For Loop
-     \   Log To Console  Will try again after ${SLEEP_INTERVAL_SEC} seconds
-     \   SLEEP   ${SLEEP_INTERVAL_SEC}s
+     FOR    ${INDEX}    IN RANGE    ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
+        ${orchestration_status_request}=   Get Request  api_handler_session   /onap/so/infra/orchestrationRequests/v7/${request_ID}
+        Run Keyword If  '${orchestration_status_request.status_code}' == '200'  log to console   \nexecuted with expected result
+        Log To Console      ${orchestration_status_request.content}
+        ${orchestration_json_response}=    Evaluate     json.loads(r"""${orchestration_status_request.content}""")    json
+        ${actual_request_state}=     SET VARIABLE       ${orchestration_json_response}[request][requestStatus][requestState]
+        RUN KEYWORD IF   '${actual_request_state}' == 'COMPLETE' or '${actual_request_state}' == 'FAILED'      Exit For Loop
+        Log To Console  Will try again after ${SLEEP_INTERVAL_SEC} seconds
+        SLEEP   ${SLEEP_INTERVAL_SEC}s
+     END
  
      Log To Console     final repsonse status received: ${actual_request_state}
      Run Keyword If  '${actual_request_state}' == 'COMPLETE'  log to console   \nexecuted with expected result
@@@ -121,15 -133,16 +124,16 @@@ Delete Service Instanc
      ${request_ID}=          Set Variable         ${service_delete_json_response}[requestReferences][requestId]
      ${actual_request_state}=    Set Variable    ""
  
-     : FOR    ${INDEX}    IN RANGE    ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
-     \   ${orchestration_status_request}=   Get Request  api_handler_session   /onap/so/infra/orchestrationRequests/v7/${request_ID}
-     \   Run Keyword If  '${orchestration_status_request.status_code}' == '200'  log to console   \nexecuted with expected result
-     \   Log To Console      ${orchestration_status_request.content}
-     \   ${orchestration_json_response}=    Evaluate     json.loads(r"""${orchestration_status_request.content}""")    json
-     \   ${actual_request_state}=     SET VARIABLE       ${orchestration_json_response}[request][requestStatus][requestState]
-     \   RUN KEYWORD IF   '${actual_request_state}' == 'COMPLETE' or '${actual_request_state}' == 'FAILED'      Exit For Loop
-     \   Log To Console  Will try again after ${SLEEP_INTERVAL_SEC} seconds
-     \   SLEEP   ${SLEEP_INTERVAL_SEC}s
+     FOR    ${INDEX}    IN RANGE    ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
+        ${orchestration_status_request}=   Get Request  api_handler_session   /onap/so/infra/orchestrationRequests/v7/${request_ID}
+        Run Keyword If  '${orchestration_status_request.status_code}' == '200'  log to console   \nexecuted with expected result
+        Log To Console      ${orchestration_status_request.content}
+        ${orchestration_json_response}=    Evaluate     json.loads(r"""${orchestration_status_request.content}""")    json
+        ${actual_request_state}=     SET VARIABLE       ${orchestration_json_response}[request][requestStatus][requestState]
+        RUN KEYWORD IF   '${actual_request_state}' == 'COMPLETE' or '${actual_request_state}' == 'FAILED'      Exit For Loop
+        Log To Console  Will try again after ${SLEEP_INTERVAL_SEC} seconds
+        SLEEP   ${SLEEP_INTERVAL_SEC}s
+     END
  
      Log To Console     final repsonse status received: ${actual_request_state}
      Run Keyword If  '${actual_request_state}' == 'COMPLETE'  log to console   \nexecuted with expected result