Commit aea69cdf authored by schmitting's avatar schmitting
Browse files

End of week 35/2013

parent 2277d97b
Loading
Loading
Loading
Loading
+1621 −1654
Original line number Original line Diff line number Diff line
@@ -121,7 +121,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCRF_IPS_03
            } // end function f_TC_PCRF_IPS_03



            /*
            /*
            *  @desc    This is the test case function TC_PCRF_IPS_04
            *  @desc    This is the test case function TC_PCRF_IPS_04
            *  @param
            *  @param
@@ -148,7 +147,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCRF_IPS_04            
            } // end function f_TC_PCRF_IPS_04            



            /*
            /*
            *  @desc    This is the test case function TC_PCRF_IPS_05
            *  @desc    This is the test case function TC_PCRF_IPS_05
            *  @param
            *  @param
@@ -175,7 +173,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCRF_IPS_05
            } // end function f_TC_PCRF_IPS_05



            /*
            /*
            *  @desc    This is the test case function TC_PCRF_IPS_06
            *  @desc    This is the test case function TC_PCRF_IPS_06
            *  @param
            *  @param
@@ -205,7 +202,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCRF_IPS_06
            } // end function f_TC_PCRF_IPS_06


            
        }//end group TP_PCRFRole_IPS
        }//end group TP_PCRFRole_IPS
        group TP_PCRFRole_MSI { //Modification of Session Information
        group TP_PCRFRole_MSI { //Modification of Session Information


@@ -1020,7 +1016,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCRF_IRS_01
            } // end function f_TC_PCRF_IRS_01


            
            /*
            /*
            *  @desc    This is the test case function TC_PCRF_IRS_02
            *  @desc    This is the test case function TC_PCRF_IRS_02
            *  @param
            *  @param
@@ -1098,7 +1093,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCRF_MPS_01
            } // end function f_TC_PCRF_MPS_01


                    
            /*
            /*
            *  @desc    This is the test case function TC_PCRF_MPS_02
            *  @desc    This is the test case function TC_PCRF_MPS_02
            *  @param
            *  @param
@@ -1327,7 +1321,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function TC_PCEF_IPS_03            
            } // end function TC_PCEF_IPS_03            


            
            /*
            /*
            *  @desc    This is the test case function TC_PCEF_IPS_04
            *  @desc    This is the test case function TC_PCEF_IPS_04
            *  @param
            *  @param
@@ -1364,7 +1357,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function TC_PCEF_IPS_04  
            } // end function TC_PCEF_IPS_04  


                        
            /*
            /*
            *  @desc    This is the test case function TC_PCEF_IPS_05
            *  @desc    This is the test case function TC_PCEF_IPS_05
            *  @param
            *  @param
@@ -1514,7 +1506,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_MSI_02
            } // end function f_TC_PCEF_MSI_02


        
            /*
            /*
            *  @desc    This is the test case function TC_PCEF_MSI_03
            *  @desc    This is the test case function TC_PCEF_MSI_03
            *  @param
            *  @param
@@ -1553,7 +1544,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_MSI_03
            } // end function f_TC_PCEF_MSI_03


        
            /*
            /*
            *  @desc    This is the test case function TC_PCEF_MSI_04
            *  @desc    This is the test case function TC_PCEF_MSI_04
            *  @param
            *  @param
@@ -1592,7 +1582,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_MSI_04
            } // end function f_TC_PCEF_MSI_04


        
            /*
            /*
            *  @desc    This is the test case function TC_PCEF_MSI_05
            *  @desc    This is the test case function TC_PCEF_MSI_05
            *  @param
            *  @param
@@ -1631,7 +1620,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_MSI_05
            } // end function f_TC_PCEF_MSI_05


            
        }//end group  TP_PCEFRole_MSI
        }//end group  TP_PCEFRole_MSI


        group TP_PCEFRole_INV { //Invalid Behaviour 
        group TP_PCEFRole_INV { //Invalid Behaviour 
@@ -1708,8 +1696,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_ST_02
            } // end function f_TC_PCEF_ST_02


        
        
        }//end group  TP_PCEFRole_ST
        }//end group  TP_PCEFRole_ST
        group TP_PCEFRole_PCC { //PCC rules
        group TP_PCEFRole_PCC { //PCC rules


@@ -1743,7 +1729,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_PCC_01
            } // end function f_TC_PCEF_PCC_01


        
            /*
            /*
            *  @desc    This is the test case function TC_PCEF_PCC_02
            *  @desc    This is the test case function TC_PCEF_PCC_02
            *  @param
            *  @param
@@ -1775,7 +1760,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_PCC_02
            } // end function f_TC_PCEF_PCC_02



            /*
            /*
            *  @desc    This is the test case function TC_PCEF_PCC_03
            *  @desc    This is the test case function TC_PCEF_PCC_03
            *  @param
            *  @param
@@ -1837,7 +1821,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_PCC_04
            } // end function f_TC_PCEF_PCC_04



            /*
            /*
            *  @desc    This is the test case function TC_PCEF_PCC_05
            *  @desc    This is the test case function TC_PCEF_PCC_05
            *  @param
            *  @param
@@ -1868,7 +1851,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_PCC_05
            } // end function f_TC_PCEF_PCC_05



            /*
            /*
            *  @desc    This is the test case function TC_PCEF_PCC_06
            *  @desc    This is the test case function TC_PCEF_PCC_06
            *  @param
            *  @param
@@ -1932,7 +1914,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_PCC_07
            } // end function f_TC_PCEF_PCC_07



            /*
            /*
            *  @desc    This is the test case function TC_PCEF_PCC_08
            *  @desc    This is the test case function TC_PCEF_PCC_08
            *  @param
            *  @param
@@ -1963,7 +1944,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_PCC_08
            } // end function f_TC_PCEF_PCC_08



            /*
            /*
            *  @desc    This is the test case function TC_PCEF_PCC_09
            *  @desc    This is the test case function TC_PCEF_PCC_09
            *  @param
            *  @param
@@ -1983,8 +1963,6 @@ module DiameterGx_Gx_TCFunctions {
                            m_event_Trigger(NO_EVENT_TRIGGERS_E)
                            m_event_Trigger(NO_EVENT_TRIGGERS_E)
                            ));
                            ));



                    
                f_awaiting_RAA(mw_RAA_basic(?,?,?));
                f_awaiting_RAA(mw_RAA_basic(?,?,?));


                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync
@@ -2027,7 +2005,6 @@ module DiameterGx_Gx_TCFunctions {
                                                       ));
                                                       ));
                f_send_CCA(m_CCA_basic(vc_sessionId, vc_originHost, vc_originRealm, m_cC_Request_Type(UPDATE_REQUEST_E)));
                f_send_CCA(m_CCA_basic(vc_sessionId, vc_originHost, vc_originRealm, m_cC_Request_Type(UPDATE_REQUEST_E)));



                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync


                f_terminate_session_PCRF(); // postamble
                f_terminate_session_PCRF(); // postamble
@@ -2068,7 +2045,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_PCC_11
            } // end function f_TC_PCEF_PCC_11


            
            /*
            /*
            *  @desc    This is the test case function TC_PCEF_PCC_12
            *  @desc    This is the test case function TC_PCEF_PCC_12
            *  @param
            *  @param
@@ -2099,7 +2075,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_PCC_12
            } // end function f_TC_PCEF_PCC_12



            /*
            /*
            *  @desc    This is the test case function TC_PCEF_PCC_13
            *  @desc    This is the test case function TC_PCEF_PCC_13
            *  @param
            *  @param
@@ -2165,7 +2140,6 @@ module DiameterGx_Gx_TCFunctions {


                f_send_CCA(m_CCA_basic(vc_sessionId, vc_originHost, vc_originRealm, m_cC_Request_Type(UPDATE_REQUEST_E)));
                f_send_CCA(m_CCA_basic(vc_sessionId, vc_originHost, vc_originRealm, m_cC_Request_Type(UPDATE_REQUEST_E)));



                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); // sync


                f_terminate_session_PCRF(); // postamble
                f_terminate_session_PCRF(); // postamble
@@ -2285,7 +2259,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_PCC_17
            } // end function f_TC_PCEF_PCC_17



            /*
            /*
            *  @desc    This is the test case function TC_PCEF_PCC_18
            *  @desc    This is the test case function TC_PCEF_PCC_18
            *  @param
            *  @param
@@ -2349,7 +2322,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_PCC_19
            } // end function f_TC_PCEF_PCC_19


                        
            /*
            /*
            *  @desc    This is the test case function TC_PCEF_PCC_20
            *  @desc    This is the test case function TC_PCEF_PCC_20
            *  @param
            *  @param
@@ -2404,7 +2376,7 @@ module DiameterGx_Gx_TCFunctions {
                                                    f_framedIpAddress4(PX_UE1_framedIpAddress),
                                                    f_framedIpAddress4(PX_UE1_framedIpAddress),
                                                    f_framedIpAddress6(PX_UE1_framedIp6Address),
                                                    f_framedIpAddress6(PX_UE1_framedIp6Address),
                                                    *,
                                                    *,
                									mw_CalledStationId(PX_EMERGENCY_APN)),
                                                    mw_CalledStationId((PX_CALLED_STATION_ID_EMERGENCY_APN,PX_CALLED_STATION_ID_EMERGENCY))),
                                mw_CCR_Request_EMS2(?,
                                mw_CCR_Request_EMS2(?,
                                                    vc_originHost,
                                                    vc_originHost,
                                                    vc_originRealm,
                                                    vc_originRealm,
@@ -2413,7 +2385,7 @@ module DiameterGx_Gx_TCFunctions {
                                                    f_framedIpAddress4(PX_UE1_framedIpAddress),
                                                    f_framedIpAddress4(PX_UE1_framedIpAddress),
                                                    f_framedIpAddress6(PX_UE1_framedIp6Address),
                                                    f_framedIpAddress6(PX_UE1_framedIp6Address),
                                                    *,
                                                    *,
                                                    mw_CalledStationId(PX_EMERGENCY_APN))));
                                                    mw_CalledStationId((PX_CALLED_STATION_ID_EMERGENCY_APN,PX_CALLED_STATION_ID_EMERGENCY)))));


                f_send_CCA(m_CCA_basic(vc_sessionId, vc_originHost, vc_originRealm, m_cC_Request_Type(INITIAL_REQUEST_E)));
                f_send_CCA(m_CCA_basic(vc_sessionId, vc_originHost, vc_originRealm, m_cC_Request_Type(INITIAL_REQUEST_E)));


@@ -2609,8 +2581,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_RAU_01
            } // end function f_TC_PCEF_RAU_01


            
        
            /*
            /*
            *  @desc    This is the test case function TC_PCEF_RAU_02
            *  @desc    This is the test case function TC_PCEF_RAU_02
            *  @param
            *  @param
@@ -2673,7 +2643,6 @@ module DiameterGx_Gx_TCFunctions {


            } // end function f_TC_PCEF_RAU_02
            } // end function f_TC_PCEF_RAU_02


        
            /*
            /*
            *  @desc    This is the test case function TC_PCEF_RAU_03
            *  @desc    This is the test case function TC_PCEF_RAU_03
            *  @param
            *  @param
@@ -3042,7 +3011,6 @@ module DiameterGx_Gx_TCFunctions {


        /*
        /*
        *  @desc    This is the test case function for GTP component 2 to determine that PCEF blocks traffic for rejected session
        *  @desc    This is the test case function for GTP component 2 to determine that PCEF blocks traffic for rejected session
        *  			
        *  @param
        *  @param
        */
        */
        function f_TC_GTP_02_neg()
        function f_TC_GTP_02_neg()
