Commit 52fd7f7b authored by pintar's avatar pintar
Browse files

Changes done due to validation phase on STF406 in weeks 13 and 14. 

Validation was done with Italtel AS as SUT and with IMS UE MyMonster and IMS Communicator.
parent 374afc3e

CDIV/CDIV_TC_Functions.ttcn

+420 −456

File changed.

Preview size limit exceeded, changes collapsed.

CDIV/CDIV_Templates.ttcn

+10 −3
Original line number Original line Diff line number Diff line
@@ -284,7 +284,8 @@ group MessageTemplates{ 
    template GenericParam mw_Privacy_gen (template charstring p_privacy):=

    template GenericParam mw_Privacy_gen (template charstring p_privacy):=

        {id:="privacy", paramValue:= pattern "*{p_privacy}*"}

        {id:="privacy", paramValue:= pattern "*{p_privacy}*"}

			

			



    template GenericParam m_Privacy_gen (template charstring p_privacy):=

        {id:="privacy", paramValue:= p_privacy}

    

    

    template Route m_route_interface_CDIV (in ImsInterfaceProfile p_interfaceprofile,in SipUserProfile p_userprofile, charstring p_destination):=

    template Route m_route_interface_CDIV (in ImsInterfaceProfile p_interfaceprofile,in SipUserProfile p_userprofile, charstring p_destination):=

    {   

    {
@@ -292,7 +293,7 @@ group MessageTemplates{ 
        routeBody := {{nameAddr := {displayName := omit, 

        routeBody := {{nameAddr := {displayName := omit, 

                                   addrSpec := 	{scheme := c_sipScheme,  			// contains "sip"

                                   addrSpec := 	{scheme := c_sipScheme,  			// contains "sip"

                                                userInfo := omit,

                                                userInfo := omit,

                                                hostPort := {host:=p_interfaceprofile.SUTHomeDomain, portField:= omit},

                                                hostPort := {host:=p_interfaceprofile.SUTIpaddr, portField:= omit},

                                                urlParameters := {{"call",p_destination},{"lr",omit}},

                                                urlParameters := {{"call",p_destination},{"lr",omit}},

                                                headers := omit}

                                                headers := omit}

                                   },

                                   },
@@ -329,9 +330,15 @@ group MessageTemplates{ 
        nameAddr:=mw_NameAddr_DName_User_Host(p_dn,p_user,p_host)

        nameAddr:=mw_NameAddr_DName_User_Host(p_dn,p_user,p_host)

    }

    }





    template GenericParam m_Cause_num (template charstring p_cause):=

        {id:="cause", paramValue:=p_cause}



    template GenericParam mw_Cause_num (template charstring p_cause):=

    template GenericParam mw_Cause_num (template charstring p_cause):=

        {id:="cause", paramValue:=p_cause}

        {id:="cause", paramValue:=p_cause}

        

        

    template GenericParam mw_reason (template charstring p_reason):=

        {id:="reason", paramValue:=p_reason}



		

		

    template SipUrl m_SipUrl_NumHost(template charstring p_number, template charstring p_host, template SemicolonParam_List p_urlParameters) :=  	//*  SIP-URL with a calling party number

    template SipUrl m_SipUrl_NumHost(template charstring p_number, template charstring p_host, template SemicolonParam_List p_urlParameters) :=  	//*  SIP-URL with a calling party number

    {

    {