Diameter Gy CCR: Expect RATType AVP in PS-Information instead of MSCC

open5gs-smfd was recently modified to send RAT-Type inside
PS-Information instead of MSCC, since having it in the former is
supported since older spec releases and having it in the later creates
problems in some real world OCS implementation like PortaOne OCS.

Related: SYS#6837
Related: open5gs.git d0b31177cca360865ebc6ab0b89eee7ee4fc8d1a,
Related: open5gs.git 3b5e851f5d1328536052031e66a7b9b03c3057f6
Change-Id: I7ce77d08847a0876291f76e901e5c89c339db27d
This commit is contained in:
Pau Espin 2024-03-25 12:17:43 +01:00
parent c1aa231d3a
commit 97f9547c94
2 changed files with 15 additions and 15 deletions

View File

@ -550,8 +550,7 @@ module GGSN_Tests {
tr_AVP_MultipleServicesIndicator,
tr_AVP_Multiple_Services_Credit_Control(content := superset(
tr_AVP_Requested_Service_Unit,
tr_AVP_PCC_3GPP_QoS_Information,
tr_AVP_GI_3GPP_RatType(rat_type)
tr_AVP_PCC_3GPP_QoS_Information
)),
tr_AVP_3GPP_ServiceInformation(content := superset(
tr_AVP_3GPP_PSInformation(content := superset(
@ -567,6 +566,7 @@ module GGSN_Tests {
tr_AVP_3GPP_NSAPI(nsapi),
tr_AVP_3GPP_MS_TimeZone,
tr_AVP_3GPP_ULI,
tr_AVP_GI_3GPP_RatType(rat_type),
tr_AVP_UserEquipmentInfo({
tr_AVP_UserEquipmentInfoType(IMEISV),
tr_AVP_UserEquipmentInfoValue(imeisv)
@ -596,8 +596,7 @@ module GGSN_Tests {
tr_AVP_Requested_Service_Unit,
tr_AVP_Used_Service_Unit,
/* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */
tr_AVP_PCC_3GPP_QoS_Information,
tr_AVP_GI_3GPP_RatType(rat_type)
tr_AVP_PCC_3GPP_QoS_Information
)),
tr_AVP_3GPP_ServiceInformation(content := superset(
tr_AVP_3GPP_PSInformation(content := superset(
@ -613,6 +612,7 @@ module GGSN_Tests {
tr_AVP_3GPP_NSAPI(nsapi),
tr_AVP_3GPP_MS_TimeZone,
tr_AVP_3GPP_ULI,
tr_AVP_GI_3GPP_RatType(rat_type),
tr_AVP_UserEquipmentInfo({
tr_AVP_UserEquipmentInfoType(IMEISV),
tr_AVP_UserEquipmentInfoValue(imeisv)
@ -643,8 +643,7 @@ module GGSN_Tests {
/* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */
tr_AVP_Used_Service_Unit,
tr_AVP_3GPP_Reporting_Reason(FINAL),
tr_AVP_PCC_3GPP_QoS_Information,
tr_AVP_GI_3GPP_RatType(rat_type)
tr_AVP_PCC_3GPP_QoS_Information
)),
tr_AVP_3GPP_ServiceInformation(content := superset(
tr_AVP_3GPP_PSInformation(content := superset(
@ -660,6 +659,7 @@ module GGSN_Tests {
tr_AVP_3GPP_NSAPI(nsapi),
tr_AVP_3GPP_MS_TimeZone,
tr_AVP_3GPP_ULI,
tr_AVP_GI_3GPP_RatType(rat_type),
tr_AVP_UserEquipmentInfo({
tr_AVP_UserEquipmentInfoType(IMEISV),
tr_AVP_UserEquipmentInfoValue(imeisv)

View File

@ -457,8 +457,7 @@ runs on PGW_Session_CT return template (present) PDU_DIAMETER
tr_AVP_MultipleServicesIndicator,
tr_AVP_Multiple_Services_Credit_Control(content := superset(
tr_AVP_Requested_Service_Unit,
tr_AVP_PCC_3GPP_QoS_Information,
tr_AVP_GI_3GPP_RatType(rat_type)
tr_AVP_PCC_3GPP_QoS_Information
)),
tr_AVP_3GPP_ServiceInformation(content := superset(
tr_AVP_3GPP_PSInformation(content := superset(
@ -474,7 +473,8 @@ runs on PGW_Session_CT return template (present) PDU_DIAMETER
tr_AVP_3GPP_NSAPI(nsapi),
/*We don't yet send MS_Tz in CreateSessionReq:
tr_AVP_3GPP_MS_TimeZone,*/
tr_AVP_3GPP_ULI/*,
tr_AVP_3GPP_ULI,
tr_AVP_GI_3GPP_RatType(rat_type)/*,
We don't yet send IMEI in CreateSessionReq:
tr_AVP_UserEquipmentInfo({
tr_AVP_UserEquipmentInfoType(IMEISV),
@ -505,8 +505,7 @@ runs on PGW_Session_CT return template (present) PDU_DIAMETER
tr_AVP_Requested_Service_Unit,
tr_AVP_Used_Service_Unit,
/* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */
tr_AVP_PCC_3GPP_QoS_Information,
tr_AVP_GI_3GPP_RatType(rat_type)
tr_AVP_PCC_3GPP_QoS_Information
)),
tr_AVP_3GPP_ServiceInformation(content := superset(
tr_AVP_3GPP_PSInformation(content := superset(
@ -522,7 +521,8 @@ runs on PGW_Session_CT return template (present) PDU_DIAMETER
tr_AVP_3GPP_NSAPI(nsapi),
/*We don't yet send MS_Tz in CreateSessionReq:
tr_AVP_3GPP_MS_TimeZone,*/
tr_AVP_3GPP_ULI/*,
tr_AVP_3GPP_ULI,
tr_AVP_GI_3GPP_RatType(rat_type)/*,
We don't yet send IMEI in CreateSessionReq:
tr_AVP_UserEquipmentInfo({
tr_AVP_UserEquipmentInfoType(IMEISV),
@ -554,8 +554,7 @@ runs on PGW_Session_CT return template (present) PDU_DIAMETER
/* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */
tr_AVP_Used_Service_Unit,
tr_AVP_3GPP_Reporting_Reason(FINAL),
tr_AVP_PCC_3GPP_QoS_Information,
tr_AVP_GI_3GPP_RatType(rat_type)
tr_AVP_PCC_3GPP_QoS_Information
)),
tr_AVP_3GPP_ServiceInformation(content := superset(
tr_AVP_3GPP_PSInformation(content := superset(
@ -571,7 +570,8 @@ runs on PGW_Session_CT return template (present) PDU_DIAMETER
tr_AVP_3GPP_NSAPI(nsapi),
/*We don't yet send MS_Tz in CreateSessionReq:
tr_AVP_3GPP_MS_TimeZone,*/
tr_AVP_3GPP_ULI/*,
tr_AVP_3GPP_ULI,
tr_AVP_GI_3GPP_RatType(rat_type)/*,
We don't yet send IMEI in CreateSessionReq:
tr_AVP_UserEquipmentInfo({
tr_AVP_UserEquipmentInfoType(IMEISV),