Run CSIT Tests on Latest Images 1.5.2
Change-Id: I126c97ea9b05cb3a38f40d84e945fab6a2a7a522
Issue-ID: SO-2296
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
diff --git a/tests/so/etsi/etsi_tests.robot b/tests/so/etsi/etsi_tests.robot
index bfa2331..5a38eee 100644
--- a/tests/so/etsi/etsi_tests.robot
+++ b/tests/so/etsi/etsi_tests.robot
@@ -24,7 +24,7 @@
${service_instantiation_request}= Post Request api_handler_session /onap/so/infra/serviceInstantiation/v7/serviceInstances data=${data} headers=${headers}
Run Keyword If '${service_instantiation_request.status_code}' == '200' log to console \nexecuted with expected result
log to console ${service_instantiation_request.content}
- ${service_instantiation_json_response}= Evaluate json.loads("""${service_instantiation_request.content}""") json
+ ${service_instantiation_json_response}= Evaluate json.loads("""${service_instantiation_request.content}""", strict=False) json
${request_ID}= Set Variable ${service_instantiation_json_response}[requestReferences][requestId]
${service_instance_Id}= Set Variable ${service_instantiation_json_response}[requestReferences][instanceId]
SET GLOBAL VARIABLE ${service_instance_Id}
@@ -34,7 +34,7 @@
\ ${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("""${orchestration_status_request.content}""") json
+ \ ${orchestration_json_response}= Evaluate json.loads("""${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
@@ -51,14 +51,15 @@
Create Session api_handler_session http://${REPO_IP}:8080
${data}= Get Binary File ${CURDIR}${/}data${/}vnfInstantiationRequest.json
- ${vnf_instantiate_request_json}= evaluate json.loads('''${data}''') json
+ ${vnf_instantiate_request_json}= evaluate json.loads('''${data}''', strict=False) json
set to dictionary ${vnf_instantiate_request_json}[requestDetails][relatedInstanceList][0][relatedInstance] instanceId=${service_instance_Id}
${vnf_instantiate_request_string}= evaluate json.dumps(${vnf_instantiate_request_json}) json
&{headers}= Create Dictionary Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== Content-Type=application/json Accept=application/json
${vnf_instantiate_request}= Post Request api_handler_session /onap/so/infra/serviceInstantiation/v7/serviceInstances/${service_instance_Id}/vnfs data=${vnf_instantiate_request_string} headers=${headers}
Run Keyword If '${vnf_instantiate_request.status_code}' == '200' log to console \nexecuted with expected result
- ${vnf_instantiate_json_response}= Evaluate json.loads("""${vnf_instantiate_request.content}""") json
+ ${vnf_instantiate_json_response}= Evaluate json.loads("""${vnf_instantiate_request.content}""", strict=False) json
+
${request_ID}= Set Variable ${vnf_instantiate_json_response}[requestReferences][requestId]
${actual_request_state}= SET VARIABLE ""
@@ -66,7 +67,7 @@
\ ${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("""${orchestration_status_request.content}""") json
+ \ ${orchestration_json_response}= Evaluate json.loads("""${orchestration_status_request.content}""", strict=False) json
\ ${actual_request_state}= SET VARIABLE ${orchestration_json_response}[request][requestStatus][requestState]
\ ${service_instance_Id}= SET VARIABLE ${orchestration_json_response}[request][instanceReferences][serviceInstanceId]
\ RUN KEYWORD IF '${actual_request_state}' == 'COMPLETE' or '${actual_request_state}' == 'FAILED' Exit For Loop
@@ -75,4 +76,4 @@
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'
\ No newline at end of file
+ Should Be Equal As Strings '${actual_request_state}' 'COMPLETE'