Commit 01e3a95d authored by rennoch's avatar rennoch
Browse files

removal of type conflicts

parent ac42435b

DiameterCxDx/ttcn/DiameterCxDx_Cx_TCFunctions.ttcn3

+13 −13
Original line number Diff line number Diff line
@@ -2300,7 +2300,7 @@ module DiameterCxDx_Cx_TCFunctions { 
                        )

                    );

                    // Check Result Code in vc_recvDiamMsg

                    if (ispresent(vc_recvDiamMsg.sAA_MSG)) {

                    if (ischosen(vc_recvDiamMsg.sAA_MSG)) {

                        

                        if ( // containing a Result-Code AVP 

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

                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);

                    } else if (

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code != PERMANENT_TERMINATION_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code != SERVER_CHANGE_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code != REMOVE_S_CSCF_E) 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code.aVP_Data != PERMANENT_TERMINATION_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code.aVP_Data != SERVER_CHANGE_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code.aVP_Data != REMOVE_S_CSCF_E) 

                    ) {

                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);

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

                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);

                    } else if (

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code != PERMANENT_TERMINATION_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code != SERVER_CHANGE_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code != REMOVE_S_CSCF_E) 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code.aVP_Data != PERMANENT_TERMINATION_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code.aVP_Data != SERVER_CHANGE_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code.aVP_Data != REMOVE_S_CSCF_E) 

                    ) {

                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);

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

                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);

                    } else if (

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code != PERMANENT_TERMINATION_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code != SERVER_CHANGE_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code != REMOVE_S_CSCF_E) 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code.aVP_Data != PERMANENT_TERMINATION_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code.aVP_Data != SERVER_CHANGE_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code.aVP_Data != REMOVE_S_CSCF_E) 

                    ) {

                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);

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

                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);

                    } else if (

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code != PERMANENT_TERMINATION_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code != SERVER_CHANGE_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code != REMOVE_S_CSCF_E) 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code.aVP_Data != PERMANENT_TERMINATION_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code.aVP_Data != SERVER_CHANGE_E) and 

                        (vc_recvDiamMsg.rTR_MSG.rTR_Body.deregistration_Reason.reason_Code.aVP_Data != REMOVE_S_CSCF_E) 

                    ) {

                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);

                    } else {

DiameterCxDx/ttcn/DiameterCxDx_Templates.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -1094,7 +1094,7 @@ module DiameterCxDx_Templates { 
                                                                                           template (omit) Server_Assignment_Type_AVP      p_serverAssignmentType,

                                                                                           template (omit) User_Data_Already_Available_AVP p_userDataAlreadyAvailable,

                                                                                           template (omit) User_Name_AVP                   p_userName,

                                                                                           template (value) Public_Identities_AVP p_publicIdentities

                                                                                           template (value) Public_Identity_AVPs p_publicIdentities

                                                                                         )

                modifies m_SAR_basic := {

                    user_Name := p_userName,
@@ -1151,7 +1151,7 @@ module DiameterCxDx_Templates { 
                                                                      template (present) Destination_Realm_AVP     p_destinationRealm,

                                                                      template (present) User_Name_AVP             p_userName,

                                                                      template (present) Deregistration_Reason_AVP p_deregistrationReason,

                                                                      template (present) Public_Identities_AVP p_publicIdentity

                                                                      template (present) Public_Identity_AVPs p_publicIdentity

                ) modifies mw_RTR_basic := {

                    public_Identity := p_publicIdentity //optional TS129 229

                }