diff --git a/SRV/RNIS/RnisQuery_BV.robot b/SRV/RNIS/RnisQuery_BV.robot
index 92a3b89917a628b30b8e438c83946bd90a949b2d..d06d26ec234f4109f8cde3c5a92c00599aad62c9 100644
--- a/SRV/RNIS/RnisQuery_BV.robot
+++ b/SRV/RNIS/RnisQuery_BV.robot
@@ -33,6 +33,18 @@ Request Plmn info
Check PlmnInfo ${response['body']['PlmnInfo']}
+Request S1Bearer info
+ [Documentation] TC_MEC_SRV_RNIS_017_OK
+ ... Check that the RNIS service returns the S1 bearer information
+ ... ETSI GS MEC 012 2.0.4, clause 7.4.3.1
+ ... Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml#/definitions/S1BearerInfo
+ Get S1Bearer info
+ Check HTTP Response Status Code Is 200
+ Check HTTP Response Body Json Schema Is RadioNetworkInformationAPI
+ #log ${response['body']}
+ Check S1BearerInfo ${response['body']['S1BearerInfo']}
+
+
*** Keywords ***
Get RabInfo info
Should Be True ${PIC_RNIS_SPECIFIC_SUBSCRIPTION} == 1
@@ -40,7 +52,7 @@ Get RabInfo info
Set Headers {"Content-Type":"application/json"}
Set Headers {"Authorization":"${TOKEN}"}
Set Headers {"Content-Length":"0"}
- Get /exampleAPI/rni/v2/queries?cell_id=${CELL_ID}
+ Get /exampleAPI/rni/v2/queries/rab_info?cell_id=${CELL_ID}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -50,6 +62,17 @@ Get Plmn info
Set Headers {"Content-Type":"application/json"}
Set Headers {"Authorization":"${TOKEN}"}
Set Headers {"Content-Length":"0"}
- Get /exampleAPI/rni/v2/queries?plmn_info=${APP_INS_ID}
+ Get /exampleAPI/rni/v2/queries/plmn_info?app_ins_id=${APP_INS_ID}
+ ${output}= Output response
+ Set Suite Variable ${response} ${output}
+
+
+Get S1Bearer info
+ Should Be True ${PIC_RNIS_SPECIFIC_SUBSCRIPTION} == 1
+ Set Headers {"Accept":"application/json"}
+ Set Headers {"Content-Type":"application/json"}
+ Set Headers {"Authorization":"${TOKEN}"}
+ Set Headers {"Content-Length":"0"}
+ Get /exampleAPI/rni/v2/queries/s1_bearer_info?cell_id=${CELL_ID}
${output}= Output response
Set Suite Variable ${response} ${output}
diff --git a/SRV/RNIS/resources/RadioNetworkInformationAPI.robot b/SRV/RNIS/resources/RadioNetworkInformationAPI.robot
index 90eb6c9f5b90709ce0527bbddf84ebbd73cacbbf..004d6405f4e916f46b80953bf44565eeccb04c50 100644
--- a/SRV/RNIS/resources/RadioNetworkInformationAPI.robot
+++ b/SRV/RNIS/resources/RadioNetworkInformationAPI.robot
@@ -23,16 +23,24 @@ Check CellChangeSubscription
Check RabInfo
[Arguments] ${received_value}
+ log ${received_value}
Should Be Equal ${received_value['appInsId']} ${APP_INS_ID}
Should Not Contain ${received_value['requestId']} ""
- Should Be Equal ${received_value['cellUserInfo']['ecgi']['cellId']} ${CELL_ID}
+ Should Be Equal ${received_value['cellUserInfo'][0]['ecgi']['cellId']} ${CELL_ID}
# TODO How to check the presence of a field
Check PlmnInfo
[Arguments] ${received_value}
+ log ${received_value}
Should Be Equal ${received_value['appInsId']} ${APP_INS_ID}
- Should Be Equal ${received_value['ecgi']['cellId']} ${CELL_ID}
- Should Not Contain ${received_value['ecgi']['plmn']['mcc']} ""
- Should Not Contain ${received_value['ecgi']['plmn']['mnc']} ""
+ Should Not Contain ${received_value['plmn'][0]['mcc']} ""
+ Should Not Contain ${received_value['plmn'][0]['mnc']} ""
+ # TODO How to check the presence of a field
+
+
+Check S1BearerInfo
+ [Arguments] ${received_value}
+ log ${received_value}
+ #Should Not Contain ${received_value['s1UeInfo'][0]['ecgi']['cellId']} ${CELL_ID}
# TODO How to check the presence of a field
diff --git a/SRV/RNIS/schemas/RadioNetworkInformationAPI.schema.json b/SRV/RNIS/schemas/RadioNetworkInformationAPI.schema.json
index 48e1753423d61e0c7ffea0c9a59ef54e08c032b5..f049d5ef1f601feb2ad17f7fb86ac2ef0aa2a16e 100644
--- a/SRV/RNIS/schemas/RadioNetworkInformationAPI.schema.json
+++ b/SRV/RNIS/schemas/RadioNetworkInformationAPI.schema.json
@@ -46,7 +46,7 @@
"type": "object",
"required": [
"appInsId",
- "ecgi"
+ "plmn"
],
"properties": {
"timeStamp": {
@@ -55,8 +55,11 @@
"appInsId": {
"$ref": "#/definitions/AppInsId"
},
- "ecgi": {
- "$ref": "#/definitions/Ecgi"
+ "plmn": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/Plmn"
+ }
}
}
},
@@ -104,7 +107,6 @@
"S1UeInfo": {
"type": "object",
"required": [
- "tempUeId",
"ecgi",
"s1BearerInfoDetailed"
],
@@ -140,13 +142,14 @@
"type": "object",
"required": [
"erabId",
- "s1EnbInfo"
+ "enbInfo",
+ "sGwInfo"
],
"properties": {
"erabId": {
"$ref": "#/definitions/ErabId"
},
- "s1EnbInfo": {
+ "enbInfo": {
"$ref": "#/definitions/S1EnbInfo"
},
"sGwInfo": {
@@ -314,11 +317,8 @@
}
},
"CellId": {
- "type": "array",
- "items": {
- "type": "string",
- "format": "binary"
- },
+ "type": "string",
+ "format": "binary",
"description": "The E-UTRAN Cell Identity as a bit string (size (28)), as defined in 3GPP TS 36.413",
"example": "0x800000A"
},
@@ -363,10 +363,9 @@
"example": "UE_IPV4_ADDRESS"
},
"value": {
- "type": "integer",
- "format": "int32",
+ "type": "string",
"description": "Value for the identifier",
- "example": 1
+ "example": "192.0.0.2"
}
}
},
@@ -376,8 +375,11 @@
"qci": {
"$ref": "#/definitions/Qci"
},
- "qci_information": {
- "$ref": "#/definitions/QosInformation"
+ "qosInformation": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/QosInformation"
+ }
}
}
},
diff --git a/TODO.md b/TODO.md
index 1ab5281588b822809d33e70c999a3c12bc9c5e1b..195417cef89f1d30fae199ad516d44c35cb05b68 100644
--- a/TODO.md
+++ b/TODO.md
@@ -24,9 +24,17 @@ This file provides the list of the TODOs related to the STF 569.
Draft ETSI GS MEC 012 2.0.4
https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BV.tplan2
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BV.tplan2
+https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BI_BO.tplan2
+https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisQuery_BV.tplan2
+https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisQuery_BI_BO.tplan2
- TC_MEC_SRV_RNIS_011_OK To be tested
+- TC_MEC_SRV_RNIS_012_OK To be tested
+- TC_MEC_SRV_RNIS_011_BR To be tested
+- TC_MEC_SRV_RNIS_012_BR To be tested
+- TC_MEC_SRV_RNIS_016_OK To be tested
+- TC_MEC_SRV_RNIS_017_OK To be tested
+- TC_MEC_SRV_RNIS_018_OK To be tested
### SAQ