Commit 3e31d554 authored by Axel Rennoch's avatar Axel Rennoch
Browse files

adoption of SH_HSS_SN_13

parent a467d3cb

ttcn/DiameterShDh_TCFunctions.ttcn3

+4 −5
Original line number Diff line number Diff line
@@ -2055,15 +2055,14 @@ module DiameterShDh_TCFunctions { 
					f_send_SNR(

							   md_sNR(

									  vc_sessionId,

											   md_snrBodyAvps_DataRefList(

					                  md_snrBodyAvps_service_IndicationList(

													 vc_originHost,                 // containing an Origin-Host AVP

													 vc_originRealm,                // containing an Origin-Realm AVP

													 vc_destinationRealm,           // containing a Destination-Realm AVP

													 m_msisdn_user_Identity (

																			 m_MSISDN_user_identity(char2oct(PX_NotRelatedPrivateIdentity))

													 ),

													 m_subs_Req_Type(SUBSCRIBE_E),

													 {m_data_Reference(REPOSITORY_DATA_E),m_data_Reference(IMS_PUBLIC_IDENTITY_E)}

													 {m_service_Indication('01'O),m_service_Indication('02'O)}

													)

									 )

					);
@@ -2074,7 +2073,7 @@ module DiameterShDh_TCFunctions { 
										  mdw_pnrBodyUserdataAvps(?,?,?,mw_user_Data(?))

					));

					decvalue_o(vc_recvDiamMsg.pNR_MSG.pNR_Body.user_Data.aVP_Data, v_TSh_Data);

					if(not match(v_TSh_Data.repositoryData_list[0], mw_repositoryData(?))) {setverdict(fail)}; // TODO: service data of first service

					if(not match(v_TSh_Data.repositoryData_list[0], mw_repositoryData_ServInd(?,"01"))) {setverdict(fail)};



					f_send_PNA(

							   md_pNA(
@@ -2093,7 +2092,7 @@ module DiameterShDh_TCFunctions { 
										  mdw_pnrBodyUserdataAvps(?,?,?,mw_user_Data(?))

					));

					decvalue_o(vc_recvDiamMsg.pNR_MSG.pNR_Body.user_Data.aVP_Data, v_TSh_Data);

					if(not match(v_TSh_Data.repositoryData_list[0], mw_repositoryData(?))) {setverdict(fail)}; // TODO: service data of second service

					if(not match(v_TSh_Data.repositoryData_list[0], mw_repositoryData_ServInd(?,"02"))) {setverdict(fail)};



					f_send_PNA(

							   md_pNA(

ttcn/DiameterShDh_Templates.ttcn3

+25 −1
Original line number Diff line number Diff line
@@ -274,6 +274,14 @@ module DiameterShDh_Templates { 
		  elem_list := ?

		}



		template TTransparentData mw_repositoryData_ServInd (template TServiceData p_serviceData:=*, template (present) TString p_serviceIndication):= {

		  serviceIndication := p_serviceIndication,

		  sequenceNumber := ?,

		  serviceData  := p_serviceData,

		  extension_ := *,

		  elem_list := ?

		}

		

		template TTransparentData m_repositoryData (TString p_serviceIndication:="", TSequenceNumber p_sequenceNumber:=0, template (omit) TServiceData p_serviceData:=omit):= {

		  serviceIndication := p_serviceIndication,

		  sequenceNumber := p_sequenceNumber,
@@ -545,8 +553,24 @@ module DiameterShDh_Templates { 
                    data_Reference := {p_data_Reference},

                    service_Indication := {p_service_Indication}

                

                } // End of template md_snrBodyAvps_DSAI_Tag                                

                } // End of template md_snrBodyAvps_service_Indication                                

                

				template (value) SNR_Body_AVP md_snrBodyAvps_service_IndicationList(

															 template (value) Origin_Host_AVP p_origin_Host,

															 template (value) Origin_Realm_AVP p_origin_Realm,

															 template (value) Destination_Realm_AVP p_destination_Realm,

															 template (value) User_Identity_AVP p_user_Identity := m_user_Identity_dummy,

															 template (value) SNR_Body_AVP.service_Indication p_service_Indication

				) modifies m_SNR_Body_dummy := {

					vendor_Specific_Application_Id := m_vendor_Specific_Appl_Id_Sh,//required only in TS129 229

					auth_Session_State := m_auth_Session_State,

					origin_Host := p_origin_Host,

					origin_Realm := p_origin_Realm,

					destination_Realm := p_destination_Realm,

					user_Identity := p_user_Identity,

					service_Indication := p_service_Indication

                

				} // End of template md_snrBodyAvps_service_IndicationList 

				                

                template (value) SNR_Body_AVP md_snrBodyAvps_Expiry_Time(

                                                             template (value) Origin_Host_AVP p_origin_Host,