Commit 15951c71 authored by pintar's avatar pintar
Browse files

error correction due to TTWorkbench 117 version

parent fa8080f4

ats/ttcn/AtsIms/AtsIms_Mw_TCFunctions.ttcn

+7 −16
Original line number Diff line number Diff line
@@ -2431,10 +2431,7 @@ module AtsIms_Mw_TCFunctions 
			// await INVITE UE1@SUT			

			f_awaitingINVITE(mw_INVITE_Request_IMS(

				mw_pChargingVector("icid-value",?),

				mw_recordroute(

					(mw_routeBody(f_initSipUrl(c_interfaceSIPURL_IMS_SUT_PCSCF1_ip)),

			 		 mw_routeBody(f_initSipUrl(c_interfaceSIPURL_IMS_SUT_PCSCF1_domain))) 

							   ),

				mw_recordroute(	mw_routeBody(mw_SipUrl_Host((PX_IMS_SUT_PCSCF1_IPADDR,PX_IMS_SUT_PCSCF1_HOME_DOMAIN)))),

				mw_route({mw_routeBody(f_initSipUrl(c_userProfile_SCSCFwithHomeUE))}),

			    mw_Via(mw_ViaBody_interface(f_get_interfaceHostPort(vc_interfaceprofile))) // interfaceProfile_IMS_SUT_PCSCF

				));
@@ -4541,9 +4538,8 @@ module AtsIms_Mw_TCFunctions 
			f_awaitingBYE_sendReply(mw_BYE_Request_via_PChargingVector_UE(

				vc_callId, 

				mw_pChargingVector(complement("icid-value"),?) ifpresent,

				mw_Via((mw_ViaBody_interface(f_get_interfaceHostPort(vc_interfaceprofile)),

						mw_ViaBody_interface(f_get_interfaceDomainPort(vc_interfaceprofile))

								)) //c_interfaceProfile_IMS_SUT_PCSCF1

				mw_Via(mw_ViaBody(mw_hostPort((PX_IMS_SUT_PCSCF1_IPADDR,PX_IMS_SUT_PCSCF1_HOME_DOMAIN) ))

								)

				));

	

			f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());// sync point test body done
@@ -4910,9 +4906,8 @@ module AtsIms_Mw_TCFunctions 
		    f_awaitingResponse(mw_Response_RecordRoute((c_statusLine200),

		    											vc_callId, 

		    											vc_cSeq, 

		    											mw_recordroute((mw_routeBody(f_initSipUrl(c_interfaceSIPURL_IMS_SUT_PCSCF1_ip)),

																		mw_routeBody(f_initSipUrl(c_interfaceSIPURL_IMS_SUT_PCSCF1_domain))) 

														)));

		    											mw_recordroute(	mw_routeBody(mw_SipUrl_Host((PX_IMS_SUT_PCSCF1_IPADDR,PX_IMS_SUT_PCSCF1_HOME_DOMAIN)))) 

														));



			f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());// sync point test body done

			// POSTAMBLE
@@ -4970,12 +4965,8 @@ module AtsIms_Mw_TCFunctions 
			f_SendACK(m_ACK_Request_Base(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via));

			

			// await reINVITE with Via and Record-Route

			f_awaitingINVITE(mw_INVITE_Request_RecordRoute_Via(mw_recordroute(

																			  (mw_routeBody(f_initSipUrl(c_interfaceSIPURL_IMS_SUT_PCSCF1_ip)),

																			   mw_routeBody(f_initSipUrl(c_interfaceSIPURL_IMS_SUT_PCSCF1_domain))) 

					   														 ),

															   mw_Via((mw_ViaBody_interface(f_get_interfaceHostPort(vc_interfaceprofile)),

																	   mw_ViaBody_interface(f_get_interfaceDomainPort(vc_interfaceprofile))))

			f_awaitingINVITE(mw_INVITE_Request_RecordRoute_Via(mw_recordroute(mw_routeBody(mw_SipUrl_Host((PX_IMS_SUT_PCSCF1_IPADDR,PX_IMS_SUT_PCSCF1_HOME_DOMAIN)))),

															   mw_Via(mw_ViaBody(mw_hostPort((PX_IMS_SUT_PCSCF1_IPADDR,PX_IMS_SUT_PCSCF1_HOME_DOMAIN))))

															  ));

			

			f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());// sync point test body done

ats/ttcn/LibIms/LibIms_Templates.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -1188,9 +1188,9 @@ group response_receive 
		statusLine := {sipVersion := c_sipNameVersion, statusCode := p_statusLine.statusCode, reasonPhrase := ?},

		msgHeader :=

		{

			pAssociatedURI := {fieldName := P_ASSOCIATED_URI_E, nameAddrList:={*,{nameAddr:={addrSpec:=p_ue_uri}},*}},

			pAssociatedURI := {fieldName := P_ASSOCIATED_URI_E, nameAddrList:={*,{nameAddr:={displayName:=*,addrSpec:=p_ue_uri},genericParams:=*},*}},

			path := ?,

			serviceRoute := {fieldName := SERVICE_ROUTE_E, routeBody := {{nameAddr:={addrSpec:=p_sut_scscf_uri}}}},

			serviceRoute := {fieldName := SERVICE_ROUTE_E, routeBody := {{nameAddr:={displayName:=*,addrSpec:=p_sut_scscf_uri},rrParam:=*}}},

			pChargingFunctionAddresses := ?,

			pChargingVector := ?,

			contact := p_contact

ats/ttcn/LibSip/LibSip_Templates.ttcn

+22 −0
Original line number Diff line number Diff line
@@ -158,6 +158,15 @@ module LibSip_Templates 
		  headers := *

		};



		template SipUrl mw_SipUrl_Host(charstring p_host) :=  	// SIP-URL with a calling party number

		{

				scheme := c_sipScheme,  		// contains "sip"

				userInfo:= {userOrTelephoneSubscriber:=*, password:=*},

				hostPort := {host:=p_host, portField:=*},

				urlParameters := *,

				headers := *

		};



		template SipUrl mw_SipUrl_Anonymous :=  	// SIP-URL with a calles party number

		{

		  scheme := c_sipScheme,  		// contains "sip"
@@ -182,6 +191,12 @@ module LibSip_Templates 
		  contactParams := *

		};



		template HostPort mw_hostPort(template charstring p_host) :=

		{

		  host  := p_host,

		  portField := *

		};

		

		template StatusLine mw_statusLine1xx   := {sipVersion := c_sipNameVersion, statusCode := (100..199), reasonPhrase := ?};

		template StatusLine mw_statusLine4xx   := {sipVersion := c_sipNameVersion, statusCode := (400..499), reasonPhrase := ?};

		template StatusLine mw_statusLineFinal := {sipVersion := c_sipNameVersion, statusCode := (200..699), reasonPhrase := ?};
@@ -384,6 +399,13 @@ module LibSip_Templates 
		  viaParams:={{id :=c_branchId,paramValue :=branch_val}}

		}

		

		template ViaBody mw_ViaBody(HostPort p_hostport) :=

		{

		  sentProtocol := m_SentProtocol(PX_SIP_TRANSPORT),

		  sentBy:= p_hostport,

		  viaParams:=*

		}

		

		template ViaBody mw_ViaBody_interface(HostPort p_hostport) :=

		{

		  sentProtocol := m_SentProtocol(PX_SIP_TRANSPORT),