move v2.0.0 to the trunk (29698029) · Commits · TTCN-3 Libraries / LibIms

ttcn/LibIms_Interface.ttcn

+2 −5

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* @author STF 346, STF366, STF368, STF369		* @author STF 346, STF366, STF368, STF369, STF450
	* @version $Id$		* @version $Id$
	* @desc This module provides the types used by the test component		* @desc This module provides the types used by the test component
	* for SIP-IMS tests. Module become from STF306 and STF334-336		* for SIP-IMS tests. Module become from STF306 and STF334-336
			* This module is part of LibImsV2.
	*/		*/

	module LibIms_Interface		module LibIms_Interface
	@@ -24,16 +25,12 @@ module LibIms_Interface
	group AdressTypes		group AdressTypes
	{		{

	//Solution for building error problem. (Important for validation)
	//type component ImsComponent extends SipComponent need to be located in LibIms_Interface and not in LibSip_Interface module
	//With this solution TAU compiler error.
	type component ImsComponent extends SipComponent		type component ImsComponent extends SipComponent
	{		{
	// general variables		// general variables
	var ImsInterfaceProfile vc_interfaceprofile		var ImsInterfaceProfile vc_interfaceprofile
	} // end ImsComponent		} // end ImsComponent

	// type address WorkaroundAddress; //Remove it later
	}// end group AdressTypes		}// end group AdressTypes

ttcn/LibIms_PIXITS.ttcn

+8 −3

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* @author STF 346, STF366, STF368, STF369		* @author STF 346, STF366, STF368, STF369, STF450
	* @version $Id$		* @version $Id$
	* @desc This module provides the types used by the test component		* @desc This module provides the types used by the test component
	* for SIP-IMS tests. Module become from STF306 and STF334-336		* for SIP-IMS tests. Module become from STF306 and STF334-336
			* This module is part of LibImsV2.
	*/		*/

	module LibIms_PIXITS		module LibIms_PIXITS
	@@ -225,10 +226,14 @@ group EMERGENCY{
	/** @desc charstring for identity of the emergency service		/** @desc charstring for identity of the emergency service
	*/		*/
	modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE := "service:sos";		modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE := "service:sos";
			modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE_namespaceId := "service";
			modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE_namespaceSpecificString := "sos";

	/** @desc charstring for identity of the invalid emergency service		/** @desc charstring for identity of the invalid emergency service
	*/		*/
	modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE_INVALID := "service:sos.invalid";		modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE_INVALID := "service:sos.invalid";
			modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE_INVALID_namespaceId := "service";
			modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE_INVALID_namespaceSpecificString := "sos.invalid";
	}// end group EMERGENCY service		}// end group EMERGENCY service

	group SUT_IBCF {		group SUT_IBCF {

ttcn/LibIms_SIPTypesAndValues.ttcn

+3 −2

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* @author STF 346, STF366, STF368, STF369		* @author STF 346, STF366, STF368, STF369, STF450
	* @version $Id$		* @version $Id$
	* @desc This module provides the types and constants used by the test component		* @desc This module provides the types and constants used by the test component
	* for SIP tests.		* for SIP tests.
			* This module is part of LibImsV2.
	*/		*/

	module LibIms_SIPTypesAndValues		module LibIms_SIPTypesAndValues
	@@ -18,7 +19,7 @@ const integer c_ISUP_HOP_COUNT:=31; //TODO replace this value with appropriate P

	// URN scheme (RFC 5031)		// URN scheme (RFC 5031)
	// TODO NOTE: this definition is for temporary use		// TODO NOTE: this definition is for temporary use
	const charstring c_urnScheme := "urn";		// const charstring c_urnScheme := "urn"; // defined in LibSIPTyypesAndValues

	group UserProfileConstants		group UserProfileConstants
	{		{

ttcn/LibIms_Steps.ttcn

+330 −78

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/LibIms_Templates.ttcn

+114 −42

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* @author STF 346, STF366, STF368, STF369		* @author STF 346, STF366, STF368, STF369, STF450
	* @version $Id$		* @version $Id$
	* @desc This module provides the types used by the test component		* @desc This module provides the types used by the test component
	* for SIP-IMS tests. Module become from STF306 and STF334-336		* for SIP-IMS tests. Module become from STF306 and STF334-336
			* This module is part of LibImsV2.
	*/		*/

	module LibIms_Templates		module LibIms_Templates
	@@ -19,6 +20,7 @@ module LibIms_Templates
	import from LibSip_Steps all;		import from LibSip_Steps all;
	import from LibSip_PIXITS all;		import from LibSip_PIXITS all;
	import from LibSip_XMLTypes all;		import from LibSip_XMLTypes all;
			import from LibSip_MessageBodyTypes all;

	//LibIms		//LibIms
	import from LibIms_SIPTypesAndValues all;		import from LibIms_SIPTypesAndValues all;
	@@ -83,8 +85,9 @@ module LibIms_Templates
	displayName := *,		displayName := *,
	addrSpec := {		addrSpec := {
	scheme := "sip:",		scheme := "sip:",
			components := { sip:= {
	userInfo := *,		userInfo := *,
	hostPort := {p_host, p_port},		hostPort := {p_host, p_port}}},
	urlParameters := *,		urlParameters := *,
	headers := *		headers := *
	}		}
	@@ -98,12 +101,13 @@ group Subfields{
	template SipUrl m_SipUrl_currIpaddr_CSCF(in SipUserProfile p_userprofile) := //* SIP-URL of the test system on SIP side		template SipUrl m_SipUrl_currIpaddr_CSCF(in SipUserProfile p_userprofile) := //* SIP-URL of the test system on SIP side
	{		{
	scheme := c_sipScheme, //* contains "sip"		scheme := c_sipScheme, //* contains "sip"
			components := { sip:= {
	userInfo := omit, //* optional		userInfo := omit, //* optional
	hostPort :=		hostPort :=
	{		{
	host := p_userprofile.currIpaddr, //* hostname, IPv4 or IPv6 as a charstring		host := p_userprofile.currIpaddr, //* hostname, IPv4 or IPv6 as a charstring
	portField := p_userprofile.currPort //* optional integer		portField := p_userprofile.currPort //* optional integer
	},		}}},
	urlParameters := omit,		urlParameters := omit,
	headers := omit		headers := omit
	}		}
	@@ -158,13 +162,14 @@ group HeaderFieldTemplates{
	displayName := omit, // optional charstring		displayName := omit, // optional charstring
	addrSpec := {		addrSpec := {
	scheme := c_sipScheme,		scheme := c_sipScheme,
			components := { sip:= {
	userInfo := {		userInfo := {
	userOrTelephoneSubscriber := "registrar",		userOrTelephoneSubscriber := "registrar",
	password := omit		password := omit
	},		},
	hostPort := {		hostPort := {
	PX_IMS_TS_PCSCF_HOME_DOMAIN, PX_IMS_TS_PCSCF_PORT		PX_IMS_TS_PCSCF_HOME_DOMAIN, PX_IMS_TS_PCSCF_PORT
	},		}}},
	urlParameters := { { id := "lr", paramValue := omit}},		urlParameters := { { id := "lr", paramValue := omit}},
	headers := omit		headers := omit
	}		}
	@@ -199,7 +204,7 @@ group HeaderFieldTemplates{
	template PChargingFunctionAddresses m_pChargingFunctionAddresses_fixedValue :=		template PChargingFunctionAddresses m_pChargingFunctionAddresses_fixedValue :=
	{		{
	fieldName := P_CHARGING_FUNCTION_ADDRESSES_E,		fieldName := P_CHARGING_FUNCTION_ADDRESSES_E,
	chargeAddrParams := {{id:="ccf",paramValue :="192.1.1.1;"}, // value is fixed because it is deleted on proxy		chargeAddrParams := {{id:="ccf",paramValue :="192.1.1.1"}, // value is fixed because it is deleted on proxy
	{id:="ecf",paramValue :="192.1.1.2"}} // value is fixed because it is deleted on proxy		{id:="ecf",paramValue :="192.1.1.2"}} // value is fixed because it is deleted on proxy
	};		};

	@@ -219,16 +224,16 @@ group HeaderFieldTemplates{
	template PChargingVector m_pChargingVector_origIoi_fixedValue(charstring p_homeDomain) :=		template PChargingVector m_pChargingVector_origIoi_fixedValue(charstring p_homeDomain) :=
	{		{
	fieldName := P_CHARGING_VECTOR_E,		fieldName := P_CHARGING_VECTOR_E,
	chargeParams := {{id:=c_icid, paramValue :=c_icid_value &";"},		chargeParams := {{id:=c_icid, paramValue :=c_icid_value},
	{id:=c_icid_generated_at, paramValue :="192.1.1.10;"},		{id:=c_icid_generated_at, paramValue :="192.1.1.10"},
	{id:=c_orig_ioi, paramValue := p_homeDomain}}		{id:=c_orig_ioi, paramValue := p_homeDomain}}
	};		};

	template PChargingVector m_pChargingVector_termIoi_fixedValue(charstring p_homeDomain) :=		template PChargingVector m_pChargingVector_termIoi_fixedValue(charstring p_homeDomain) :=
	{		{
	fieldName := P_CHARGING_VECTOR_E,		fieldName := P_CHARGING_VECTOR_E,
	chargeParams := {{id:=c_icid, paramValue :=c_icid_value&";"},		chargeParams := {{id:=c_icid, paramValue :=c_icid_value},
	{id:=c_icid_generated_at, paramValue :="192.1.1.10;"},		{id:=c_icid_generated_at, paramValue :="192.1.1.10"},
	{id:=c_term_ioi, paramValue := p_homeDomain}}		{id:=c_term_ioi, paramValue := p_homeDomain}}
	};		};

	@@ -236,10 +241,18 @@ group HeaderFieldTemplates{
	{		{
	fieldName := P_CHARGING_VECTOR_E,		fieldName := P_CHARGING_VECTOR_E,
	chargeParams := {		chargeParams := {
	{id:=c_icid_generated_at, paramValue :="192.1.1.10;"},		{id:=c_icid_generated_at, paramValue :="192.1.1.10"},
	{id:=c_orig_ioi, paramValue := p_homeDomain}}		{id:=c_orig_ioi, paramValue := p_homeDomain}}
	};		};

			template PChargingVector m_pChargingVector_accessNetwInfo(charstring p_homeDomain) :=
			{
			fieldName := P_CHARGING_VECTOR_E,
			chargeParams := {{id:=c_icid, paramValue :=c_icid_value},
			{id:=c_term_ioi, paramValue := p_homeDomain},
			{id:=c_access_network_charging_info, paramValue := "192.1.1.10"}}
			};

	template PChargingVector mw_pChargingVector(template charstring p_id, template charstring p_paramValue) :=		template PChargingVector mw_pChargingVector(template charstring p_id, template charstring p_paramValue) :=
	{		{
	fieldName := P_CHARGING_VECTOR_E,		fieldName := P_CHARGING_VECTOR_E,
	@@ -266,7 +279,7 @@ group HeaderFieldTemplates{
	template PVisitedNetworkID m_pVisitedNetworkID_TS :=		template PVisitedNetworkID m_pVisitedNetworkID_TS :=
	{		{
	fieldName := P_VISITED_NETWORK_E,		fieldName := P_VISITED_NETWORK_E,
	vNetWorkSpec := {{vNetworkSpecToken := "Viseted ETSI 1",		vNetWorkSpec := {{vNetworkSpecToken := "Visited ETSI 1",
	genericParams := omit}}		genericParams := omit}}
	}		}

	@@ -288,12 +301,13 @@ group HeaderFieldTemplates{
	addrSpec :=		addrSpec :=
	{		{
	scheme := c_sipScheme, // contains "sip"		scheme := c_sipScheme, // contains "sip"
			components := { sip:= {
	userInfo := {userOrTelephoneSubscriber := "unknown", password := omit},		userInfo := {userOrTelephoneSubscriber := "unknown", password := omit},
	hostPort :=		hostPort :=
	{		{
	host := "unknown.domain.name", // hostname, IPv4 or IPv6 as a charstring		host := "unknown.domain.name", // hostname, IPv4 or IPv6 as a charstring
	portField := omit		portField := omit
	},		}}},
	urlParameters := omit,		urlParameters := omit,
	headers := omit		headers := omit
	}		}
	@@ -319,8 +333,9 @@ group HeaderFieldTemplates{
	fieldName := ROUTE_E,		fieldName := ROUTE_E,
	routeBody := {{nameAddr := {displayName := omit,		routeBody := {{nameAddr := {displayName := omit,
	addrSpec := {scheme := c_sipScheme, // contains "sip"		addrSpec := {scheme := c_sipScheme, // contains "sip"
			components := { sip:= {
	userInfo := omit,		userInfo := omit,
	hostPort := {host:=p_interfaceprofile.SUTHomeDomain, portField:= omit},		hostPort := {host:=p_interfaceprofile.SUTHomeDomain, portField:= omit}}},
	urlParameters := omit,		urlParameters := omit,
	headers := omit}		headers := omit}
	},		},
	@@ -338,12 +353,13 @@ group HeaderFieldTemplates{
	addrSpec :=		addrSpec :=
	{		{
	scheme := c_sipScheme, // contains "sip"		scheme := c_sipScheme, // contains "sip"
			components := { sip:= {
	userInfo := {userOrTelephoneSubscriber := "unknown", password := omit},		userInfo := {userOrTelephoneSubscriber := "unknown", password := omit},
	hostPort :=		hostPort :=
	{		{
	host := "unknown.domain.name", // hostname, IPv4 or IPv6 as a charstring		host := "unknown.domain.name", // hostname, IPv4 or IPv6 as a charstring
	portField := omit		portField := omit
	},		}}},
	urlParameters := omit,		urlParameters := omit,
	headers := omit		headers := omit
	}		}
	@@ -445,8 +461,8 @@ group HeaderFieldTemplates{

	template SemicolonParam_List mw_challenge := superset(mw_ck,mw_ik);		template SemicolonParam_List mw_challenge := superset(mw_ck,mw_ik);
	// template SemicolonParam_List mw_challenge := {mw_ck,mw_ik};		// template SemicolonParam_List mw_challenge := {mw_ck,mw_ik};
	template GenericParam mw_ck := {"ck",*};		template GenericParam mw_ck := {"ck"};
	template GenericParam mw_ik := {"ik",*}		template GenericParam mw_ik := {"ik"}


	/*		/*
	@@ -1119,8 +1135,8 @@ group ResourceListsTemplates {
	template EntryType m_EntryUser(SipUrl p_user) := {		template EntryType m_EntryUser(SipUrl p_user) := {

	uri :=		uri :=
	p_user.userInfo.userOrTelephoneSubscriber & "@" &		p_user.components.sip.userInfo.userOrTelephoneSubscriber & "@" &
	p_user.hostPort.host,		p_user.components.sip.hostPort.host,
	attr := {},		attr := {},
	display_name := omit,		display_name := omit,
	elem_list := {}		elem_list := {}
	@@ -1303,6 +1319,15 @@ group modified_templates {

	group request_send {		group request_send {

			template ACK_Request m_ACK_Request_AS (SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq,
			From p_from, To p_to, Via p_via, template Route p_route, template RecordRoute p_recordRoute ) modifies m_ACK_Request_Base :=
			{
			msgHeader :=
			{
			route := p_route,
			recordRoute := p_recordRoute
			}
			}

	template ACK_Request m_ACK_Request_IMS (SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq,		template ACK_Request m_ACK_Request_IMS (SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq,
	From p_from, To p_to, Via p_via, template Route p_route) modifies m_ACK_Request_Base :=		From p_from, To p_to, Via p_via, template Route p_route) modifies m_ACK_Request_Base :=
	@@ -1313,6 +1338,20 @@ group request_send {
	}		}
	}		}

			template ACK_Request m_ACK_Request_sdp_IMS (SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq,
			From p_from, To p_to, Via p_via,template MessageBody p_mb, template Route p_route)
			modifies m_ACK_Request_Base
			:=
			{
			msgHeader :=
			{
			contentLength := {fieldName := CONTENT_LENGTH_E, len:= f_MessageBodyLength(valueof(p_mb))},
			contentType := {fieldName := CONTENT_TYPE_E, mediaType := c_sdpAplication},
			route := p_route
			},
			messageBody := p_mb
			}

	template BYE_Request m_BYE_Request_IMS		template BYE_Request m_BYE_Request_IMS
	( SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq, From p_from, To p_to,		( SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq, From p_from, To p_to,
	Via p_via, template Route p_route)		Via p_via, template Route p_route)
	@@ -2344,6 +2383,12 @@ group request_receive {
	msgHeader := { via := p_via }		msgHeader := { via := p_via }
	}		}

			template BYE_Request mw_BYE_Request_route(template CallId p_callId, template Route p_route) modifies mw_BYE_Request_Base
			:=
			{
			msgHeader := {route := p_route}
			}

	template INVITE_Request mw_INVITE_Request_noPChargingFunction modifies mw_INVITE_Request_Base		template INVITE_Request mw_INVITE_Request_noPChargingFunction modifies mw_INVITE_Request_Base
	:=		:=
	{		{
	@@ -2611,6 +2656,13 @@ group request_receive {
	}		}
	}		}

			template MESSAGE_Request mw_MESSAGE_Request_route (template CallId p_callId, template Route p_route )modifies mw_MESSAGE_Request_Base
			:=
			{
			msgHeader := {route := p_route
			}
			}

	template MESSAGE_Request mw_MESSAGE_Request_via (template CallId p_callId, template Via p_via )modifies mw_MESSAGE_Request_Base		template MESSAGE_Request mw_MESSAGE_Request_via (template CallId p_callId, template Via p_via )modifies mw_MESSAGE_Request_Base
	:=		:=
	{		{
	@@ -2817,6 +2869,16 @@ group response_send
	messageBody := p_mb		messageBody := p_mb
	}		}

			template Response m_Response_18XonINVITE_AS (StatusLine p_statusLine, CallId p_callId, CSeq p_cSeq,
			From p_from, To p_to, Via p_via, Contact p_contact, template RecordRoute p_recordRoute ) modifies m_Response_Base:=
			{
			msgHeader :=
			{
			contact := p_contact,
			recordRoute := p_recordRoute
			}
			}

	template Response m_Response_18XonINVITE_UE (StatusLine p_statusLine, CallId p_callId, CSeq p_cSeq,		template Response m_Response_18XonINVITE_UE (StatusLine p_statusLine, CallId p_callId, CSeq p_cSeq,
	From p_from, To p_to, Via p_via, Contact p_contact ) modifies m_Response_Base:=		From p_from, To p_to, Via p_via, Contact p_contact ) modifies m_Response_Base:=
	{		{
	@@ -3531,6 +3593,16 @@ group response_receive
	}		}
	}		}

			template Response mw_Response_PchargingFunctionAddr(template StatusLine p_statusLine, template CallId p_callId,
			template CSeq p_cSeq, template PChargingFunctionAddresses p_chargingFunctionAddresses) modifies mw_Response_Base:=
			{
			statusLine := {sipVersion := c_sipNameVersion, statusCode := p_statusLine.statusCode, reasonPhrase := ?},
			msgHeader :=
			{
			pChargingFunctionAddresses := p_chargingFunctionAddresses
			}
			}

	} // end response_receive		} // end response_receive

	}//end modified_templates		}//end modified_templates

Admin message