Commit 6f29bf2c authored by garciay's avatar garciay
Browse files

Moved S6a messages into LibDiameter_Types_S6a_AVPs module

Add S6a messages AVPs into DIAMETER_MSG
parent f4c6e9f4
Loading
Loading
Loading
Loading
+11 −8
Original line number Diff line number Diff line
@@ -16,15 +16,18 @@ module DiameterS6a_HSS_TCFunctions {
    //import from LibCommon_VerdictControl all;
    
    // LibDiameter 
    import from LibDiameter_TypesAndValues {
        type DIAMETER_MSG
    };
    import from LibDiameter_Steps {
        function f_getVerdict
    };
    
    // DiameterS6a
    import from DiameterS6a_TypesAndValues {
        type 
            DIAMETER_S6a_HSS_Initiated_Message
    };
//    import from DiameterS6a_TypesAndValues {
//        type 
//            DIAMETER_S6a_HSS_Initiated_Message
//    };
    import from DiameterS6a_Templates all; 
    import from DiameterS6a_PIXITS all;
    import from DiameterS6a_Steps {
@@ -188,7 +191,7 @@ module DiameterS6a_HSS_TCFunctions {
        function f_TC_HSS_UL_03() runs on TestAdapter {
            
            // Local variables
            var DIAMETER_S6a_HSS_Initiated_Message v_result;
            var DIAMETER_MSG v_result;
            
            // Preamble
            f_preamble_HSS();
@@ -218,13 +221,13 @@ module DiameterS6a_HSS_TCFunctions {
                                    mw_experimentalResultCode(          //     containing an Experimental-Result-Code AVP
                                        DIAMETER_ERROR_USER_UNKNOWN_E   //     indicating DIAMETER_ERROR_USER_UNKNOWN
                )))))) -> value v_result { // Expected ULR-Answer message 
                    if (ispresent(v_result.s6a_CCA_MSG.uLA_Body.result_Code)) { // not containing a Result-Code AVP
                    if (ispresent(v_result.uLA_MSG.uLA_Body.result_Code)) { // not containing a Result-Code AVP
                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                        log("*** " & __SCOPE__ & ": FAIL: Result-Code AVP was not expected here. ***");
                    } else if(ispresent(v_result.s6a_CCA_MSG.uLA_Body.ula_Flags)) { // not containing a ULA-Flags AVP
                    } else if(ispresent(v_result.uLA_MSG.uLA_Body.ula_Flags)) { // not containing a ULA-Flags AVP
                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                        log("*** " & __SCOPE__ & ": FAIL: ULA-Flags AVP was not expected here. ***");
                    } else if(ispresent(v_result.s6a_CCA_MSG.uLA_Body.subscription_Data)) { // not containing a Subscription-Data AVP
                    } else if(ispresent(v_result.uLA_MSG.uLA_Body.subscription_Data)) { // not containing a Subscription-Data AVP
                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                        log("*** " & __SCOPE__ & ": FAIL: Subscription-Data AVP was not expected here. ***");
                    } else {
+7 −6
Original line number Diff line number Diff line
@@ -18,13 +18,14 @@
    //import from LibCommon_VerdictControl all ;

    // LibDiameter
    import from LibDiameter_TypesAndValues {
        type DIAMETER_MSG
    };
    import from LibDiameter_Types_S6a_AVPs {
        type ULR_MSG
    };
    
    // DiameterS6a
    import from DiameterS6a_TypesAndValues {
        type 
            DIAMETER_S6a_MME_Initiated_Message, 
            ULR_MSG
    };
    import from DiameterS6a_PIXITS {
        group 
            ipSettings, fieldValues
@@ -164,7 +165,7 @@
        function f_triggerUlrMessage ( template (value) ULR_MSG p_ulrMSG ) 
        runs on TestAdapter {
            MME_S6a.send(
                DIAMETER_S6a_MME_Initiated_Message: { s6a_ULR_MSG := p_ulrMSG } 
                DIAMETER_MSG : { uLR_MSG := p_ulrMSG } 
            );
        } // End of function f_awaiting_ULR
        
+43 −83
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ module DiameterS6a_Templates {
                    c_result_Code_AVP_Code, c_experimental_Result_AVP_Code, c_experimental_Result_Code_AVP_Code
    };
    import from LibDiameter_Templates  {
        template    m_sessionId_dummy, m_auth_Session_State_dummy, m_originHost_dummy, m_originRealm_dummy,
        template    m_diameterHeaderReq_dummy, mw_diameterHeaderReq_dummy, mw_diameterHeaderAns_dummy, m_diameterHeaderAns_dummy, 
                    m_sessionId_dummy, m_auth_Session_State_dummy, m_originHost_dummy, m_originRealm_dummy,
                    m_destinationRealm_dummy, m_destinationHost_dummy, m_user_Name_dummy, m_aVP_HeaderVid_Mbit1, m_cmdFlagsReq,
                    m_vendor_Specific_Appl_Id_dummy, m_auth_Session_State_dummy, m_destinationRealm_dummy, m_user_Identity_dummy, m_data_Reference_dummy, m_user_Data_dummy, 
                    mw_cmdFlags, m_cmdFlagsAns, 
@@ -51,47 +52,6 @@ module DiameterS6a_Templates {
    } // End of group SubFields

    group HeaderFieldTemplates {
        template (value) S6aDiameterHeader m_s6adiameterHeaderReq_dummy (    in S6a_Command_Code p_cmdcode, in UInt32 p_applid ) := {
            version     := c_versionId,
            msglen      := 0,                //Message lenght with AVPs has to be calculated
            cmdflags    := m_cmdFlagsReq,    //RPETrrrr
            cmdcode     := p_cmdcode,
            applid      := p_applid,
            hopid       := 0,
            endid       := 0
        } // End of template m_s6adiameterHeaderReq_dummy
        
        template (present) S6aDiameterHeader mw_s6adiameterHeaderReq_dummy (    in S6a_Command_Code p_cmdcode,
                                                                                in template (present) UInt32 p_applid ) := {
            version     := c_versionId,
            msglen      := ?,
            cmdflags    := mw_cmdFlags,
            cmdcode     := p_cmdcode,
            applid      := p_applid,
            hopid       := ?,
            endid       := ?
        } // End of template mw_s6adiameterHeaderReq_dummy
        
        template (value) S6aDiameterHeader m_s6adiameterHeaderAns_dummy ( in S6a_Command_Code p_cmdcode, in UInt32 p_applid ) := {
            version         := c_versionId,
            msglen          := 0,                //Message lenght with AVPs has to be calculated
            cmdflags        := m_cmdFlagsAns,    //RPETrrrr
            cmdcode         := p_cmdcode,
            applid          := p_applid,
            hopid           := 0,
            endid           := 0
        } // End of template mw_s6adiameterHeaderAns_dummy
        
        template (present) S6aDiameterHeader mw_s6adiameterHeaderAns_dummy (    in S6a_Command_Code p_cmdcode,
                                                                                in template (present) UInt32 p_applid ) := {
            version         := c_versionId,
            msglen          := ?,
            cmdflags        := mw_cmdFlagsAns,
            cmdcode         := p_cmdcode,
            applid          := p_applid,
            hopid           := ?,
            endid           := ?
        } // End of template mw_s6adiameterHeaderAns_dummy
        
        template (present) Command_Flags mw_cmdFlagsAns := {
            r_bit           := '0'B,            //Answer message
@@ -99,7 +59,7 @@ module DiameterS6a_Templates {
            e_bit           := ?,
            t_bit           := ?,
            reserved_bits    := '0000'B
        } // End of template mw_s6adiameterHeaderAns_dummy
        } // End of template mw_diameterHeaderAns_dummy
        
        group DummyAVPHeaders{
            
@@ -348,7 +308,7 @@ module DiameterS6a_Templates {
            
            group S6aDummy_request_templates_send {
                template (value) ULR_MSG m_S6a_ULR_dummy := {
                    header      := m_s6adiameterHeaderReq_dummy ( ULx_E, c_applId_S6a ),
                    header      := m_diameterHeaderReq_dummy ( ULx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    uLR_Body    := m_S6a_ULR_Body_dummy
                } // End of template m_S6a_ULR_dummy
@@ -376,7 +336,7 @@ module DiameterS6a_Templates {
                } // End of template m_S6a_ULR_Body_dummy

                template (value) AIR_MSG m_S6a_AIR_dummy := {
                    header      := m_s6adiameterHeaderReq_dummy ( AIx_E, c_applId_S6a ),
                    header      := m_diameterHeaderReq_dummy ( AIx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    aIR_Body    := m_S6a_AIR_Body_dummy
                } // End of template m_S6a_AIR_dummy
@@ -398,7 +358,7 @@ module DiameterS6a_Templates {
                } // End of template m_S6a_AIR_Body_dummy

                template (value) CLR_MSG m_S6a_CLR_dummy := {
                    header      := m_s6adiameterHeaderReq_dummy ( CLx_E, c_applId_S6a ),
                    header      := m_diameterHeaderReq_dummy ( CLx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    cLR_Body    := m_S6a_CLR_Body_dummy
                } // End of template m_S6a_CLR_dummy
@@ -420,7 +380,7 @@ module DiameterS6a_Templates {
                } // End of template m_S6a_CLR_dummy

                template (value) IDR_MSG m_S6a_IDR_dummy := {
                    header      := m_s6adiameterHeaderReq_dummy ( IDx_E, c_applId_S6a ),
                    header      := m_diameterHeaderReq_dummy ( IDx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    iDR_Body    := m_S6a_IDR_Body_dummy
                } // End of template m_S6a_IDR_dummy
@@ -442,7 +402,7 @@ module DiameterS6a_Templates {
                } // End of template m_S6a_IDR_Body_dummy

                template (value) DSR_MSG m_S6a_DSR_dummy := {
                    header      := m_s6adiameterHeaderReq_dummy ( DSx_E, c_applId_S6a ),
                    header      := m_diameterHeaderReq_dummy ( DSx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    dSR_Body    := m_S6a_DSR_Body_dummy
                } // End of template m_S6a_DSR_dummy
@@ -466,8 +426,8 @@ module DiameterS6a_Templates {
                    aVP_Type                        := omit
                } // End of template m_S6a_DSR_Body_dummy

                template (value) S6a_PUR_MSG m_S6a_PUR_dummy := {
                    header      := m_s6adiameterHeaderReq_dummy ( PUx_E, c_applId_S6a ),
                template (value) PUR_MSG m_S6a_PUR_dummy := {
                    header      := m_diameterHeaderReq_dummy ( PUx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    pUR_Body    := m_S6a_PUR_Body_dummy
                } // End of template m_S6a_PUR_dummy
@@ -491,7 +451,7 @@ module DiameterS6a_Templates {
                } // End of template m_S6a_PUR_Body_dummy

                template (value) RSR_MSG m_S6a_RSR_dummy := {
                    header      := m_s6adiameterHeaderReq_dummy ( RSx_E, c_applId_S6a ),
                    header      := m_diameterHeaderReq_dummy ( RSx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    rSR_Body    := m_S6a_RSR_Body_dummy
                } // End of template m_S6a_RSR_dummy
@@ -511,7 +471,7 @@ module DiameterS6a_Templates {
                } // End of template m_S6a_RSR_Body_dummy

                template (value) NOR_MSG m_S6a_NOR_dummy := {
                    header      := m_s6adiameterHeaderReq_dummy ( NOx_E, c_applId_S6a ),
                    header      := m_diameterHeaderReq_dummy ( NOx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    nOR_Body    := m_S6a_NOR_Body_dummy
                } // End of template m_S6a_NOR_dummy
@@ -543,7 +503,7 @@ module DiameterS6a_Templates {
            group S6aDummy_request_templates_receive {
                
                template (present) ULR_MSG mw_S6a_uLR_dummy := {
                    header      := mw_s6adiameterHeaderReq_dummy ( ULx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderReq_dummy ( ULx_E, c_applId_S6a ),
                    session_Id  := ?,
                    uLR_Body    := mw_S6a_ULR_Body_dummy
                } // End of template mw_S6a_uLR_dummy
@@ -572,7 +532,7 @@ module DiameterS6a_Templates {
                } // End of template mw_S6a_ULR_Body_dummy

                template (present) AIR_MSG mw_S6a_AIR_dummy := {
                    header      := mw_s6adiameterHeaderReq_dummy ( AIx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderReq_dummy ( AIx_E, c_applId_S6a ),
                    session_Id  := ?,
                    aIR_Body    := mw_S6a_AIR_Body_dummy
                } // End of template mw_S6a_AIR_dummy
@@ -595,7 +555,7 @@ module DiameterS6a_Templates {
                } // End of template mw_S6a_AIR_Body_dummy

                template (present) CLR_MSG mw_S6a_CLR_dummy := {
                    header      := mw_s6adiameterHeaderReq_dummy ( CLx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderReq_dummy ( CLx_E, c_applId_S6a ),
                    session_Id  := ?,
                    cLR_Body    := mw_S6a_CLR_Body_dummy
                } // End of template mw_S6a_CLR_dummy
@@ -617,7 +577,7 @@ module DiameterS6a_Templates {
                } // End of template mw_S6a_CLR_Body_dummy

                template (present) IDR_MSG mw_S6a_IDR_dummy := {
                    header      := mw_s6adiameterHeaderReq_dummy ( IDx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderReq_dummy ( IDx_E, c_applId_S6a ),
                    session_Id  := ?,
                    iDR_Body    := mw_S6a_IDR_Body_dummy
                } // End of template mw_S6a_IDR_dummy
@@ -639,7 +599,7 @@ module DiameterS6a_Templates {
                } // End of template mw_S6a_IDR_Body_dummy

                template(present)  DSR_MSG mw_S6a_DSR_dummy := {
                    header      := mw_s6adiameterHeaderReq_dummy ( DSx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderReq_dummy ( DSx_E, c_applId_S6a ),
                    session_Id  := ?,
                    dSR_Body    := mw_S6a_DSR_Body_dummy
                } // End of template mw_S6a_DSR_dummy
@@ -663,8 +623,8 @@ module DiameterS6a_Templates {
                    aVP_Type                        := *
                } // End of template mw_S6a_DSR_Body_dummy

                template (present) S6a_PUR_MSG mw_S6a_PUR_dummy := {
                    header      := mw_s6adiameterHeaderReq_dummy ( PUx_E, c_applId_S6a ),
                template (present) PUR_MSG mw_S6a_PUR_dummy := {
                    header      := mw_diameterHeaderReq_dummy ( PUx_E, c_applId_S6a ),
                    session_Id  := ?,
                    pUR_Body    := mw_S6a_PUR_Body_dummy
                } // End of template mw_S6a_PUR_dummy
@@ -688,7 +648,7 @@ module DiameterS6a_Templates {
                } // End of template mw_S6a_PUR_Body_dummy

                template (present) RSR_MSG mw_S6a_RSR_dummy := {
                    header      := mw_s6adiameterHeaderReq_dummy ( RSx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderReq_dummy ( RSx_E, c_applId_S6a ),
                    session_Id  := ?,
                    rSR_Body    := mw_S6a_RSR_Body_dummy
                } // End of template mw_S6a_RSR_dummy
@@ -708,7 +668,7 @@ module DiameterS6a_Templates {
                } // End of template mw_S6a_RSR_Body_dummy

                template (present) NOR_MSG mw_S6a_NOR_dummy := {
                    header      := mw_s6adiameterHeaderReq_dummy ( NOx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderReq_dummy ( NOx_E, c_applId_S6a ),
                    session_Id  := ?,
                    nOR_Body    := mw_S6a_NOR_Body_dummy
                } // End of template mw_S6a_NOR_dummy
@@ -740,7 +700,7 @@ module DiameterS6a_Templates {
            group S6aDummy_answer_templates_send {
                
                template (value) ULA_MSG m_S6a_ULA_dummy := {
                    header      := m_s6adiameterHeaderAns_dummy ( ULx_E, c_applId_S6a ),
                    header      := m_diameterHeaderAns_dummy ( ULx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    uLA_Body    := m_S6a_ULA_Body_dummy
                } // End of template m_S6a_ULA_dummy
@@ -763,7 +723,7 @@ module DiameterS6a_Templates {
                } // End of template m_S6a_ULA_Body_dummy

                template (value) AIA_MSG m_S6a_AIA_dummy := {
                    header      := m_s6adiameterHeaderAns_dummy ( AIx_E, c_applId_S6a ),
                    header      := m_diameterHeaderAns_dummy ( AIx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    aIA_Body    := m_S6a_AIA_Body_dummy
                } // End of template m_S6a_AIA_dummy
@@ -785,7 +745,7 @@ module DiameterS6a_Templates {
                } // End of template m_S6a_AIA_Body_dummy

                template (value) CLA_MSG m_S6a_CLA_dummy := {
                    header      := m_s6adiameterHeaderAns_dummy ( CLx_E, c_applId_S6a ),
                    header      := m_diameterHeaderAns_dummy ( CLx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    cLA_Body    := m_S6a_CLA_Body_dummy
                } // End of template m_S6a_CLA_dummy
@@ -805,7 +765,7 @@ module DiameterS6a_Templates {
                } // End of template m_S6a_CLA_Body_dummy

                template (value) IDA_MSG m_S6a_IDA_dummy := {
                    header      := m_s6adiameterHeaderAns_dummy ( IDx_E, c_applId_S6a ),
                    header      := m_diameterHeaderAns_dummy ( IDx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    iDA_Body    := m_S6a_IDA_Body_dummy
                } // End of template m_S6a_IDA_dummy
@@ -831,7 +791,7 @@ module DiameterS6a_Templates {
                } // End of template m_S6a_IDA_Body_dummy

                template (value) DSA_MSG m_S6a_DSA_dummy := {
                    header      := m_s6adiameterHeaderAns_dummy ( DSx_E, c_applId_S6a ),
                    header      := m_diameterHeaderAns_dummy ( DSx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    dSA_Body    := m_S6a_DSA_Body_dummy
                } // End of template m_S6a_DSA_dummy
@@ -852,8 +812,8 @@ module DiameterS6a_Templates {
                    aVP_Type                        := omit
                } // End of template m_S6a_DSA_Body_dummy

                template (value) S6a_PUA_MSG m_S6a_PUA_dummy := {
                    header      := m_s6adiameterHeaderAns_dummy ( PUx_E, c_applId_S6a ),
                template (value) PUA_MSG m_S6a_PUA_dummy := {
                    header      := m_diameterHeaderAns_dummy ( PUx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    pUA_Body    := m_S6a_PUA_Body_dummy
                } // End of template m_S6a_PUA_dummy
@@ -875,7 +835,7 @@ module DiameterS6a_Templates {
                } // End of template m_S6a_PUA_Body_dummy

                template (value) RSA_MSG m_S6a_RSA_dummy := {
                    header      := m_s6adiameterHeaderAns_dummy ( RSx_E, c_applId_S6a ),
                    header      := m_diameterHeaderAns_dummy ( RSx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    rSA_Body    := m_S6a_RSA_Body_dummy
                } // End of template m_S6a_RSA_dummy
@@ -895,7 +855,7 @@ module DiameterS6a_Templates {
                } // End of template m_S6a_RSA_Body_dummy

                template (value) NOA_MSG m_S6a_NOA_dummy := {
                    header      := m_s6adiameterHeaderAns_dummy ( NOx_E, c_applId_S6a ),
                    header      := m_diameterHeaderAns_dummy ( NOx_E, c_applId_S6a ),
                    session_Id  := m_sessionId_dummy,
                    nOA_Body    := m_S6a_NOA_Body_dummy
                } // End of template m_S6a_NOA_dummy
@@ -919,7 +879,7 @@ module DiameterS6a_Templates {
            group S6aDummy_answer_templates_receive {
                
                template (present) ULA_MSG mw_S6a_ULA_dummy := {
                    header      := mw_s6adiameterHeaderAns_dummy ( ULx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderAns_dummy ( ULx_E, c_applId_S6a ),
                    session_Id  := ?,
                    uLA_Body    := mw_S6a_ULA_Body_dummy
                } // End of template mw_S6a_ULA_dummy
@@ -942,7 +902,7 @@ module DiameterS6a_Templates {
                } // End of template mw_S6a_ULA_Body_dummy

                template (present) AIA_MSG m_wS6a_AIA_dummy := {
                    header      := mw_s6adiameterHeaderAns_dummy ( AIx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderAns_dummy ( AIx_E, c_applId_S6a ),
                    session_Id  := ?,
                    aIA_Body    := mw_S6a_AIA_Body_dummy
                } // End of template m_wS6a_AIA_dummy
@@ -964,7 +924,7 @@ module DiameterS6a_Templates {
                }

                template (present) CLA_MSG mw_S6a_CLA_dummy := {
                    header      := mw_s6adiameterHeaderAns_dummy ( CLx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderAns_dummy ( CLx_E, c_applId_S6a ),
                    session_Id  := ?,
                    cLA_Body    := mw_S6a_CLA_Body_dummy
                }
@@ -983,7 +943,7 @@ module DiameterS6a_Templates {
                }

                template (present) IDA_MSG mw_S6a_IDA_dummy := {
                    header      := mw_s6adiameterHeaderAns_dummy ( IDx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderAns_dummy ( IDx_E, c_applId_S6a ),
                    session_Id  := ?,
                    iDA_Body    := mw_S6a_IDA_Body_dummy
                }
@@ -1008,7 +968,7 @@ module DiameterS6a_Templates {
                }

                template (present) DSA_MSG mw_S6a_DSA_dummy := {
                    header      := mw_s6adiameterHeaderAns_dummy ( DSx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderAns_dummy ( DSx_E, c_applId_S6a ),
                    session_Id  := ?,
                    dSA_Body    := mw_S6a_DSA_Body_dummy
                }
@@ -1029,8 +989,8 @@ module DiameterS6a_Templates {
                    aVP_Type                        := *
                }

                template (present) S6a_PUA_MSG mw_S6a_PUA_dummy := {
                    header      := mw_s6adiameterHeaderAns_dummy ( PUx_E, c_applId_S6a ),
                template (present) PUA_MSG mw_S6a_PUA_dummy := {
                    header      := mw_diameterHeaderAns_dummy ( PUx_E, c_applId_S6a ),
                    session_Id  := ?,
                    pUA_Body    := mw_S6a_PUA_Body_dummy
                }
@@ -1051,7 +1011,7 @@ module DiameterS6a_Templates {
                }

                template (present) RSA_MSG mw_S6a_RSA_dummy := {
                    header      := mw_s6adiameterHeaderAns_dummy ( RSx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderAns_dummy ( RSx_E, c_applId_S6a ),
                    session_Id  := ?,
                    rSA_Body    := mw_S6a_RSA_Body_dummy
                }
@@ -1071,7 +1031,7 @@ module DiameterS6a_Templates {
                }
 
                template (present) NOA_MSG mw_S6a_NOA_dummy := {
                    header      := mw_s6adiameterHeaderAns_dummy ( NOx_E, c_applId_S6a ),
                    header      := mw_diameterHeaderAns_dummy ( NOx_E, c_applId_S6a ),
                    session_Id  := ?,
                    nOA_Body    := mw_S6a_NOA_Body_dummy
                }
@@ -1209,16 +1169,16 @@ module DiameterS6a_Templates {
                 * @desc Main receive template for MME_S6a port
                 * @param p_s6a_CCA_MSG UL-Answer receive template message
                 */
                template (present) DIAMETER_S6a_MME_Initiated_Message mw_hssUpdateLocationRequest(in template (present) ULR_MSG p_s6a_ULR_MSG) := {
                    s6a_ULR_MSG := p_s6a_ULR_MSG
                template (present) DIAMETER_MSG mw_hssUpdateLocationRequest(in template (present) ULR_MSG p_uLR_MSG) := {
                    uLR_MSG := p_uLR_MSG
                } // End of tempate mw_hssUpdateLocationRequest
                
                /**
                 * @desc Main receive template for MME_S6a port
                 * @param p_s6a_CCA_MSG UL-Answer receive template message
                 */
                template (present) DIAMETER_S6a_HSS_Initiated_Message mw_mmeUpdateLocationRequest(in template (present) ULA_MSG p_s6a_CCA_MSG) := {
                    s6a_CCA_MSG := p_s6a_CCA_MSG
                template (present) DIAMETER_MSG mw_mmeUpdateLocationRequest(in template (present) ULA_MSG p_cCA_MSG) := {
                    cCA_MSG := p_cCA_MSG
                } // End of tempate m_mmeUpdateLocationRequest
                
            } // End of group S6basic_request_templates_receive
+6 −25
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ module DiameterS6a_TestSystem {
            Session_Id_AVP, Origin_Host_AVP, Origin_Realm_AVP,
            Destination_Host_AVP 
    };
    import from LibDiameter_Interface {
        type DiameterPort
    };
    
    // DiameterS6a
    import from DiameterS6a_TypesAndValues all;
@@ -27,28 +30,6 @@ module DiameterS6a_TestSystem {
        
        group Ports {
            
            /**
             * @desc Diameter S6a port definition
             */
            type port DiameterS6aPort message {
                inout DIAMETER_S6a_Message;
            }
            
            /**
             * @desc Diameter S6a port message for HSS IUT role
             */
            type port Diameter_MME_S6aPort message {
                in  DIAMETER_S6a_HSS_Initiated_Message;
                out DIAMETER_S6a_MME_Initiated_Message;
            } // End of type Diameter_MME_S6aPort
            
            /**
             * @desc Diameter S6a port message for MME IUT role
             */
            type port Diameter_HSS_S6aPort message {
                in  DIAMETER_S6a_MME_Initiated_Message;
                out DIAMETER_S6a_HSS_Initiated_Message;
            } // End of type Diameter_HSS_S6aPort
            
            // TODO Add NAS-Protocol port to trigger NAS messages for MM
            
@@ -68,9 +49,9 @@ module DiameterS6a_TestSystem {
                 */
                type component TestAdapter extends SelfSyncComp { // FIXME To be replaced by Diameter TestAdapter
                    /** TTCN-3 port for HSS IUT role */
                    port Diameter_MME_S6aPort MME_S6a; 
                    port DiameterPort MME_S6a; 
                    /** TTCN-3 port for MME IUT role */
                    port Diameter_HSS_S6aPort HSS_S6a; 
                    port DiameterPort HSS_S6a; 
                    
                    // TODO Add NAS-Protocol port to trigger NAS messages for MM
                    
+9 −474

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1

File changed.

Contains only whitespace changes.

Loading