Initial ATS specific modulepar removal result (a59e1807) · Commits · TTCN-3 Libraries / LibSip

ttcn/LibSip_Interface.ttcn

+7 −8

Original line number	Diff line number	Diff line
		@@ -168,15 +168,15 @@ module LibSip_Interface {
		var default vc_def_catchSyncStop;

		// general timers
		timer tc_T1 := PX_SIP_T1;
		timer tc_Tf := PX_SIP_TF;
		timer tc_T1 := 0.5;//STF471 default value, should be set in specific ATS, former PX_SIP_T1
		timer tc_Tf := 32.0;//STF471 default value, should be set in specific ATS, former PX_SIP_TF
		timer tc_wait := PX_SIP_TWAIT;
		timer tc_ack := PX_SIP_TACK;
		timer tc_resp := PX_SIP_TRESP;
		timer tc_noAct := PX_SIP_TNOACT; // time for SUT to get idle state
		// timer TRept;
		// timer TSync := PX_SIP_TSYNC;
		timer tc_guard := PX_SIP_TGUARD; // MRO
		// timer TSync := 10.0; //STF471 default value, should be set in specific ATS, former PX_SIP_TSYNC
		timer tc_guard := 120.0; //STF471 default value, should be set in specific ATS, former PX_SIP_TGUARD
		timer tc_tDelay := 32.0;

		var float vc_tcRESP := PX_SIP_TRESP; // standard value for TRESP (may be modified in particular tests)
		@@ -203,12 +203,11 @@ module LibSip_Interface {
		// TODO: TT change
		var boolean vc_subscribed := false;
		// ETS address
		var
		address
		v_ets_label := {
		var address v_ets_label; /*STF471 removed assignment, should be performed in specific ATS
		:= {
		host := PX_SIP_TS1_IPADDR,
		portField := PX_SIP_TS1_PORT
		};
		};*/

		// parts needed for Client/SelfSyncComp type compatibility
		var StringStack v_stateStack := c_initStringStack;

ttcn/LibSip_PIXITS.ttcn

+1 −317

Original line number	Diff line number	Diff line
		@@ -7,10 +7,6 @@
		* NOTE: PIXITS in folowing groups can be ignored if this information
		* is provided in other modules of the ATS that uses this SIP library
		* - Ports_and_addresses_of_the_SUT
		* - PortsAndAddressesOfTheTS1
		* - PortsAndAddressesOfTheTS2
		* - PortsAndAddressesOfTheTS3
		* - ParametersForHTTP_Authentication
		*/
		module LibSip_PIXITS {
		// LibCommon
		@@ -56,11 +52,6 @@ module LibSip_PIXITS {
		*/
		modulepar charstring PX_SIP_SDP_media_video := "video";

		/**
		* @desc charstring for SDP media transport supported by the IUT
		*/
		modulepar charstring PX_SIP_SDP_media_transport := "RTP/AVP";

		/**
		* @desc charstring for SDP media transport supported by the IUT
		*/
		@@ -86,16 +77,6 @@ module LibSip_PIXITS {
		*/
		modulepar charstring PX_SIP_SDP_media_transport_Cle := "CLEARMODE/8000";

		/**
		* @desc charstring for SDP media transport supported by the IUT
		*/
		modulepar charstring PX_SIP_SDP_media_transport_Exp := "X-Experimental/180000";

		/**
		* @desc charstring for SDP media attribute supported by the IUT
		*/
		modulepar charstring PX_SIP_SDP_media_attribute_Exp := "99 " & PX_SIP_SDP_media_transport_Exp;

		/**
		* @desc charstring for SDP media attribute encoding supported by the IUT
		*/
		@@ -111,29 +92,9 @@ module LibSip_PIXITS {
		*/
		modulepar charstring PX_SIP_SDP_encoding_attribute_PCMA := "8 " & PX_SIP_SDP_media_transport_PCMA;

		/**
		* @desc charstring for SDP media attribute encoding unavailable by the IUT
		*/
		modulepar charstring PX_SIP_SDP_encoding_unavail := "GSM/8000";
		// f_Sip_TC2105_IS___xx__U18
		/**
		* @desc charstring for SDP media attribute encoding unsupported by the IUT
		*/
		modulepar charstring PX_SIP_SDP_encoding_unsup := "GSM/8000";
		// f_Sip_TC2105_IS___xx__U18
		/**
		* @desc charstring for SDP media T.38 transport (used in TC2101_IS___AU__09)
		*/
		modulepar charstring PX_SIP_SDP_transport := "udptl";


		} // group SDP Parameter

		group ISUPinterworkingParameters {
		/**
		* @desc charstring for Used CPC language
		*/
		modulepar charstring PX_SIP_ISUP_LANGUAGE := "English";
		/**
		* @desc charstring for Used CPC language
		*/
		@@ -144,21 +105,6 @@ module LibSip_PIXITS {

		group SupportedOptions {

		/**
		* @desc boolean for True if 100rel mechanism is supported in SIP
		*/
		modulepar boolean PX_SIP_100rel := false;

		/**
		* @desc boolean for True if precondition mechanism is supported in SIP
		*/
		modulepar boolean PX_SIP_precondition := false;

		/**
		* @desc boolean for True if UDP Transport is used by the IUT to run campaign
		*/
		modulepar boolean PX_SIP_UDP := true;

		/**
		* @desc charstring for Used Transport in upper case "UDP"/"TCP"
		*/
		@@ -181,148 +127,8 @@ module LibSip_PIXITS {
		*/
		modulepar charstring PX_SIP_SUT_IPADDR := "172.27.16.115";

		/**
		* @desc charstring for SUT domain
		*/
		modulepar charstring PX_SIP_SUT_HOME_DOMAIN := "172.27.16.115";

		/**
		* @desc charstring for unknown SUT domain
		*/
		modulepar charstring PX_SIP_SUT_HOME_DOMAIN_UNKNOWN := "172.88.88.88";

		}

		// PIXITS in group PortsAndAddressesOfTheTS1 can be ignored if this information is provided in other modules of the ATS that uses this SIP library
		group PortsAndAddressesOfTheTS1 {
		// Ports and addresses of the TS1 (tester), first access
		/**
		* @desc integer for port number used by the TS1 to exchange SIP messages
		*/
		modulepar integer PX_SIP_TS1_PORT := 5060;

		/**
		* @desc charstring for IP address used by the TS1 to exchange SIP messages
		*/
		modulepar charstring PX_SIP_TS1_IPADDR := "172.27.1.218";

		/**
		* @desc charstring for identity of the tester local domain
		*/
		modulepar charstring PX_SIP_TS1_LOCAL_DOMAIN := "172.27.1.218";

		/**
		* @desc charstring for identity of the tester local user
		*/
		modulepar charstring PX_SIP_TS1_LOCAL_USER := "2910";

		/**
		* @desc charstring for identity of the user with active call diversion service
		*/
		modulepar charstring PX_SIP_TS1_LOCAL_USER_DIV := "2907";

		/**
		* @desc charstring for identity of the tester local user (format "+"cc+ndc+sn)
		*/
		modulepar charstring PX_SIP_TS1_LOCAL_USER_FULL := "+ 33492941111";

		/**
		* @desc integer for port number used by the TS to exchange media streams
		*/
		modulepar integer PX_SIP_TS1_BEARER_PORT := 52000;

		/**
		* @desc charstring for port number used by the TS to exchange media streams
		*/
		modulepar integer PX_SIP_TS1_BEARER_PORT2 := 62000;

		/**
		* @desc charstring for IP address used by the TS to exchange media streams
		*/
		modulepar charstring PX_SIP_TS1_BEARER_IPADDR := "172.27.1.218";


		} // group PortsAndAddressesOfTheTS

		// PIXITS in group PortsAndAddressesOfTheTS2 can be ignored if this information is provided in other modules of the ATS that uses this SIP library
		group PortsAndAddressesOfTheTS2 {
		// Ports and addresses of the TS2 (tester), second access
		/**
		* @desc integer for port number used by the TS2 to exchange SIP messages
		*/
		modulepar integer PX_SIP_TS2_PORT := 5060;

		/**
		* @desc charstring for IP address used by the TS2 to exchange SIP messages
		*/
		modulepar charstring PX_SIP_TS2_IPADDR := "172.27.1.219";

		/**
		* @desc charstring for identity of the tester local domain
		*/
		modulepar charstring PX_SIP_TS2_LOCAL_DOMAIN := "172.27.1.219";

		/**
		* @desc charstring for identity of the tester local user
		*/
		modulepar charstring PX_SIP_TS2_LOCAL_USER := "2911";

		/**
		* @desc charstring for identity of the user with active call diversion service
		*/
		modulepar charstring PX_SIP_TS2_LOCAL_USER_DIV := "2011";

		/**
		* @desc charstring for identity of the tester local user (format "+"cc+ndc+sn)
		*/
		modulepar charstring PX_SIP_TS2_LOCAL_USER_FULL := "+ 33 4 92941111";

		/**
		* @desc integer for port number used by the TS to exchange media streams
		*/
		modulepar integer PX_SIP_TS2_BEARER_PORT := 53000;

		/**
		* @desc integer for port number used by the TS to exchange media streams
		*/
		modulepar integer PX_SIP_TS2_BEARER_PORT2 := 63000;

		/**
		* @desc charstring for IP address used by the TS to exchange media streams
		*/
		modulepar charstring PX_SIP_TS2_BEARER_IPADDR := "172.27.1.218";



		} // group PortsAndAddressesOfTheTS2

		// PIXITS in group PortsAndAddressesOfTheTS3 can be ignored if this information is provided in other modules of the ATS that uses this SIP library
		group PortsAndAddressesOfTheTS3 {
		// Ports and addresses of the TS3 (tester), second access
		/**
		* @desc integer for Port number used by the TS3 to exchange SIP messages
		*/
		modulepar integer PX_SIP_TS3_PORT := 5060;

		/**
		* @desc charstring for IP address used by the TS3 to exchange SIP messages
		*/
		modulepar charstring PX_SIP_TS3_IPADDR := "172.27.1.220";

		/**
		* @desc charstring for identity of the tester local domain
		*/
		modulepar charstring PX_SIP_TS3_LOCAL_DOMAIN := "172.27.1.220";

		/**
		* @desc charstring for identity of the tester local user
		*/
		modulepar charstring PX_SIP_TS3_LOCAL_USER := "2012";



		} // group PortsAndAddressesOfTheTS3

		group RegistrationParameters {

		/**
		@@ -330,16 +136,6 @@ module LibSip_PIXITS {
		*/
		modulepar boolean PX_SIP_REGISTRATION := false;

		/**
		* @desc integer for the minimun SIP user registration expires-value
		*/
		modulepar integer PX_SIP_REGISTRATION_exp_min := 3600;

		/**
		* @desc charstring for REGISTRAR domain
		*/
		modulepar charstring PX_SIP_SUT_REGISTRAR_DOMAIN := "172.27.16.115";

		/**
		* @desc charstring for PX_AUTH_ALGORITHM security algorithm Possible values: MD5 or AKAv1-MD5
		*/
		@@ -348,31 +144,12 @@ module LibSip_PIXITS {

		} // group Registration parameters

		group ReleaseCause {
		/**
		* @desc integer for Release cause to be used in BYE and in Failure messages
		*/
		modulepar integer PX_SIP_BYE_CAUSE := 16;


		} // group ReleaseCause

		group RTPStreamControlAndCheck {
		/**
		* @desc boolean for True, if conversation check is implemented.
		*/
		modulepar boolean PX_SIP_CheckConversation := false;

		/**
		* @desc boolean for True, if DTMF check is implemented.
		*/
		modulepar boolean PX_SIP_CheckDTMF := false;

		/**
		* @desc boolean for True, if Announcement sending is implemented.
		*/
		modulepar boolean PX_SIP_SendAnnouncement := false;

		/**
		* @desc boolean for True, if ringing check is implemented.
		*/
		@@ -395,76 +172,7 @@ module LibSip_PIXITS {

		} // group SwitchToEnableAuthentication

		group NofifyAndSubscribe {
		/**
		* @desc boolean for option controlling if notification is enabled/disabled
		*/
		modulepar boolean PX_SIP_NOTIFICATION := true;
		/**
		* @desc boolean for option controlling if subscription is enabled/disabled
		*/
		modulepar boolean PX_SIP_SUBSCRIPTION := true;
		}

		// PIXITS in group ParametersForHTTP_Authentication can be ignored if this information is provided in other modules of the ATS that uses this SIP
		// library
		group ParametersForHTTP_Authentication {

		/**
		* @desc charstring for RFC 2617 clause 3-2-1 qop options: Quoted string of one or more tokens indicating the "quality of protection" values supported by the server. The value "auth" indicates authentication; the value "auth-int" indicates authentication with integrity protection.
		*/
		modulepar charstring PX_SIP_SUT_UE1_QOP := "auth";

		/**
		* @desc charstring for RFC 2617 clause 3-2-2 username: The name of user in the specified realm
		*/
		modulepar charstring PX_SIP_SUT_UE1_USERNAME := "abcd";

		/**
		* @desc charstring for RFC 2617 clause 3-2-2-2 passwd: A known shared secret, the password of user of the specified username
		*/
		modulepar charstring PX_SIP_SUT_UE1_PASSWD := "1234";

		/**
		* @desc charstring for RFC 2617 clause 3-2-1 qop options: Quoted string of one or more tokens indicating the "quality of protection" values supported by the server. The value "auth" indicates authentication; the value "auth-int" indicates authentication with integrity protection.
		*/
		modulepar charstring PX_SIP_SUT_UE2_QOP := "auth";

		/**
		* @desc charstring for RFC 2617 clause 3-2-2 username: The name of user in the specified realm
		*/
		modulepar charstring PX_SIP_SUT_UE2_USERNAME := "abcd";

		/**
		* @desc charstring for RFC 2617 clause 3-2-2-2 passwd: A known shared secret, the password of user of the specified username
		*/
		modulepar charstring PX_SIP_SUT_UE2_PASSWD := "1234";



		} // group ParametersForHTTP_Authentication

		group SIP_Timers {
		/**
		* @desc float for T1 RTT estimate (500 ms)
		*/
		modulepar float PX_SIP_T1 := 0.5;

		/**
		* @desc float for T2 Maximum retransmit interval for non-INVITE requests and INVITE response (4000 ms)
		*/
		modulepar float PX_T2 := 4.0;

		/**
		* @desc float for T4 Maximum duration a message will remain in the network
		*/
		modulepar float PX_T4 := 1.0;

		/**
		* @desc float for TDELAY default value for timeout on outgoing SIP request (ie 64*T1)
		*/
		modulepar float PX_SIP_TF := 32.0;

		/**
		* @desc float for TWait default value for waiting an operator action
		*/
		@@ -485,22 +193,6 @@ module LibSip_PIXITS {
		*/
		modulepar float PX_SIP_TNOACT := 1.0;

		/**
		* @desc float for TSYNC default value to synchronise ptc
		*/
		modulepar float PX_SIP_TSYNC := 10.0;

		/**
		* @desc float for TGUARD default value for an extra long timer to limit test execution
		*/
		modulepar float PX_SIP_TGUARD := 120.0;

		/**
		* @desc float for TRespRetention minimum time that a Proxy will wait before sending a final response
		*/
		modulepar float PX_TRespRetention := 1.0;


		} // group SIP_Timers

		// TODO STF471 addition
		@@ -510,16 +202,8 @@ module LibSip_PIXITS {
		*/
		modulepar charstring PX_SIP_MIME_Boundary := "boundary1";

		/**
		* @desc charstring for content type value of mime xml message body part
		*/
		modulepar charstring PX_SIP_ISUP_ContentType := "application/vnd.etsi.cug+xml";


		// application/vnd.etsi.simservs+xml
		} // group MimePart



		} // group SIP_PIXITparameters
		} // end module LibSip_PIXITS

ttcn/LibSip_Steps.ttcn

+8 −47

Original line number	Diff line number	Diff line
		@@ -3055,8 +3055,7 @@ module LibSip_Steps {
		) runs on SipComponent {
		tc_wait.start(PX_SIP_TWAIT);
		alt {
		[] SIPP
		.receive // TAU error if expect (*)
		[] SIPP.receive
		{
		tc_wait.stop;
		vc_boo_response := true;
		@@ -4012,47 +4011,6 @@ module LibSip_Steps {
		stop;
		}

		/**
		* @desc setting of user parameters with PIXIT values
		* @param p_user identifies the selected user configuration and location
		*/
		function f_init_userprofile(
		in integer p_user
		) runs on SipComponent {
		vc_userprofile.id := p_user;

		select (p_user) {
		case (c_userProfile_SIP1_home) {
		// variant c_userProfile_SIP1_home
		vc_userprofile.currPort := PX_SIP_TS1_PORT;
		vc_userprofile.currIpaddr := PX_SIP_TS1_IPADDR;
		vc_userprofile.contactPort := PX_SIP_TS1_PORT;
		vc_userprofile.contactIpaddr := PX_SIP_TS1_IPADDR;
		vc_userprofile.bearerIpaddr := PX_SIP_TS1_BEARER_IPADDR;
		vc_userprofile.homeDomain := PX_SIP_TS1_LOCAL_DOMAIN;
		vc_userprofile.publUsername := PX_SIP_TS1_LOCAL_USER;
		vc_userprofile.qop := PX_SIP_SUT_UE1_QOP;
		vc_userprofile.privUsername := PX_SIP_SUT_UE1_USERNAME;
		vc_userprofile.passwd := PX_SIP_SUT_UE1_PASSWD;
		vc_userprofile.registrarDomain := PX_SIP_SUT_REGISTRAR_DOMAIN;
		}
		case (c_userProfile_SIP2_home) {
		// variant c_userProfile_SIP2_home
		vc_userprofile.currPort := PX_SIP_TS2_PORT;
		vc_userprofile.currIpaddr := PX_SIP_TS2_IPADDR;
		vc_userprofile.contactPort := PX_SIP_TS2_PORT;
		vc_userprofile.contactIpaddr := PX_SIP_TS2_IPADDR;
		vc_userprofile.bearerIpaddr := PX_SIP_TS2_BEARER_IPADDR;
		vc_userprofile.homeDomain := PX_SIP_TS2_LOCAL_DOMAIN;
		vc_userprofile.publUsername := PX_SIP_TS2_LOCAL_USER;
		vc_userprofile.qop := PX_SIP_SUT_UE2_QOP;
		vc_userprofile.privUsername := PX_SIP_SUT_UE2_USERNAME;
		vc_userprofile.passwd := PX_SIP_SUT_UE2_PASSWD;
		vc_userprofile.registrarDomain := PX_SIP_SUT_REGISTRAR_DOMAIN;
		}
		}
		}

		/**
		* @desc function waits for particular time that allows the SUT to return to idle state
		*/
		@@ -4398,7 +4356,7 @@ module LibSip_Steps {
		f_init_component(p_cSeq_s);

		// Preamble
		f_init_userprofile(p_userprofile); // assignment of PIXIT values to component variable
		//NOTE STF471: removed f_init_userprofile(p_userprofile); // assignment of PIXIT values to component variable
		vc_sdp_local := valueof(m_SDP_bandwidth(m_media_dynPT(PX_SIP_SDP_dyn, PX_SIP_SDP_encoding), vc_userprofile));
		}

		@@ -4433,16 +4391,19 @@ module LibSip_Steps {
		* @param p_from parameter for outgoing BYE
		* @param p_to parameter for outgoing BYE
		* @param p_reqHostPort parameter for outgoing BYE
		* @param p_byeCause parameter for Release cause to be used
		* in BYE and in Failure messages, former PX_SIP_BYE_CAUSE
		*/
		function f_terminateCall(
		SipUrl p_requestUri,
		CallId p_CallId,
		inout CSeq p_cSeq,
		From p_from,
		template(value) To p_to
		template(value) To p_to,
		integer p_byeCause
		) runs on SipComponent {
		// Sending of a BYE request to release the call and expect a final response
		f_SendBYE(m_BYE_Request_cause(p_requestUri, p_CallId, p_cSeq, p_from, p_to, vc_via, PX_SIP_BYE_CAUSE));
		f_SendBYE(m_BYE_Request_cause(p_requestUri, p_CallId, p_cSeq, p_from, p_to, vc_via, p_byeCause));

		tc_resp.start(PX_SIP_TRESP);
		alt {

ttcn/LibSip_Templates.ttcn

+79 −181

File changed.

Preview size limit exceeded, changes collapsed.