SEBA-462 remove json.loads; fix status test
Change-Id: I1fe247855ead37b6c8a114675ad66095d08d124a
diff --git a/src/test/cord-api/Tests/XosScaleValidations/xos-remove-service.robot b/src/test/cord-api/Tests/XosScaleValidations/xos-remove-service.robot
index 2e5ec49..4864366 100644
--- a/src/test/cord-api/Tests/XosScaleValidations/xos-remove-service.robot
+++ b/src/test/cord-api/Tests/XosScaleValidations/xos-remove-service.robot
@@ -59,7 +59,7 @@
${data}= Create Dictionary name=${model_name} service_message=initial
${data}= Evaluate json.dumps(${data}) json
${resp}= CORD Post /xosapi/v1/simpleexampleservice/simpleexampleservices ${data}
- ${json_content}= Evaluate json.loads('''${resp.content}''') json
+ ${json_content}= To Json ${resp.content}
${model_id}= Get From Dictionary ${json_content} id
Set Suite Variable ${model_id}
Set Suite Variable ${model_name}
@@ -201,4 +201,4 @@
Should Be Equal As Strings ${resp.status_code} 200
${jsondata}= To Json ${resp.content}
# Verify it is in SUCCESS_NOTHING_CHANGED state
- Should Be Equal As Strings ${jsondata["status"]} 1
+ Should Be Equal As Strings ${jsondata["status"]} SUCCESS_NOTHING_CHANGED
diff --git a/src/test/cord-api/Tests/XosScaleValidations/xos-service-migrations.robot b/src/test/cord-api/Tests/XosScaleValidations/xos-service-migrations.robot
index e2031df..d5c89bd 100644
--- a/src/test/cord-api/Tests/XosScaleValidations/xos-service-migrations.robot
+++ b/src/test/cord-api/Tests/XosScaleValidations/xos-service-migrations.robot
@@ -44,7 +44,7 @@
${data}= Create Dictionary name=${model_name} service_message=initial
${data}= Evaluate json.dumps(${data}) json
${resp}= CORD Post /xosapi/v1/simpleexampleservice/simpleexampleservices ${data}
- ${json_content}= Evaluate json.loads('''${resp.content}''') json
+ ${json_content}= To Json ${resp.content}
${model_id}= Get From Dictionary ${json_content} id
Set Suite Variable ${model_id}
Set Suite Variable ${model_name}