DWR template definition and some minor changes on prev. work (330e3fde) · Commits · TTCN-3 Libraries / LibDiameter

ttcn/LibDiameter_Steps.ttcn

+4 −4

Original line number	Diff line number	Diff line
		@@ -458,10 +458,10 @@ group Preambles {
		function f_preambleDiameterBase()runs on DiameterComponent
		{
		//TODO define templates
		/* f_send_CER(m_CER);
		f_awaiting_CEA(mw_CEA);
		f_send_DWR(m_DWR);
		f_awaiting_DWA(mw_DWA);*/
		// f_send_CER(m_CER);
		// f_awaiting_CEA(mw_CEA);
		f_send_DWR(m_DWR_basic(vc_originHost, vc_originRealm));
		// f_awaiting_DWA(mw_DWA);
		}

		}//end group preamble_Diameter

ttcn/LibDiameter_Templates.ttcn

+95 −89

Original line number	Diff line number	Diff line
		@@ -1287,6 +1287,12 @@ module LibDiameter_Templates {
		auth_Application_Id := p_authApplicationId
		}

		template DWR_MSG m_DWR_basic(template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP p_originRealm) modifies m_DWR_dummy := {
		origin_Host := p_originHost,
		origin_Realm := p_originRealm
		}

		template STR_MSG m_STR_basic(template Session_Id_AVP p_sessionId,
		template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP p_originRealm,
		@@ -1401,7 +1407,7 @@ module LibDiameter_Templates {
		p_originRealm,
		template Auth_Application_Id_AVP
		p_authApplicationId)
		modifies mw_AAA_basic := {
		modifies m_AAA_dummy := {
		session_Id := p_sessionId,
		origin_Host := p_originHost,
		origin_Realm := p_originRealm,
		@@ -1431,10 +1437,10 @@ module LibDiameter_Templates {
		} //end group base_templates
		group modified_templates {

		group modified_request_templates_receive {
		group modified_request_templates_send {

		template
		AAR_MSG mw_AAR_FIP_Media1(template Session_Id_AVP p_sessionId,
		AAR_MSG m_AAR_FIP_Media1(template Session_Id_AVP p_sessionId,
		template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP
		p_originRealm,
		@@ -1451,14 +1457,14 @@ module LibDiameter_Templates {
		template
		Media_Component_Description_AVP
		p_mediaComponentDescription)
		modifies mw_AAR_basic := {
		modifies m_AAR_basic := {
		framed_IP_Address := p_framedIpAddress,
		framed_IPv6_Address := p_framedIp6Address,
		media_Component_Description := {p_mediaComponentDescription}
		}

		template
		AAR_MSG mw_AAR_FIP_supSA_supMedia(template Session_Id_AVP p_sessionId,
		AAR_MSG m_AAR_FIP_SA_Media1(template Session_Id_AVP p_sessionId,
		template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP
		p_originRealm,
		@@ -1472,20 +1478,19 @@ module LibDiameter_Templates {
		p_framedIpAddress,
		template Framed_IPv6_Prefix_AVP
		p_framedIp6Address,
		template Specific_Action_AVP
		template Setof_Specific_Action_AVP
		p_specificAction,
		template
		Media_Component_Description_AVP
		p_mediaComponentDescription)
		modifies mw_AAR_basic := {
		modifies m_AAR_basic := {
		framed_IP_Address := p_framedIpAddress,
		framed_IPv6_Address := p_framedIp6Address,
		media_Component_Description := superset(p_mediaComponentDescription),
		specific_Action := superset(p_specificAction)
		specific_Action := p_specificAction,
		media_Component_Description := {p_mediaComponentDescription}
		}

		template
		AAR_MSG mw_AAR_SCD(template Session_Id_AVP p_sessionId,
		template RAR_MSG m_RAR_SpecificAction(template Session_Id_AVP p_sessionId,
		template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP
		p_originRealm,
		@@ -1495,36 +1500,17 @@ module LibDiameter_Templates {
		p_destinationHost,
		template Auth_Application_Id_AVP
		p_authApplicationId,
		template Sponsored_Connectivity_Data_AVP
		p_sponsoredConnectivityData)
		modifies mw_AAR_basic := {
		sponsored_Connectivity_Data := p_sponsoredConnectivityData
		}

		} // end group modified_request_templates_receive

		group modified_answer_templates_receive {

		template AAA_MSG mw_AAA_modified_ResultCode_ANCA
		(template Session_Id_AVP p_sessionId,
		template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP p_originRealm,
		template Auth_Application_Id_AVP p_authApplicationId,
		template Result_Code_AVP p_resultCode,
		template Access_Network_Charging_Address_AVP
		p_accessNetworkChargingAddress) modifies mw_AAA_basic := {
		result_Code := p_resultCode,
		access_network_chrging_address := p_accessNetworkChargingAddress
		template Specific_Action_AVP p_specificAction)
		modifies m_RAR_dummy := {
		specific_action := p_specificAction
		}

		} // end group modified_request_templates_send


		} // end group modified_answer_templates_receive

		group modified_request_templates_send {
		group modified_request_templates_receive {

		template
		AAR_MSG m_AAR_FIP_Media1(template Session_Id_AVP p_sessionId,
		AAR_MSG mw_AAR_FIP_Media1(template Session_Id_AVP p_sessionId,
		template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP
		p_originRealm,
		@@ -1541,14 +1527,14 @@ module LibDiameter_Templates {
		template
		Media_Component_Description_AVP
		p_mediaComponentDescription)
		modifies m_AAR_basic := {
		modifies mw_AAR_basic := {
		framed_IP_Address := p_framedIpAddress,
		framed_IPv6_Address := p_framedIp6Address,
		media_Component_Description := {p_mediaComponentDescription}
		}

		template
		AAR_MSG m_AAR_FIP_SA_Media1(template Session_Id_AVP p_sessionId,
		AAR_MSG mw_AAR_FIP_supSA_supMedia(template Session_Id_AVP p_sessionId,
		template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP
		p_originRealm,
		@@ -1562,19 +1548,20 @@ module LibDiameter_Templates {
		p_framedIpAddress,
		template Framed_IPv6_Prefix_AVP
		p_framedIp6Address,
		template Setof_Specific_Action_AVP
		template Specific_Action_AVP
		p_specificAction,
		template
		Media_Component_Description_AVP
		p_mediaComponentDescription)
		modifies m_AAR_basic := {
		modifies mw_AAR_basic := {
		framed_IP_Address := p_framedIpAddress,
		framed_IPv6_Address := p_framedIp6Address,
		specific_Action := p_specificAction,
		media_Component_Description := {p_mediaComponentDescription}
		media_Component_Description := superset(p_mediaComponentDescription),
		specific_Action := superset(p_specificAction)
		}

		template RAR_MSG m_RAR_SpecificAction(template Session_Id_AVP p_sessionId,
		template
		AAR_MSG mw_AAR_SCD(template Session_Id_AVP p_sessionId,
		template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP
		p_originRealm,
		@@ -1584,12 +1571,13 @@ module LibDiameter_Templates {
		p_destinationHost,
		template Auth_Application_Id_AVP
		p_authApplicationId,
		template Specific_Action_AVP p_specificAction)
		modifies m_RAR_dummy := {
		specific_action := p_specificAction
		template Sponsored_Connectivity_Data_AVP
		p_sponsoredConnectivityData)
		modifies mw_AAR_basic := {
		sponsored_Connectivity_Data := p_sponsoredConnectivityData
		}

		} // end group modified_request_templates_send
		} // end group modified_request_templates_receive

		group modified_answer_templates_send {

		@@ -1609,6 +1597,24 @@ module LibDiameter_Templates {

		} // end group modified_answer_templates_send

		group modified_answer_templates_receive {

		template AAA_MSG mw_AAA_modified_ResultCode_ANCA
		(template Session_Id_AVP p_sessionId,
		template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP p_originRealm,
		template Auth_Application_Id_AVP p_authApplicationId,
		template Result_Code_AVP p_resultCode,
		template Access_Network_Charging_Address_AVP
		p_accessNetworkChargingAddress) modifies mw_AAA_basic := {
		result_Code := p_resultCode,
		access_network_chrging_address := p_accessNetworkChargingAddress
		}



		} // end group modified_answer_templates_receive


		} //end group modified_templates
		} //end group MessageTemplates