Commit e4867c72 authored by pintar's avatar pintar
Browse files

- sip string was replaced with existing constant c_sipScheme 

- new template mw_AddrUnion_userInfo added (wrong template was used to check P_Asserted_ID)
- set of userInfo field on omit value instead of hard coded string
- introduction of PIXIT PX_IMS_SUT_ICSCF_VisitedNetworkID
parent cdf993d9

ttcn/LibIms_Templates.ttcn

+19 −8
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ module LibIms_Templates 
        {

        {

            displayName := *,

            displayName := *,

            addrSpec := {

            addrSpec := {

                scheme := "sip:",

                scheme := c_sipScheme,

                components := { sip:= {

                components := { sip:= {

                    userInfo := *,

                    userInfo := *,

                    hostPort := {p_host, p_port}}},

                    hostPort := {p_host, p_port}}},
@@ -95,6 +95,20 @@ module LibIms_Templates 
		

		

    template Addr_Union mw_UE1_Addr_display := {nameAddr:={displayName:=PX_IMS_SUT_UE1_DISPLAY,addrSpec:=?}};

    template Addr_Union mw_UE1_Addr_display := {nameAddr:={displayName:=PX_IMS_SUT_UE1_DISPLAY,addrSpec:=?}};

    

    

    template Addr_Union mw_AddrUnion_userInfo(template (present) charstring p_userInfo) := 

        {

            nameAddr:={displayName := *,

                addrSpec := {

                    scheme := c_sipScheme,

                    components := { sip:= {

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

                        hostPort := ?}},

                    urlParameters := *,

                    headers := *

                }

            }

        }

	

group Subfields{

group Subfields{
@@ -163,10 +177,7 @@ group HeaderFieldTemplates{ 
                    addrSpec := {

                    addrSpec := {

                        scheme := c_sipScheme,

                        scheme := c_sipScheme,

                        components := { sip:= {

                        components := { sip:= {

                            userInfo := {

                            userInfo := omit,

                                userOrTelephoneSubscriber := "registrar",

                                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

                            }}},

                            }}},
@@ -279,7 +290,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 := "Visited ETSI 1",

      vNetWorkSpec := {{vNetworkSpecToken := PX_IMS_SUT_ICSCF_VisitedNetworkID,

         genericParams := omit}}

         genericParams := omit}}

    }

    }
@@ -461,8 +472,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", *}

		

		

		

		

    /*

    /*