Another round of PIXIT removal (31fc52c0) · Commits · TTCN-3 Libraries / LibSip

ttcn/LibSip_PIXITS.ttcn

+8 −77

Original line number	Diff line number	Diff line
		@@ -44,51 +44,6 @@ module LibSip_PIXITS {
		*/
		modulepar charstring PX_SIP_SDP_ENCODING := "PCMU/8000";

		/**
		* @desc charstring for SDP media type supported by the IUT
		*/
		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_G722 := "G722/8000";

		/**
		* @desc charstring for SDP media transport supported by the IUT
		*/
		modulepar charstring PX_SIP_SDP_MEDIA_TRANSPORT_PCMU := "PCMU/8000";

		/**
		* @desc charstring for SDP media transport supported by the IUT
		*/
		modulepar charstring PX_SIP_SDP_MEDIA_TRANSPORT_PCMA := "PCMA/8000";

		/**
		* @desc charstring for SDP media transport supported by the IUT
		*/
		modulepar charstring PX_SIP_SDP_MEDIA_TRANSPORT_AMR := "AMR";

		/**
		* @desc charstring for SDP media transport supported by the IUT
		*/
		modulepar charstring PX_SIP_SDP_MEDIA_TRANSPORT_CLE := "CLEARMODE/8000";

		/**
		* @desc charstring for SDP media attribute encoding supported by the IUT
		*/
		modulepar charstring PX_SIP_SDP_ENCODING_ATTRIBUTE_G222 := "9 " & PX_SIP_SDP_MEDIA_TRANSPORT_G722;

		/**
		* @desc charstring for SDP media attribute encoding supported by the IUT
		*/
		modulepar charstring PX_SIP_SDP_ENCODING_ATTRIBUTE_PCMU := "0 " & PX_SIP_SDP_MEDIA_TRANSPORT_PCMU;

		/**
		* @desc charstring for SDP media attribute encoding supported by the IUT
		*/
		modulepar charstring PX_SIP_SDP_ENCODING_ATTRIBUTE_PCMA := "8 " & PX_SIP_SDP_MEDIA_TRANSPORT_PCMA;

		} // group SDP Parameter
		group XMLCOnfiguration{

		@@ -103,15 +58,6 @@ module LibSip_PIXITS {
		modulepar boolean PX_USE_FX_FOR_XML_LENGTH := false;
		}

		group ISUPinterworkingParameters {
		/**
		* @desc charstring for Used CPC language
		*/
		modulepar charstring PX_SIP_ISUP_CPC_VALUE := "prison";


		} // goup PSTNParameters

		group SupportedOptions {

		/**
		@@ -137,20 +83,6 @@ module LibSip_PIXITS {

		} // group Registration parameters

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

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


		} // group RTPStreamControlAndCheck

		group SwitchToEnableAuthentication {
		/**
		* @desc boolean for option controlling if authentication is enabled/disabled for REGISTER messages
		@@ -195,7 +127,6 @@ module LibSip_PIXITS {
		*/
		modulepar charstring PX_SIP_MIME_BOUNDARY := "boundary1";

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

		} // group SIP_PIXITparameters

ttcn/LibSip_Steps.ttcn

+28 −7

Original line number	Diff line number	Diff line
		@@ -4408,12 +4408,15 @@ module LibSip_Steps {

		/**
		* @desc check the presence of conversation at SIP side
		* @param p_checkConversation boolean to perform check if conversation check is implemented.
		* former PX_SIP_CHECK_CONVERSATION
		*/
		function f_check_Conversation(
		boolean p_checkConversation := false
		) runs on SipComponent {
		var charstring v_question := "confirm if conversation at SIP port";

		if (PX_SIP_CHECK_CONVERSATION) {
		if (p_checkConversation) {
		opPort
		.call(
		s_SIP_conversation:
		@@ -4453,12 +4456,15 @@ module LibSip_Steps {

		/**
		* @desc check the presence of conversation at SIP side
		* @param p_checkRinging boolean to perform check if ringing check is implemented.
		* former PX_SIP_CHECK_RINGING
		*/
		function f_check_Ringing(
		boolean p_checkRinging := false
		) runs on SipComponent {
		var charstring v_question := "confirm if ringing at SIP port";

		if (PX_SIP_CHECK_RINGING) {
		if (p_checkRinging) {
		opPort
		.call(
		s_SIP_ringing:
		@@ -4498,12 +4504,15 @@ module LibSip_Steps {

		/**
		* @desc check the announcement at SIP side (UE A)
		* @param p_checkConversation boolean to perform check if conversation check is implemented.
		* former PX_SIP_CHECK_CONVERSATION
		*/
		function f_check_AnnouncementUE_A(
		boolean p_checkConversation := false
		) runs on SipComponent {
		var charstring v_question := "confirm if announcement at UE A";

		if (PX_SIP_CHECK_CONVERSATION) {
		if (p_checkConversation) {
		opPort
		.call(
		s_SIP_announcementA:
		@@ -4543,12 +4552,15 @@ module LibSip_Steps {

		/**
		* @desc check the announcement at SIP side (UE B)
		* @param p_checkConversation boolean to perform check if conversation check is implemented.
		* former PX_SIP_CHECK_CONVERSATION
		*/
		function f_check_AnnouncementUE_B(
		boolean p_checkConversation := false
		) runs on SipComponent {
		var charstring v_question := "confirm if announcement at UE B";

		if (PX_SIP_CHECK_CONVERSATION) {
		if (p_checkConversation) {
		opPort
		.call(
		s_SIP_announcementB:
		@@ -4588,12 +4600,15 @@ module LibSip_Steps {

		/**
		* @desc check the announcement at SIP side
		* @param p_checkConversation boolean to perform check if conversation check is implemented.
		* former PX_SIP_CHECK_CONVERSATION
		*/
		function f_check_Announcement(
		boolean p_checkConversation := false
		) runs on SipComponent {
		var charstring v_question := "confirm if announcement at SIP side";

		if (PX_SIP_CHECK_CONVERSATION) {
		if (p_checkConversation) {
		opPort
		.call(
		s_SIP_announcement:
		@@ -4633,12 +4648,15 @@ module LibSip_Steps {

		/**
		* @desc check the Voice message at SIP side
		* @param p_checkConversation boolean to perform check if conversation check is implemented.
		* former PX_SIP_CHECK_CONVERSATION
		*/
		function f_check_VoiceMessage(
		boolean p_checkConversation := false
		) runs on SipComponent {
		var charstring v_question := "confirm if voice message at SIP side";

		if (PX_SIP_CHECK_CONVERSATION) {
		if (p_checkConversation) {
		opPort
		.call(
		s_SIP_voiceMessage:
		@@ -4678,12 +4696,15 @@ module LibSip_Steps {

		/**
		* @desc check the stop of media stream
		* @param p_checkConversation boolean to perform check if conversation check is implemented.
		* former PX_SIP_CHECK_CONVERSATION
		*/
		function f_check_MediaStopped(
		boolean p_checkConversation := false
		) runs on SipComponent {
		var charstring v_question := "confirm if media stream stopped";

		if (PX_SIP_CHECK_CONVERSATION) {
		if (p_checkConversation) {
		opPort
		.call(
		s_SIP_mediastopped:

ttcn/LibSip_Templates.ttcn

+79 −14

Original line number	Diff line number	Diff line
		@@ -96,10 +96,17 @@ module LibSip_Templates {
		) := superset(p_genericParam);

		//* c_Integrity_protected_yes
		template(value) SemicolonParam_List m_cpc := {
		/**
		* @desc send template for parameter list with CPC set to a specific value
		* @param p_ISUP_CPC_value CPC parameter value
		* former PX_SIP_ISUP_CPC_VALUE
		*/
		template(value) SemicolonParam_List m_cpc(
		template(value) charstring p_ISUP_CPC_value := "prison"
		) := {
		{
		"cpc",
		PX_SIP_ISUP_CPC_VALUE
		p_ISUP_CPC_value
		}
		}

		@@ -244,16 +251,22 @@ module LibSip_Templates {
		}
		}
		}

		/**
		* @desc send template with SIP userinfo
		* @param p_userprofile SIP user profile values
		* @param p_ISUP_CPC_value CPC parameter value
		* former PX_SIP_ISUP_CPC_VALUE
		*/
		template(value) SipUrl m_SipUrl_contactIpaddrAndCpc(
		template(value) SipUserProfile p_userprofile
		template(value) SipUserProfile p_userprofile,
		template(value) charstring p_ISUP_CPC_value := "prison"
		) modifies m_SipUrl_contactIpaddr := {
		components := {
		sip := {
		userInfo := {
		userOrTelephoneSubscriber :=
		p_userprofile.publUsername & "; cpc=" &
		PX_SIP_ISUP_CPC_VALUE //* charstring
		p_ISUP_CPC_value
		}
		}
		}
		@@ -3358,13 +3371,16 @@ module LibSip_Templates {
		* former PX_SIP_SDP_media_transport
		* @param p_mediaAttribute parameter for SDP media attribute supported by the IUT,
		* former PX_SIP_SDP_media_attribute_Exp & PX_SIP_SDP_media_transport_Exp
		* @param p_mediaType parameter for SDP media type supported by the IUT,
		* former PX_SIP_SDP_MEDIA_VIDEO
		*/
		template(value) SDP_media_desc m_media_unsupported(
		template(value) charstring p_mediaTransport,
		template(value) charstring p_mediaAttribute
		template(value) charstring p_mediaAttribute,
		template(value) charstring p_mediaType := "video"
		) := {
		media_field := {
		media := PX_SIP_SDP_MEDIA_VIDEO,
		media := p_mediaType,
		ports := {
		port_number := 11500,
		num_of_ports := omit
		@@ -3501,13 +3517,62 @@ module LibSip_Templates {
		// MRO
		template(present) SDP_attribute mw_attribute_sendonly_inactive := (mw_attribute_sendonly, mw_attribute_inactive);
		template SDP_attribute mw_attribute_sendrecv_recvonly_omit := (mw_attribute_sendrecv, mw_attribute_recvonly, omit);
		template(value) SDP_attribute m_attribute_AMR_DPT := {rtpmap := {attr_value := PX_SIP_SDP_DYN & " " & PX_SIP_SDP_MEDIA_TRANSPORT_AMR}}
		template(value) SDP_attribute m_attribute_CLEARMODE_DPT := {rtpmap := {attr_value := PX_SIP_SDP_DYN & " " & PX_SIP_SDP_MEDIA_TRANSPORT_CLE}}
		template(value) SDP_attribute m_attribute_G722 := {rtpmap := {attr_value := PX_SIP_SDP_ENCODING_ATTRIBUTE_G222}}
		template(value) SDP_attribute m_attribute_PCMU := {rtpmap := {attr_value := PX_SIP_SDP_ENCODING_ATTRIBUTE_PCMU}}
		template(value) SDP_attribute m_attribute_PCMU_DPT := {rtpmap := {attr_value := PX_SIP_SDP_DYN & " " & PX_SIP_SDP_MEDIA_TRANSPORT_PCMU}}
		template(value) SDP_attribute m_attribute_PCMA := {rtpmap := {attr_value := PX_SIP_SDP_ENCODING_ATTRIBUTE_PCMA}}
		template(value) SDP_attribute m_attribute_PCMA_DPT := {rtpmap := {attr_value := PX_SIP_SDP_DYN & " " & PX_SIP_SDP_MEDIA_TRANSPORT_PCMA}}
		template(value) SDP_attribute m_attribute_base(
		template(value) charstring p_attr_value
		) := {
		rtpmap := {
		attr_value := p_attr_value
		}
		}
		/**
		* @desc send template for a specific media attribute
		* @param attribte value, former PX_SIP_SDP_DYN & " " & PX_SIP_SDP_MEDIA_TRANSPORT_AMR
		*/
		template(value) SDP_attribute m_attribute_AMR_DPT(
		template(value) charstring p_attr_value := "0 AMR"
		) := m_attribute_base(p_attr_value);
		/**
		* @desc send template for a specific media attribute
		* @param attribte value, former PX_SIP_SDP_DYN & " " & PX_SIP_SDP_MEDIA_TRANSPORT_CLE
		*/
		template(value) SDP_attribute m_attribute_CLEARMODE_DPT(
		template(value) charstring p_attr_value := "0 CLEARMODE/8000"
		) := m_attribute_base(p_attr_value);
		/**
		* @desc send template for a specific media attribute
		* @param attribte value, former PX_SIP_SDP_ENCODING_ATTRIBUTE_G222
		*/
		template(value) SDP_attribute m_attribute_G722(
		template(value) charstring p_attr_value := "9 G722/8000"
		) := m_attribute_base(p_attr_value);
		/**
		* @desc send template for a specific media attribute
		* @param attribte value, former PX_SIP_SDP_ENCODING_ATTRIBUTE_PCMU
		*/
		template(value) SDP_attribute m_attribute_PCMU(
		template(value) charstring p_attr_value := "0 PCMU/8000"
		) := m_attribute_base(p_attr_value);
		/**
		* @desc send template for a specific media attribute
		* @param attribte value, former PX_SIP_SDP_DYN & " " & PX_SIP_SDP_MEDIA_TRANSPORT_PCMU
		*/
		template(value) SDP_attribute m_attribute_PCMU_DPT(
		template(value) charstring p_attr_value := "0 PCMU/8000"
		) := m_attribute_base(p_attr_value);
		/**
		* @desc send template for a specific media attribute
		* @param attribte value, former PX_SIP_SDP_ENCODING_ATTRIBUTE_PCMA
		*/
		template(value) SDP_attribute m_attribute_PCMA(
		template(value) charstring p_attr_value := "8 PCMA/8000"
		) := m_attribute_base(p_attr_value);
		/**
		* @desc send template for a specific media attribute
		* @param attribte value, former PX_SIP_SDP_DYN & " " & PX_SIP_SDP_MEDIA_TRANSPORT_PCMA
		*/
		template(value) SDP_attribute m_attribute_PCMA_DPT(
		template(value) charstring p_attr_value := "0 PCMA/8000"
		) := m_attribute_base(p_attr_value);
		// TODO: STF471 template name suggests that this is a send
		// template, while it contains matching mechanisms
		template(present) SDP_attribute mw_attribute_T38 := {