Create Diameter AVPs module for Rf/Ro interfaces (ca6fd4ee) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterRfRo

DiameterRfRo/ttcn/DiameterRfRo_PICS.ttcn

+18 −13

Original line number	Original line	Diff line number	Diff line
	@@ -6,19 +6,24 @@
	*/		*/

	module DiameterRfRo_PICS {		module DiameterRfRo_PICS {
	group PICS_A2{
	// /**
	// * @desc Does H-PCRF act as the IUT?
	// * @see ETSI DTS/INT-095-1 V0.0.4 (2014-02) A.2/1
	// */
	// modulepar boolean PICS_HPCRF_IUT := false;

	}//end group PICS_A2		group PICS_A2{
			/**
			* @desc Does CDF act as the IUT?
			* @see ETSI DTS/INT 00121-1 V0.0.6 (2015-07) A.2/1
			*/
			modulepar boolean PICS_CDF_IUT := false;

	group PICS_A3{		/**
			* @desc Does CDF act as the IUT?
			* @see ETSI DTS/INT 00121-1 V0.0.6 (2015-07) A.2/2
			*/
			modulepar boolean PICS_CTF_IUT := false;

			} // End of group PICS_A2

	}//end group PICS_A3		group PICS_A3{

			} // End of group PICS_A3

	} // End of module DiameterRfRo_PICS		} // End of module DiameterRfRo_PICS
			No newline at end of file

DiameterRfRo/ttcn/DiameterRfRo_PIXITS.ttcn

+71 −76

