Commit e3c32662 authored by YannGarcia's avatar YannGarcia

Add RnisNotifications tests for RAB

parent 493d2b37
......@@ -23,8 +23,21 @@ 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/RnisAllSubscription_BV.tplan2
https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisAllubscription_BI_BO.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_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
https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisNotifications.tplan2
- TC_MEC_SRV_RNIS_001_OK <font color="color:green">To be tested</font>
- TC_MEC_SRV_RNIS_002_OK <font color="color:green">To be tested</font>
- TC_MEC_SRV_RNIS_003_OK <font color="color:green">To be tested</font>
- TC_MEC_SRV_RNIS_004_OK <font color="color:green">To be tested</font>
- TC_MEC_SRV_RNIS_011_OK <font color="color:green">To be tested</font>
......
......@@ -223,6 +223,18 @@ int json_codec::decode (const OCTETSTRING& p_data, LibItsHttp__JsonMessageBodyTy
RnisAPI__TypesAndValues::PlmnInfo plmn_info;
plmn_info.decode(RnisAPI__TypesAndValues::PlmnInfo_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);
msg.plmnInfo() = plmn_info;
} else if (it->second.find("\"RabEstSubscription\"") != std::string::npos) {
RnisAPI__TypesAndValues::RabEstSubscription rab_est_subscription;
rab_est_subscription.decode(RnisAPI__TypesAndValues::RabEstSubscription_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);
msg.rabEstSubscription() = rab_est_subscription;
} else if (it->second.find("\"RabModSubscription\"") != std::string::npos) {
RnisAPI__TypesAndValues::RabModSubscription rab_mod_subscription;
rab_mod_subscription.decode(RnisAPI__TypesAndValues::RabModSubscription_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);
msg.rabModSubscription() = rab_mod_subscription;
} else if (it->second.find("\"RabRelSubscription\"") != std::string::npos) {
RnisAPI__TypesAndValues::RabRelSubscription rab_rel_subscription;
rab_rel_subscription.decode(RnisAPI__TypesAndValues::RabRelSubscription_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);
msg.rabRelSubscription() = rab_rel_subscription;
} else if (it->second.find("\"bwInfo\"") != std::string::npos) {
BwManagementAPI__TypesAndValues::BwInfo bw_info;
......
......@@ -121,7 +121,13 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_019_NF
AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_001_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_002_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_003_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_004_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_005_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_006_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_007_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_008_OK
#AtsMec_AppEnablementAPI_TestCases.TC_MEC_SRV_TRANS_001_OK
#AtsMec_AppEnablementAPI_TestCases.TC_MEC_SRV_TRAF_001_OK
......
This diff is collapsed.
......@@ -92,6 +92,9 @@ module AtsMec_TestControl {
}
if (PICS_RNIS_NOTIFICATIONS) {
execute(TC_MEC_SRV_RNIS_001_OK());
execute(TC_MEC_SRV_RNIS_002_OK());
execute(TC_MEC_SRV_RNIS_003_OK());
execute(TC_MEC_SRV_RNIS_004_OK());
}
}
......
LibIts @ fa803fc7
Subproject commit 1e93108a94eaa6f95f5b508194bd0632c11f1a1b
Subproject commit fa803fc714e8896de7ce12d0ecec822b5e8949dc
......@@ -3,9 +3,6 @@ module RnisAPI_Pixits {
// JSON
import from JSON all;
// LibCommon
import from LibCommon_BasicTypesAndValues all;
// LibMec/Rnis
import from RnisAPI_TypesAndValues all;
......@@ -16,6 +13,8 @@ module RnisAPI_Pixits {
modulepar Link PX_LINKS_SELF := { self_ := "http://example.com/exampleAPI/rni/v2/subscriptions" };
modulepar charstring PX_CALLBACK_URI := "/";
modulepar CallbackReference PX_CALLBACK_REFERENCE := "http://meAppClient.example.com/rni/v2/notifications/cell_change/77777";
modulepar JSON.String PX_ASSOCIATE_ID_VALUE := "192.0.0.2";
......@@ -31,5 +30,10 @@ module RnisAPI_Pixits {
modulepar AppInsId PX_APP_ID := "19";
modulepar AppInsId PX_NOT_EXISTENT_APP_INS_ID := "99";
modulepar ErabId PX_E_RAB_ID := 0;
modulepar Qci PX_QCI := 0;
} // End of module RnisAPI_Pixits
......@@ -76,7 +76,7 @@ module RnisAPI_TypesAndValues {
type record S1UeInfo_ {
TempUeId tempUeId optional,
AssociateId associateId optional,
Ecgis ecgi,
Ecgi ecgi,
S1BearerInfoDetailed s1BearerInfoDetailed
}
type record of S1UeInfo_ S1UeInfo;
......@@ -167,11 +167,11 @@ module RnisAPI_TypesAndValues {
* @member ecgi
* @member cellId
*/
type record Ecgi {
type record Ecgi_ {
Plmn plmn,
CellId cellId
}
type record of Ecgi Ecgis;
type record of Ecgi_ Ecgi;
/**
* @desc E-UTRAN CelI Global Identifier as defined in 3GPP TS 36.413
......@@ -339,9 +339,11 @@ module RnisAPI_TypesAndValues {
* @member filterCriteria
*/
type record RabEstSubscription {
SubscriptionType subscriptionType,
CallbackReference callbackReference,
Link links,
FilterCriteriaAssocQci filterCriteria
FilterCriteriaAssocQci filterCriteria,
TimeStamp expiryDeadline optional
} with {
variant (links) "name as '_links'";
}
......@@ -370,6 +372,7 @@ module RnisAPI_TypesAndValues {
* @member expiryDeadline
*/
type record RabModSubscription {
SubscriptionType subscriptionType,
CallbackReference callbackReference,
Link links,
FilterCriteriaAssocQci filterCriteria,
......@@ -398,6 +401,7 @@ module RnisAPI_TypesAndValues {
* @member expiryDeadline
*/
type record RabRelSubscription {
SubscriptionType subscriptionType,
CallbackReference callbackReference,
Link links,
FilterCriteriaAssocQci filterCriteria,
......@@ -580,9 +584,8 @@ module RnisAPI_TypesAndValues {
*/
type record FilterCriteriaAssocQci {
AppInsId appInsId,
AssociateId associateId,
Plmn plmn,
CellId cellId,
ErabId erabId,
Ecgi ecgi,
Qci qci
}
......
......@@ -35,6 +35,9 @@ module LibItsHttp_JsonMessageBodyTypes {
RabInfo rabInfo,
PlmnInfo plmnInfo,
S1BearerInfo s1BearerInfo,
RabEstSubscription rabEstSubscription,
RabModSubscription rabModSubscription,
RabRelSubscription rabRelSubscription,
RnisAPI_TypesAndValues.ProblemDetails problemDetails_rnis,
BwInfo bwInfo,
BwManagementAPI_TypesAndValues.ProblemDetails problemDetails_bw_management,
......
......@@ -268,6 +268,42 @@ group ams_api {
s1BearerInfo := p_s1BearerInfo
} // End of template mw_body_json_s1_bearer_info
template (value) JsonBody m_body_json_rab_est_subscription(
in template (value) RabEstSubscription p_rabEstSubscription
) := {
rabEstSubscription := p_rabEstSubscription
} // End of template m_body_json_rab_est_subscription
template (present) JsonBody mw_body_json_rab_est_subscription(
template (present) RabEstSubscription p_rabEstSubscription := ?
) := {
rabEstSubscription := p_rabEstSubscription
} // End of template mw_body_json_rab_est_subscription
template (value) JsonBody m_body_json_rab_mod_subscription(
in template (value) RabModSubscription p_rabModSubscription
) := {
rabModSubscription := p_rabModSubscription
} // End of template m_body_json_rab_mod_subscription
template (present) JsonBody mw_body_json_rab_mod_subscription(
template (present) RabModSubscription p_rabModSubscription := ?
) := {
rabModSubscription := p_rabModSubscription
} // End of template mw_body_json_rab_mod_subscription
template (value) JsonBody m_body_json_rab_rel_subscription(
in template (value) RabRelSubscription p_rabRelSubscription
) := {
rabRelSubscription := p_rabRelSubscription
} // End of template m_body_json_rab_rel_subscription
template (present) JsonBody mw_body_json_rab_rel_subscription(
template (present) RabRelSubscription p_rabRelSubscription := ?
) := {
rabRelSubscription := p_rabRelSubscription
} // End of template mw_body_json_rab_rel_subscription
template (value) JsonBody m_body_json_rni_problem_details(
in template (value) RnisAPI_TypesAndValues.ProblemDetails p_problemDetails
) := {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment