Commit 4da3a801 authored by Iztok Juvancic's avatar Iztok Juvancic
Browse files

updated tc due to expescode template

parent eea0f463
Loading
Loading
Loading
Loading

LibDiameter @ f6a0410f

Original line number Diff line number Diff line
Subproject commit 5b6c388ae24e5ce57fdc5eaf557fec865dee1258
Subproject commit f6a0410faaf67d52748e5c694c8944cc5d00641c
+28 −1
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ module DiameterShDh_TCFunctions {
                                           vc_sessionId,                       // containing a Session-ID AVP
                                           mdw_puaBodyAvps(
                                                           mw_resultCode(DIAMETER_SUCCESS_E),
                                                           *,
                                                           vc_originHost_IUT,              // containing an Origin-Host AVP
                                                           vc_originRealm_IUT
                        ))
@@ -667,7 +668,33 @@ module DiameterShDh_TCFunctions {
                    f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); 
                    log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                    //TODO TestBody
                    //TestBody
                    f_send_PUR(
                               md_pUR(
                                      vc_sessionId,
                                      md_purBodyAvps(
                                                     m_auth_Session_State,
                                                     vc_originHost,                 // containing an Origin-Host AVP
                                                     vc_originRealm,                // containing an Origin-Realm AVP
                                                     vc_destinationHost,            // containing an Destination-Host AVP
                                                     vc_destinationRealm,           // containing a Destination-Realm AVP
                                                     m_specific_user_Identity (
                                                                m_public_user_identity(PX_PublicUserIdentity)
                                                                )
                                                    )
                                     )
                    );

                    f_awaiting_PUA(
                                   mdw_pUA( 
                                           vc_sessionId,                       // containing a Session-ID AVP
                                           mdw_puaBodyAvps(
                                                           *,
                                                           mw_experimentalResultCode(DIAMETER_ERROR_USER_DATA_CANNOT_BE_MODIFIED),
                                                           vc_originHost_IUT,              // containing an Origin-Host AVP
                                                           vc_originRealm_IUT
                        ))
                    );
                    
                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 

+2 −10
Original line number Diff line number Diff line
@@ -572,16 +572,6 @@ module DiameterShDh_Templates {
            
            group pua_msg {
                
                template PUA_Body_AVP mw_PUA_Result(
                                                        template Result_Code_AVP p_resultCode, 
                                                        template (present) Origin_Host_AVP p_originHost,
                                                        template (present) Origin_Realm_AVP p_originRealm,
                                                        template PUA_Body_AVP.failed p_failed
                ) modifies mdw_puaBodyAvps := {
                    result_Code := p_resultCode,                     // optional  in TS 129 229
                    failed := p_failed                               // optional  in TS 129 229
                } // End of template mw_PUA_ResulFaile
    
                /**
                 * @desc Receive template for PUA
                 * @param p_sessionId   Session identifier
@@ -598,10 +588,12 @@ module DiameterShDh_Templates {
    
                template (present) PUA_Body_AVP mdw_puaBodyAvps(
                                                                template (present) Result_Code_AVP              p_resultCode,
                                                                template (present) Experimental_Result_Code_AVP p_exp_rescode,
                                                                template (present) Origin_Host_AVP              p_originHost,
                                                                template (present) Origin_Realm_AVP             p_originRealm
                ) modifies mw_PUA_Body_dummy := {
                    result_Code                 := p_resultCode,
                    experimental_Result         := p_exp_rescode,
                    origin_Host                 := p_originHost,
                    origin_Realm                := p_originRealm
                } // End of template mdw_puaBodyAvps
+12 −4
Original line number Diff line number Diff line
@@ -1461,7 +1461,11 @@ module DiameterShDh_TestCases {
                    // Local variables
                    var DiameterShDh v_diameterSh_as; 
            
                    //TODO Test control - PICS
                    //Test control
                    if (not PICS_HSS_IUT) {
                        log("*** " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. ***"); 
                        stop;
                    }
                    
                    // Test component configuration
                    f_cf_1Sh_asUp(v_diameterSh_as);
@@ -1513,7 +1517,11 @@ module DiameterShDh_TestCases {
                    // Local variables
                    var DiameterShDh v_diameterSh_as; 
            
                    //TODO Test control - PICS
                    //Test control - PICS
                    if (not PICS_HSS_IUT) {
                        log("*** " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. ***"); 
                        stop;
                    }
                    
                    // Test component configuration
                    f_cf_1Sh_asUp(v_diameterSh_as);