@@ -3070,5 +3038,4 @@ module DiameterGx_Gx_TCFunctions {


   }
   }


	
} // end module DiameterGx_Gx_TCFunctions
} // end module DiameterGx_Gx_TCFunctions
+155 −157
Original line number Original line Diff line number Diff line
@@ -10,7 +10,6 @@ module DiameterGx_PICS
        PICS used for test case selection
        PICS used for test case selection
        *************************************************************************************************** */
        *************************************************************************************************** */


	
group PICS_PCRF {
group PICS_PCRF {


    /** @desc   Does PCRF support SPONSORED_DATA_CONNECTIVITY
    /** @desc   Does PCRF support SPONSORED_DATA_CONNECTIVITY
@@ -169,5 +168,4 @@ group PICS_PCEF {


}
}


    
} // end module DiameterGx_PICS
} // end module DiameterGx_PICS
 No newline at end of file
+130 −140

File changed.

Preview size limit exceeded, changes collapsed.

+202 −252
Original line number Original line Diff line number Diff line
@@ -19,10 +19,8 @@ module DiameterGx_Rx_TCFunctions {
    import from DiameterGx_Rx_Steps all;
    import from DiameterGx_Rx_Steps all;
    import from DiameterGx_PIXITS all;
    import from DiameterGx_PIXITS all;



    // PCRF is TS and ports for Gx and Rx interface will be used
    // PCRF is TS and ports for Gx and Rx interface will be used


	
    group TP_PCRFRole {
    group TP_PCRFRole {


        /*
        /*
@@ -105,7 +103,6 @@ module DiameterGx_Rx_TCFunctions {
                                               ),
                                               ),
                                               m_mediaComponentNr(0))));
                                               m_mediaComponentNr(0))));


                
            f_awaiting_AAA(mw_AAA_dummy); // IUT esthablish Diameter session
            f_awaiting_AAA(mw_AAA_dummy); // IUT esthablish Diameter session


            f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); // sync
            f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict()); // sync
@@ -125,53 +122,6 @@ module DiameterGx_Rx_TCFunctions {


        } // end function f_TC_PCRF_OpenCloseSession
        } // end function f_TC_PCRF_OpenCloseSession


//            /*
//            *  @desc	This is the test case function TC_PCRF_OpenSessionPrio
//            *  @param	
//            */
//            function f_TC_PCRF_OpenSessionPrio()
//            runs on DiameterComponent {
//                
//                var boolean v_cc_xx_octets_present;
//		
//                f_preamble_AF();
//
//                f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); // sync
//                
//                f_send_AAR(m_AAR_Priority(vc_sessionId, vc_originHost,
//                                          vc_originRealm,
//                                          vc_destinationRealm,
//                                          vc_destinationHost,
//                                          f_framedIpAddress4_send(PX_UE1_framedIpAddress),
//                                          f_framedIpAddress6_send(PX_UE1_framedIp6Address),
//                                          m_mediaComponentDescription_subComponentFlow_componentNr
//                                              (m_mediaSubComponentUND2SP
//                                               (0,AF_SIGNALLING_E,
//                                               m_flowDescription("permit","out","ip",
//                                                   {addr := "1.2.3.4", mask := omit, ports := omit},
//                                                   {addr := "1.2.3.4", mask := omit, ports := omit},
//                                                   ""),
//                                               m_flowDescription("permit","out","ip",
//                                                   {addr := "1.2.3.4", mask := omit, ports := omit},
//                                                   {addr := "1.2.3.4", mask := omit, ports := omit},
//                                                   ""),
//                                               m_flowStatus(ENABLED_E),
//                                               m_afSignallingProtocolSIP
//                                               ),
//                                               m_mediaComponentNr(0)),
//                                          m_mpsIdentifier(PX_MPS_IDENTIFIER),
//                                          m_reservationPriority(PRIORITY_ONE_E)));
//                
//                f_awaiting_AAA(mw_AAA_dummy); // IUT esthablish Diameter session
//                
//                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); //     sync
//
//                f_postamble_AF();
//                
//                f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync
//
//            } // end function f_TC_PCRF_OpenSessionPrio
            
        /*
        /*
        *  @desc    This is the test case function TC_PCRF_OpenSessionPrio2
        *  @desc    This is the test case function TC_PCRF_OpenSessionPrio2
        *  @param   
        *  @param   
+64 −69
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ module DiameterGx_Rx_Templates {
    //DiameterRx
    //DiameterRx
    import from DiameterGx_PIXITS all;
    import from DiameterGx_PIXITS all;



    group SubFields{
    group SubFields{


        template Media_Component_Number_AVP m_mediaComponentNr(UInt32 p_avpData) :=
        template Media_Component_Number_AVP m_mediaComponentNr(UInt32 p_avpData) :=
@@ -270,7 +269,6 @@ module DiameterGx_Rx_Templates {
                aVP_Data := p_reservationPriorityType
                aVP_Data := p_reservationPriorityType
            }
            }


            
            template MPS_Identifier_AVP m_mpsIdentifier (octetstring p_mpsIdentifier):= {
            template MPS_Identifier_AVP m_mpsIdentifier (octetstring p_mpsIdentifier):= {
                aVP_Header := m_aVP_HeaderVid_Mbit0(c_mPS_Identifier_AVP_Code, lengthof(p_mpsIdentifier), c_vendId3gpp),
                aVP_Header := m_aVP_HeaderVid_Mbit0(c_mPS_Identifier_AVP_Code, lengthof(p_mpsIdentifier), c_vendId3gpp),
                aVP_Data := p_mpsIdentifier
                aVP_Data := p_mpsIdentifier
@@ -290,7 +288,6 @@ module DiameterGx_Rx_Templates {
          }//end group Rxdummy_request_templates_receive
          }//end group Rxdummy_request_templates_receive
          group Rxdummy_answer_templates_send {
          group Rxdummy_answer_templates_send {


              
          }//end group Rxdummy_answer_templates_send
          }//end group Rxdummy_answer_templates_send
          group Rxdummy_answer_templates_receive {
          group Rxdummy_answer_templates_receive {


@@ -317,7 +314,6 @@ module DiameterGx_Rx_Templates {
                auth_Application_Id := m_authApplicationId(c_applIdRx)
                auth_Application_Id := m_authApplicationId(c_applIdRx)
            }
            }


                
            template RAR_MSG m_RAR_basic(template Session_Id_AVP p_sessionId,
            template RAR_MSG m_RAR_basic(template Session_Id_AVP p_sessionId,
                                         template Origin_Host_AVP p_originHost,
                                         template Origin_Host_AVP p_originHost,
                                         template Origin_Realm_AVP p_originRealm,
                                         template Origin_Realm_AVP p_originRealm,
@@ -445,5 +441,4 @@ module DiameterGx_Rx_Templates {
      } //end group Rxmodified_templates
      } //end group Rxmodified_templates
    } //end group RxMessageTemplates
    } //end group RxMessageTemplates


    
}//end module DiameterGx_Rx_Templates
}//end module DiameterGx_Rx_Templates
 No newline at end of file
Loading