Commit e2944376 authored by rennoch's avatar rennoch
Browse files

correction of template restrictions

parent 78ead376

DiameterCxDx/ttcn/DiameterCxDx_Cx_TCFunctions.ttcn3

+4 −4
Original line number Diff line number Diff line
@@ -2704,8 +2704,8 @@ module DiameterCxDx_Cx_TCFunctions { 
                                ),

                                {                                                       // containing more than one Public-Identity AVP

                                                                                        //     indicating a user identity

                                    vc_publicIdentity,

                                    m_publicIdentity(PX_OtherPublicIdentity)

                                    valueof(vc_publicIdentity),

                                    mw_publicIdentity(PX_OtherPublicIdentity)

                                }

                    )));

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
@@ -2864,7 +2864,7 @@ module DiameterCxDx_Cx_TCFunctions { 
                                ),

                                {                                                       // containing more than one Public-Identity AVP

                                                                                        //     indicating a public service identity matching the wildcarded public service identity provided by the SA-Request message

                                    vc_publicIdentity

                                    valueof(vc_publicIdentity)

                                }

                    )));

                    if (ispresent(vc_recvDiamMsg.rTR_MSG.rTR_Body.public_Identity)) {           // not containing a list of Public-Identity AVP
@@ -2919,7 +2919,7 @@ module DiameterCxDx_Cx_TCFunctions { 
                                ),

                                {                                                       // containing more than one Public-Identity AVP

                                                                                        //     indicating a public service identity matching the wildcarded public service identity provided by the SA-Request message

                                    vc_publicIdentity

                                    valueof(vc_publicIdentity)

                                }

                    )));

                    if (ispresent(vc_recvDiamMsg.rTR_MSG.rTR_Body.public_Identity)) {           // not containing a list of Public-Identity AVP

DiameterCxDx/ttcn/DiameterCxDx_Dx_TCFunctions.ttcn3

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ module DiameterCxDx_Dx_TCFunctions { 
                                    m_serverAssignmentType(UNREGISTERED_USER_E),

                                    m_userDataAlreadyAvailable(USER_DATA_NOT_AVAILABLE_E),

                                    omit,

                                    vc_publicIdentity

                                    valueof(vc_publicIdentity)

                                )

                ));

DiameterCxDx/ttcn/DiameterCxDx_SIP_TCFunctions.ttcn3

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ module DiameterCxDx_SIP_TCFunctions { 


                f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync - postamble done

                // SendBYE and await response

                f_terminateCall_UE(vc_requestUri, vc_callId, vc_cSeq,

                f_terminateCall_UE(vc_requestUri, valueof(vc_callId), vc_cSeq,

                                   vc_caller_From, vc_caller_To);

                

                f_RemoveRegistration(vc_cSeq); // deregistration in SUT

DiameterCxDx/ttcn/DiameterCxDx_Steps.ttcn

+6 −6
Original line number Diff line number Diff line
@@ -308,9 +308,9 @@ 
        vc_userprofile.registrarDomain := PX_OriginRealm;

        vc_userprofile.privUsername := PX_UserName;

        LibIms_Steps.f_setHeadersINVITE(p_cSeq_s, vc_requestUri);

        f_SendINVITE(m_INVITE_Request_UE_Diameter(vc_requestUri, vc_callId,

        f_SendINVITE(m_INVITE_Request_UE_Diameter(vc_requestUri, valueof(vc_callId),

                                         p_cSeq_s, vc_from, vc_to,

                                         vc_via, vc_contact, omit,

                                         vc_via, valueof(vc_contact), omit,

                                         vc_route_REG, omit,

                                         m_MBody_SDP(vc_sdp_local)));

        // await response - 200
@@ -518,7 +518,7 @@ 
                                m_serverAssignmentType(p_serverAssignmentType),

                                m_userDataAlreadyAvailable(USER_DATA_NOT_AVAILABLE_E),

                                omit,

                                vc_publicIdentity

                                valueof(vc_publicIdentity)

                            )

            ));

            f_awaiting_SAA(mw_SAA_Msg(vc_sessionId, mw_SAA_Body_dummy))
@@ -537,7 +537,7 @@ 
			if(ispresent(p_resultCode)){

				v_resultCodeAvp := m_resultCode(valueof(p_resultCode));

			}else if(ispresent(p_expResultCode)){

				v_expResultAvp := m_experimentalResult(p_expResultCode);

				v_expResultAvp := m_experimentalResult(valueof(p_expResultCode));

			}

            

			v_UAA := m_UAA_basic(vc_originHost, vc_originRealm,
@@ -555,9 +555,9 @@ 
            var template (value) MAA_Body_AVP            v_MAA;

            

            if(ispresent(p_resultCode)){

                v_resultCodeAvp := m_resultCode(p_resultCode);

                v_resultCodeAvp := m_resultCode(valueof(p_resultCode));

            }else if(ispresent(p_expResultCode)){

                v_expResultAvp := m_experimentalResult(p_expResultCode);

                v_expResultAvp := m_experimentalResult(valueof(p_expResultCode));

            }

            

            v_MAA := m_MAA_basic(vc_originHost, vc_originRealm,

DiameterCxDx/ttcn/DiameterCxDx_Templates.ttcn

+75 −75

File changed.

Preview size limit exceeded, changes collapsed.