From 915d18a3e8ca5bf014cb75c6aba65e8b42ad85fa Mon Sep 17 00:00:00 2001
From: Michele Carignani <michele.carignani@etsi.org>
Date: Mon, 15 Feb 2021 17:48:59 +0100
Subject: [PATCH] ProblemDetails optional on 4xx (fix #39)

---
 SRV/RNIS/RnisQuery_BI_BO.robot     | 16 ++++++++--------
 SRV/RNIS/environment/variables.txt |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/SRV/RNIS/RnisQuery_BI_BO.robot b/SRV/RNIS/RnisQuery_BI_BO.robot
index 9b0ede3..170bba2 100644
--- a/SRV/RNIS/RnisQuery_BI_BO.robot
+++ b/SRV/RNIS/RnisQuery_BI_BO.robot
@@ -18,7 +18,7 @@ Request RabInfo info using wrong parameters
     ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml#/definitions/RabInfo
     Get RabInfo info using wrong parameters
     Check HTTP Response Status Code Is    400
-    Check ProblemDetails    400
+    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_4xx} == 1    Check ProblemDetails    400
 
 
 Request RabInfo info using non existing cell id
@@ -28,7 +28,7 @@ Request RabInfo info using non existing cell id
     ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml#/definitions/RabInfo
     Get RabInfo info using non existing cell id
     Check HTTP Response Status Code Is    404
-    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_404} == 1    Check ProblemDetails    404
+    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_4xx} == 1    Check ProblemDetails    404
 
 Request Plmn info using wrong parameters
     [Documentation]   TC_MEC_SRV_RNIS_017_BR
@@ -37,7 +37,7 @@ Request Plmn info using wrong parameters
     ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml#/definitions/PlmnInfo
     Get PLMN info using wrong parameters
     Check HTTP Response Status Code Is    400
-    Check ProblemDetails    400
+    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_4xx} == 1    Check ProblemDetails    400
 
 
 Request Plmn info using non existing application id
@@ -47,7 +47,7 @@ Request Plmn info using non existing application id
     ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml#/definitions/PlmnInfo
     Get PLMN info using non existing application id
     Check HTTP Response Status Code Is    404
-    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_404} == 1    Check ProblemDetails    404
+    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_4xx} == 1    Check ProblemDetails    404
 
 
 Request S1Bearer info using wrong parameters
@@ -57,7 +57,7 @@ Request S1Bearer info using wrong parameters
     ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml#/definitions/S1BearerInfo
     Get S1Bearer info using wrong parameters
     Check HTTP Response Status Code Is    400
-    Check ProblemDetails    400
+    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_4xx} == 1    Check ProblemDetails    400
 
 
 Request S1Bearer info using non existing cell id
@@ -67,7 +67,7 @@ Request S1Bearer info using non existing cell id
     ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml#/definitions/S1BearerInfo
     Get S1Bearer info using non existing cell id
     Check HTTP Response Status Code Is    404
-    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_404} == 1    Check ProblemDetails    404
+    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_4xx} == 1    Check ProblemDetails    404
 
 
 Request L2Meas info using wrong parameters
@@ -77,7 +77,7 @@ Request L2Meas info using wrong parameters
     ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml#/definitions/S1BearerInfo
     Get L2Meas info using wrong parameters
     Check HTTP Response Status Code Is    400
-    Check ProblemDetails    400
+    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_4xx} == 1    Check ProblemDetails    400
 
 
 Request L2Meas info using non existing cell id
@@ -87,7 +87,7 @@ Request L2Meas info using non existing cell id
     ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml#/definitions/S1BearerInfo
     Get L2Meas info using non existing cell id
     Check HTTP Response Status Code Is    404
-    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_404} == 1    Check ProblemDetails    404
+    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_4xx} == 1    Check ProblemDetails    404
 
 *** Keywords ***
 Get RabInfo info using wrong parameters
diff --git a/SRV/RNIS/environment/variables.txt b/SRV/RNIS/environment/variables.txt
index da96f99..8853f8d 100644
--- a/SRV/RNIS/environment/variables.txt
+++ b/SRV/RNIS/environment/variables.txt
@@ -22,7 +22,7 @@ ${TOKEN}                            Basic YWxhZGRpbjpvcGVuc2VzYW1l
 ${apiRoot}      /example
 ${apiVersion}    v2
 
-${PIC_PROBLEM_DETAILS_ON_404}    0
+${PIC_PROBLEM_DETAILS_ON_4xx}    0
 
 # Notifications variables
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
-- 
GitLab