Original line number	Original line	Diff line number	Diff line
	@@ -4,14 +4,17 @@
	* @desc This module provides the PIXIT used for the RfRo DIAMETER tests.		* @desc This module provides the PIXIT used for the RfRo DIAMETER tests.
	*/		*/

	module DiameterRfRo_PIXITS		module DiameterRfRo_PIXITS {
	{		// LibCommon
	import from LibDiameter_Types_Base_AVPs {type IPv4Addr, IPv6Addr, UTF8String, Subscription_Id_Ty_Type;};
	import from LibDiameter_Types_Gx_AVPs {type IP_CAN_Type, RAT_Type, PCC_Rule_Status;};
	import from LibCommon_BasicTypesAndValues all;		import from LibCommon_BasicTypesAndValues all;

			// LibDiameter
			import from LibDiameter_Types_Base_AVPs all;
			import from LibDiameter_Types_Gx_AVPs all;
	import from LibDiameter_Types_S9_AVPs all;		import from LibDiameter_Types_S9_AVPs all;

	group Port_and_addresses{		group Port_and_addresses{

	group RfRo_Port_and_addresses{		group RfRo_Port_and_addresses{

	/** @desc charstring, PIXIT item A-7/1		/** @desc charstring, PIXIT item A-7/1
	@@ -53,7 +56,8 @@ module DiameterRfRo_PIXITS
	* Port number of the system under test		* Port number of the system under test
	*/		*/
	modulepar integer PX_DIAMETER_RO_SUT_PORT := 3868;		modulepar integer PX_DIAMETER_RO_SUT_PORT := 3868;
	}
			} // End of group RfRo_Port_and_addresses

	group Gm_Port_and_addresses{		group Gm_Port_and_addresses{

	@@ -87,9 +91,9 @@ module DiameterRfRo_PIXITS
	*/		*/
	modulepar integer PX_DIAMETER_GM_SUT_PCSCF_PORT := 3868;		modulepar integer PX_DIAMETER_GM_SUT_PCSCF_PORT := 3868;

	}//end group Gm_Port_and_addresses{		} // End of group Gm_Port_and_addresses{

	}		} // End of group Port_and_addresses

	// SUT specific implementation variants		// SUT specific implementation variants
	group DiameterCommonRfRoData{		group DiameterCommonRfRoData{
	@@ -107,7 +111,6 @@ module DiameterRfRo_PIXITS
	*/		*/
	modulepar UTF8String PX_SessionID := "pcscf.etsi.org;1317059245;52;21823490";		modulepar UTF8String PX_SessionID := "pcscf.etsi.org;1317059245;52;21823490";


	/** @desc charstring, PIXIT item A-9/2		/** @desc charstring, PIXIT item A-9/2

	The Origin-Host AVP (AVP Code 264) is of type DiameterIdentity, and		The Origin-Host AVP (AVP Code 264) is of type DiameterIdentity, and
	@@ -125,8 +128,6 @@ module DiameterRfRo_PIXITS
	*/		*/
	modulepar charstring PX_OriginHost := "origin.etsi.org";		modulepar charstring PX_OriginHost := "origin.etsi.org";



	/** @desc charstring, PIXIT item A-9/3		/** @desc charstring, PIXIT item A-9/3

	The Origin-Realm AVP (AVP Code 296) is of type DiameterIdentity;		The Origin-Realm AVP (AVP Code 296) is of type DiameterIdentity;
	@@ -137,8 +138,6 @@ module DiameterRfRo_PIXITS
	*/		*/
	modulepar charstring PX_OriginRealm := "etsi.org";		modulepar charstring PX_OriginRealm := "etsi.org";



	/** @desc charstring, PIXIT item A-9/4		/** @desc charstring, PIXIT item A-9/4

	The Destination-Host AVP (AVP Code 293) is of type DiameterIdentity;		The Destination-Host AVP (AVP Code 293) is of type DiameterIdentity;
	@@ -153,8 +152,6 @@ module DiameterRfRo_PIXITS
	*/		*/
	modulepar charstring PX_DestinationHost := "destination.etsi.org";		modulepar charstring PX_DestinationHost := "destination.etsi.org";



	/** @desc charstring, PIXIT item A-9/3		/** @desc charstring, PIXIT item A-9/3

	The Destination-Realm AVP (AVP Code 283) is of type DiameterIdentity,		The Destination-Realm AVP (AVP Code 283) is of type DiameterIdentity,
	@@ -283,13 +280,11 @@ module DiameterRfRo_PIXITS
	// */		// */
	// modulepar PCC_Rule_Status PX_PCC_RULE_STATUS := ACTIVE_E;		// modulepar PCC_Rule_Status PX_PCC_RULE_STATUS := ACTIVE_E;

			} // End of group DiameterCommonRfRoData
	} //end group DiameterCommonRfRoData


	/**		/**
	* @desc boolean indicator that is true if the Gm interface (SIP protocol) is accessible to trigger Diameter events at the Cx/Dx interface		* @desc boolean indicator that is true if the Gm interface (SIP protocol) is accessible to trigger Diameter events at the Cx/Dx interface
	*/		*/
	modulepar boolean PX_SIPsupport := false;		modulepar boolean PX_SIPsupport := false;

	} // end module DiameterRfRo_PIXITS		} // End of module DiameterRfRo_PIXITS
	No newline at end of file		No newline at end of file

DiameterRfRo/ttcn/DiameterRfRo_SIP_TCFunctions.ttcn

+6 −8

Original line number	Original line	Diff line number	Diff line
	@@ -6,8 +6,7 @@
	*/		*/
	module DiameterRfRo_SIP_TCFunctions {		module DiameterRfRo_SIP_TCFunctions {
	// LibCommon		// LibCommon
	import from LibCommon_Sync {function f_selfOrClientSyncAndVerdict;		import from LibCommon_Sync all;
	const c_prDone, c_tbDone, c_poDone;}
	import from LibCommon_VerdictControl all ;		import from LibCommon_VerdictControl all ;

	// LibDiameter		// LibDiameter
	@@ -18,15 +17,14 @@ module DiameterRfRo_SIP_TCFunctions {
	import from LibDiameter_Steps all;		import from LibDiameter_Steps all;
	import from LibDiameter_Types_Base_AVPs all;		import from LibDiameter_Types_Base_AVPs all;

	//DiameterS9		// DiameterRfRo
	import from DiameterRfRo_Templates all;		import from DiameterRfRo_Templates all;
	import from DiameterRfRo_SIP_Templates all;		import from DiameterRfRo_SIP_Templates all;
	import from DiameterRfRo_Steps all;		import from DiameterRfRo_Steps all;
	import from DiameterRfRo_PIXITS all;		import from DiameterRfRo_PIXITS all;


	group TP_VPCRFRole{		group TP_VPCRFRole{

	} // group TP_VPCRFRole		} // End of group TP_VPCRFRole

	}// end module DiameterRfRo_SIP_TCFunctions		} // End of module DiameterRfRo_SIP_TCFunctions
	No newline at end of file		No newline at end of file

DiameterRfRo/ttcn/DiameterRfRo_SIP_Templates.ttcn

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -30,9 +30,8 @@ module DiameterRfRo_SIP_Templates {
	import from DiameterRfRo_PIXITS all;		import from DiameterRfRo_PIXITS all;
	import from DiameterRfRo_Templates all;		import from DiameterRfRo_Templates all;



	group SubFields{		group SubFields{
	} //end group SubFields

	}//end module DiameterRfRo_SIP_Templates		} // End of group SubFields
	No newline at end of file
			} // End of module DiameterRfRo_SIP_Templates
			No newline at end of file

DiameterRfRo/ttcn/DiameterRfRo_Steps.ttcn

+64 −51

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,7 @@
	vc_send_hopid:=hex2int('00000100'H);		vc_send_hopid:=hex2int('00000100'H);
	vc_send_endid:=hex2int('01000000'H);		vc_send_endid:=hex2int('01000000'H);

	} // end function f_DiameterS9_init		} // End of function f_DiameterS9_init

	/*		/*
	* @desc This is a test step that init global variables		* @desc This is a test step that init global variables
	@@ -102,12 +102,11 @@

	vc_send_hopid:=hex2int('00000100'H);		vc_send_hopid:=hex2int('00000100'H);
	vc_send_endid:=hex2int('01000000'H);		vc_send_endid:=hex2int('01000000'H);
			} // End of function f_DiameterRo_init
	} // end function f_DiameterRo_init

	//TODO check for 2nd Ro or Rf configuration!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!		//TODO check for 2nd Ro or Rf configuration!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

	} // end group GlobalSteps		} // Endgroup GlobalSteps

	group Preambles{		group Preambles{

	@@ -119,7 +118,7 @@
	}		}

	f_DiameterRf_init();		f_DiameterRf_init();
	f_preambleDiameterBaseClient(c_applIdCommonMsg);//TODO change to Rf/Ro		f_preambleDiameterBaseClient(c_applIdRf);//TODO change to Rf/Ro
	}		}

	function f_preamble_Rf_CTF() runs on DiameterComponent		function f_preamble_Rf_CTF() runs on DiameterComponent
	@@ -130,7 +129,7 @@
	}		}

	f_DiameterRf_init();		f_DiameterRf_init();
	f_preambleDiameterBaseServer(c_applIdCommonMsg);//TODO change to Rf/Ro		f_preambleDiameterBaseServer(c_applIdRf);//TODO change to Rf/Ro
	}		}

	function f_preamble_Ro_OCF() runs on DiameterComponent		function f_preamble_Ro_OCF() runs on DiameterComponent
	@@ -155,7 +154,7 @@
	f_preambleDiameterBaseServer(c_applIdCommonMsg);//TODO change to Rf/Ro		f_preambleDiameterBaseServer(c_applIdCommonMsg);//TODO change to Rf/Ro
	}		}

	}// end group Preambles		} // End of group Preambles

	group Postambles {		group Postambles {

	@@ -175,7 +174,6 @@

	function f_postamble_CDF() runs on DiameterComponent		function f_postamble_CDF() runs on DiameterComponent
	{		{

	f_postambleDiameterBase();		f_postambleDiameterBase();

	if(PX_DIAM_LLP_ENABLED)		if(PX_DIAM_LLP_ENABLED)
	@@ -189,7 +187,6 @@

	function f_postamble_OCF() runs on DiameterComponent		function f_postamble_OCF() runs on DiameterComponent
	{		{

	f_postambleDiameterBase();		f_postambleDiameterBase();

	if(PX_DIAM_LLP_ENABLED)		if(PX_DIAM_LLP_ENABLED)
	@@ -201,14 +198,30 @@
	deactivate;		deactivate;
	}		}

	}// end group Postambles		} // End of group Postambles

	group AVPOperations {		group AVPOperations {
	}//end group AVPOperations
			} // End of group AVPOperations

	group CheckFunctions {		group CheckFunctions {

			} // End of group CheckFunctions

			group SendMessage {

			/**
			* @desc Function used to trigger a AC-Request message
			* @param p_acrMSG AC-Request message to send
			* @verdict Unchanged
			*/
			function f_triggerAcRequest(in template (value) ACR_MSG p_acrMSG)
			runs on DiameterComponent {
			DIAMP.send(
			DIAMETER_MSG : { aCR_MSG := p_acrMSG }
			);
			} // End of function f_triggerAcRequest

	} //end group CheckFunctions		} // End of group SendMessage

	} // end module DiameterGx_Steps		} // End of module DiameterGx_Steps
	No newline at end of file		No newline at end of file

Admin message