some warnings were solved and minor changes were done (66639269) · Commits · TTCN-3 Libraries / LibDiameter

ttcn/LibDiameter_Interface.ttcn

+4 −1

ttcn/LibDiameter_Steps.ttcn

+16 −3

Original line number	Original line	Diff line number	Diff line
	/**		/**
	* @author STF 434		* @author STF 434
	* @version $Id:$		* @version $Id$
	* @desc This module provides functions used in DIAMETER		* @desc This module provides functions used in DIAMETER
	*/		*/

	@@ -348,7 +348,7 @@ group GlobalSteps {
	* @desc This is a test step that init Diameter component		* @desc This is a test step that init Diameter component
	* @param		* @param
	*/		*/
	function f_Diameter_Init_Component( inout template DIAMETER_MSG p_diameterMSG)		function f_Diameter_Init_Component()
	runs on DiameterComponent {		runs on DiameterComponent {

	} // end function f_Diameter_Init_Component		} // end function f_Diameter_Init_Component
	@@ -678,6 +678,17 @@ group GlobalSteps {
	}		}
	}		}

			/**
			*
			* @desc component termination
			*/
			function f_terminate_diameter_component() runs on DiameterComponent
			{
			log("component terminated - forced!");
			deactivate;
			stop;
			}

	}// end group GlobalSteps		}// end group GlobalSteps


	@@ -815,6 +826,8 @@ group Postambles {
	//TODO define templates		//TODO define templates
	f_send_DPR(m_DPR_basic(vc_originHost, vc_originRealm));		f_send_DPR(m_DPR_basic(vc_originHost, vc_originRealm));
	f_awaiting_DPA(mw_DPA_dummy);		f_awaiting_DPA(mw_DPA_dummy);

			f_terminate_diameter_component();
	}		}

	}//end group postamble_Diameter		}//end group postamble_Diameter
	@@ -845,7 +858,7 @@ group DefaultsTestStep

	}		}

	altstep a_diameter_default() runs on DiameterComponent		altstep a_diameter_default_withinllp() runs on DiameterComponent
	{		{
	[] any timer.timeout		[] any timer.timeout
	{		{

ttcn/LibDiameter_Templates.ttcn

+46 −2

Original line number	Original line	Diff line number	Diff line
	@@ -223,7 +223,7 @@ module LibDiameter_Templates {
	* @param p_avpDataLen additional length caused if AVP data field is present		* @param p_avpDataLen additional length caused if AVP data field is present
	* @param p_avpVid vendor id if needed		* @param p_avpVid vendor id if needed
	*/		*/
	template AVP_Header m_aVP_HeaderVid(AVP_Code p_avpCode, integer p_avpDataLen, template AVP_Vendor_ID p_avpVid) := {		template AVP_Header m_aVP_HeaderVid(AVP_Code p_avpCode, AVP_Length p_avpDataLen, template AVP_Vendor_ID p_avpVid) := {
	aVP_Code := p_avpCode,		aVP_Code := p_avpCode,
	aVP_flags := {v_bit := f_aVPvBit(p_avpVid),		aVP_flags := {v_bit := f_aVPvBit(p_avpVid),
	m_bit := '1'B,		m_bit := '1'B,
	@@ -233,7 +233,7 @@ module LibDiameter_Templates {
	aVP_vid := p_avpVid		aVP_vid := p_avpVid
	}		}

	function f_lengthVid(template AVP_Vendor_ID p_avpVid) return integer {		function f_lengthVid(template AVP_Vendor_ID p_avpVid) return AVP_Length {
	if(isvalue(p_avpVid)){return 4} else{return 0}		if(isvalue(p_avpVid)){return 4} else{return 0}
	}		}

	@@ -336,6 +336,50 @@ module LibDiameter_Templates {

	/** Message templates for CER,CEA, DWR, DWA, AAA, AAR, .... methods */		/** Message templates for CER,CEA, DWR, DWA, AAA, AAR, .... methods */
	group MessageTemplates {		group MessageTemplates {
			// group templates_used_for_default_step {
			// template DIAMETER_MSG mw_diameter_cer(template (present) CER_MSG p_cer) :={
			// cER_MSG := p_cer
			// }
			// template DIAMETER_MSG mw_diameter_cea(template (present) CEA_MSG p_cea) :={
			// cEA_MSG := p_cea
			// }
			// template DIAMETER_MSG mw_diameter_dwr(template (present) DWR_MSG p_dwr) :={
			// dWR_MSG := p_dwr
			// }
			// template DIAMETER_MSG mw_diameter_dwa(template (present) DWA_MSG p_dwa) :={
			// dWA_MSG := p_dwa
			// }
			// template DIAMETER_MSG mw_diameter_dpr(template (present) DPR_MSG p_dpr) :={
			// dPR_MSG := p_dpr
			// }
			// template DIAMETER_MSG mw_diameter_dpa(template (present) DPA_MSG p_dpa) :={
			// dPA_MSG := p_dpa
			// }
			// template DIAMETER_MSG mw_diameter_aar(template (present) AAR_MSG p_aar) :={
			// aAR_MSG := p_aar
			// }
			// template DIAMETER_MSG mw_diameter_aaa(template (present) AAA_MSG p_aaa) :={
			// aAA_MSG := p_aaa
			// }
			// template DIAMETER_MSG mw_diameter_str(template (present) STR_MSG p_str) :={
			// sTR_MSG := p_str
			// }
			// template DIAMETER_MSG mw_diameter_sta(template (present) STA_MSG p_sta) :={
			// sTA_MSG := p_sta
			// }
			// template DIAMETER_MSG mw_diameter_asr(template (present) ASR_MSG p_asr) :={
			// aSR_MSG := p_asr
			// }
			// template DIAMETER_MSG mw_diameter_asa(template (present) ASA_MSG p_asa) :={
			// aSA_MSG := p_asa
			// }
			// template DIAMETER_MSG mw_diameter_rar(template (present) RAR_MSG p_rar) :={
			// rAR_MSG := p_rar
			// }
			// template DIAMETER_MSG mw_diameter_raa(template (present) RAA_MSG p_raa) :={
			// rAA_MSG := p_raa
			// }
			// }
	group dummy_templates {		group dummy_templates {
	group dummy_request_templates_send {		group dummy_request_templates_send {

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ module LibDiameter_Interface
	var integer vc_ETS_conn := 0; //TODO make check if this global variable is zero than connection not available		var integer vc_ETS_conn := 0; //TODO make check if this global variable is zero than connection not available
	var DIAMETER_MSG vc_sendDiamMsg ;		var DIAMETER_MSG vc_sendDiamMsg ;
	var DIAMETER_MSG vc_recvDiamMsg ;		var DIAMETER_MSG vc_recvDiamMsg ;
			var DIAMETER_MSG vc_recvDiamMsgDefault ; //global variable defined to save Dimeter message received within default altstep

	//init of values at component started		//init of values at component started
	var UInt32 vc_send_hopid:=0;// hex2int('00000100'H);		var UInt32 vc_send_hopid:=0;// hex2int('00000100'H);
	@@ -60,7 +61,9 @@ module LibDiameter_Interface
	//TODO general timers have to be defined		//TODO general timers have to be defined
	timer tc_wait := 5.0; //TODO define PIXIT if needed		timer tc_wait := 5.0; //TODO define PIXIT if needed

	//TODO indicators set/used parameter status or state handling in default have to be defined		// variables for storing default references
			var default vc_default_diameter;
			var default vc_def_catchSyncStop_diameter;

	//TODO check if needed like in SIP // ETS address		//TODO check if needed like in SIP // ETS address
	// var address v_ets_label := { host := PX_SIP_TS1_IPADDR, portField := PX_SIP_TS1_PORT};		// var address v_ets_label := { host := PX_SIP_TS1_IPADDR, portField := PX_SIP_TS1_PORT};

Admin message