Commit 231fc18f authored by Bostjan Pintar's avatar Bostjan Pintar
Browse files

New test configurations and SIP PIXIT introduced

parent dfd2661f
Loading
Loading
Loading
Loading
+149 −141
Original line number Diff line number Diff line
@@ -139,4 +139,12 @@ module DiameterShDh_PIXITS {
        
    } // End of group DiameterCommonShDhData
    
    group SipParameters {
      /** 
      * @desc    boolean indicator that is true if the Gm interface (SIP protocol) is accessible to trigger Diameter events at the Cx/Dx interface
      */
      modulepar boolean PX_SIPsupport := false;
    } // End of group SipParameters
    
    
} // End of module DiameterShDh_PIXITS 
 No newline at end of file
+209 −16
Original line number Diff line number Diff line
@@ -10,19 +10,25 @@ module DiameterShDh_TestConfiguration {
    
    // AtsIms
    import from DiameterShDh_TestSystem all;
    import from DiameterShDh_PIXITS all;
    
    /*
     * @desc f_NrofComps returns the number of test components
     */
    function f_NrofComps() runs on DiameterShDh return UInt {
        return vc_noOfComp;
        
        if (PX_SIPsupport)
        { return vc_noOfCompWithSip } // number of components with SIP is dinamically set
        else
        { return vc_noOfCompWoSip } // number of components without SIP is dinamically set
        
    } // End of function f_NrofComps
    
    group cfUp {
        
        /**
         *
         * @desc Creates test configuration of f_cf_1Sh_hssUp - HSS is SUT
         * @desc Creates test configuration of f_cf_1Sh_hssUp - AS is SUT
         * @param p_diameterComponent_hss    hss component
         */
        function f_cf_1Sh_hssUp(
@@ -32,7 +38,10 @@ module DiameterShDh_TestConfiguration {
            //Variables
            var FncRetCode v_ret := e_success;
            
            vc_noOfComp := 1;
            //Number of components with or without SIP componnets
            vc_noOfCompWithSip := 1;
            vc_noOfCompWoSip   := 1;

            
            //Create
            p_diameterComponent_hss := DiameterShDh.create ;
@@ -42,12 +51,148 @@ module DiameterShDh_TestConfiguration {
            // Connect client sync port
            connect(p_diameterComponent_hss:syncPort, self:syncPort) ;
            //Map
            map(p_diameterComponent_hss:DIAMP, system:CTF_Rf); // Diameter Init test Configuration
            map(p_diameterComponent_hss:DIAMP, system:HSS_Sh); // Diameter Init test Configuration
            
            activate(a_mtc_shutdown());
            
            f_setVerdict(v_ret);
        } // End of f_cf_1Sh_hssUp
        
        /**
         *
         * @desc Creates test configuration of f_cf_1Sh_asUp - HSS is SUT
         * @param p_diameterComponent_as    as component
         */
        function f_cf_1Sh_asUp(
                                out DiameterShDh p_diameterComponent_as
        ) runs on DiameterShDh 
        {
            //Variables
            var FncRetCode v_ret := e_success;
            
            //Number of components with or without SIP componnets
            vc_noOfCompWithSip := 1;
            vc_noOfCompWoSip   := 1;
            
            //Create
            p_diameterComponent_as := DiameterShDh.create ;
            
            // Connect mtc sync port
            connect(self:syncPort, self:syncPort);
            // Connect client sync port
            connect(p_diameterComponent_as:syncPort, self:syncPort) ;
            //Map
            map(p_diameterComponent_as:DIAMP, system:AS_Sh); // Diameter Init test Configuration
            
            activate(a_mtc_shutdown());
            
            f_setVerdict(v_ret);
        } // End of f_cf_1Rf_hssUp
        } // End of f_cf_1Sh_asUp
        
        /**
         *
         * @desc Creates test configuration of f_cf_1Dh_slfUp - AS is SUT
         * @param p_diameterComponent_slf    slf component
         */
        function f_cf_1Dh_slfUp(
                                out DiameterShDh p_diameterComponent_slf
        ) runs on DiameterShDh 
        {
            //Variables
            var FncRetCode v_ret := e_success;
            
            //Number of components with or without SIP componnets
            vc_noOfCompWithSip := 1;
            vc_noOfCompWoSip   := 1;
            
            //Create
            p_diameterComponent_slf := DiameterShDh.create ;
            
            // Connect mtc sync port
            connect(self:syncPort, self:syncPort);
            // Connect client sync port
            connect(p_diameterComponent_slf:syncPort, self:syncPort) ;
            //Map
            map(p_diameterComponent_slf:DIAMP, system:HSS_Sh); // Diameter Init test Configuration
            
            activate(a_mtc_shutdown());
            
            f_setVerdict(v_ret);
        } // End of f_cf_1Dh_slfUp
        
//        /**
//         *
//         * @desc Creates test configuration of f_cf_1Dh1Sh1Gm_slfUp - AS is SUT
//         * @param p_diameterComponent_slf    slf component
//         * @param p_diameterComponent_hss    hss component
//         * @param p_imsComponent_gm          gm  component
//         */
//        function f_cf_1Dh1Sh1Gm_slfUp(
//                                out DiameterShDh p_diameterComponent_slf,
//                                out DiameterShDh p_diameterComponent_hss,
//                                out ImsComponent p_imsComponent_gm
//        ) runs on DiameterShDh 
//        {
//            //Variables
//            var FncRetCode v_ret := e_success;
//            
//            //Number of components with or without SIP componnets
//            vc_noOfCompWithSip := 3;
//            vc_noOfCompWoSip   := 2;
//            
//            // Create
//            p_diameterComponent_slf := DiameterShDh.create;
//            p_diameterComponent_hss := DiameterShDh.create;
//            if (PX_SIPsupport) { p_imsComponent_gm := ImsComponent.create; }
//
//            // Connect mtc sync port
//            connect(self:syncPort, self:syncPort);
//            // Connect client sync ports
//            connect(p_diameterComponent_slf:syncPort, self:syncPort);
//            connect(p_diameterComponent_hss:syncPort, self:syncPort);
//            if (PX_SIPsupport) { connect(p_imsComponent_gm:syncPort, self:syncPort); }
//            
//            // Map port
//            map( p_diameterComponent_slf:DIAMP, system:SLF_Dh);
//            map( p_diameterComponent_hss:DIAMP, system:HSS_Sh );
//            if (PX_SIPsupport) { map( p_imsComponent_gm:SIPP, system:UE_Gm ); }
//            
//            // Activate sync default for MTC
//            activate(a_mtc_shutdown());
//            
//            f_setVerdict( e_success );
//        } // End of f_cf_1Dh1Sh1Gm_slfUp
        
        /**
         *
         * @desc Creates test configuration of f_cf_1Dh_asUp - SLF is SUT
         * @param p_diameterComponent_as    as component
         */
        function f_cf_1Dh_asUp(
                                out DiameterShDh p_diameterComponent_as
        ) runs on DiameterShDh 
        {
            //Variables
            var FncRetCode v_ret := e_success;
            
            //Number of components with or without SIP componnets
            vc_noOfCompWithSip := 1;
            vc_noOfCompWoSip   := 1;
            
            //Create
            p_diameterComponent_as := DiameterShDh.create ;
            
            // Connect mtc sync port
            connect(self:syncPort, self:syncPort);
            // Connect client sync port
            connect(p_diameterComponent_as:syncPort, self:syncPort) ;
            //Map
            map(p_diameterComponent_as:DIAMP, system:AS_Dh); // Diameter Init test Configuration
            
            activate(a_mtc_shutdown());
            
            f_setVerdict(v_ret);
        } // End of f_cf_1Dh_asUp
        
    } // End of group cfUp 
    
@@ -55,27 +200,75 @@ module DiameterShDh_TestConfiguration {
        
        /**
         *
         * @desc Creates test configuration of f_cf_1Sh_hssDown - HSS is SUT
         * @desc Creates test configuration of f_cf_1Sh_hssDown - AS is SUT
         * @param p_diameterComponent_hss    hss component
         */
        function f_cf_1Sh_hssDown(
                                out DiameterShDh p_diameterComponent_hss
        ) runs on DiameterShDh 
        {
            //Variables
            var FncRetCode v_ret := e_success;
            // Deactivate all
            deactivate;
            // Unmap all
            unmap;
            // Disconnect all
            disconnect;
            
        } // End of f_cf_1Sh_hssDown
        
        /**
         *
         * @desc Creates test configuration of f_cf_1Sh_asDown - HSS is SUT
         * @param p_diameterComponent_as    as component
         */
        function f_cf_1Sh_asDown(
                                out DiameterShDh p_diameterComponent_as
        ) runs on DiameterShDh 
        {
            // Deactivate all
            deactivate;
            // Unmap all
            unmap;
            // Disconnect all
            disconnect;
            
            // Disconnect mtc sync port
            disconnect(self:syncPort, self:syncPort);
            // Disconnect client sync port
            disconnect(p_diameterComponent_hss:syncPort, self:syncPort) ;
            // Unmap
            unmap(p_diameterComponent_hss:DIAMP, system:CTF_Rf); 
        } // End of f_cf_1Sh_asDown
        
            f_setVerdict(v_ret);
        } // End of f_cf_1Rf_hssDown
        /**
         *
         * @desc Creates test configuration of f_cf_1Sh_slfDown - AS is SUT
         * @param p_diameterComponent_slf    slf component
         */
        function f_cf_1Dh_slfDown(
                                out DiameterShDh p_diameterComponent_slf
        ) runs on DiameterShDh 
        {
            // Deactivate all
            deactivate;
            // Unmap all
            unmap;
            // Disconnect all
            disconnect;
            
        } // End of f_cf_1Sh_hssDown
        
        /**
         *
         * @desc Creates test configuration of f_cf_1Sh_asDown - SLF is SUT
         * @param p_diameterComponent_as    as component
         */
        function f_cf_1Dh_asDown(
                                out DiameterShDh p_diameterComponent_as
        ) runs on DiameterShDh 
        {
            // Deactivate all
            deactivate;
            // Unmap all
            unmap;
            // Disconnect all
            disconnect;
            
        } // End of f_cf_1Sh_asDown
        
    } // End of group cfDown 
    
+6 −2
Original line number Diff line number Diff line
@@ -17,14 +17,18 @@ module DiameterShDh_TestSystem {
            ** @desc  The test system interface
            */
            type component TestAdapter {
                port DiameterPort UDR_Sh; // Sh ports
                port DiameterPort HSS_Sh, ASorOSA_Sh, // Sh ports
                                  SLF_Dh, ASorOSA_Dh; // Dh ports
                // Global variables
                
            }
        } // End of group TestSystemInterfaces
        
        type component DiameterShDh extends ServerSyncComp, DiameterComponent { 
            var integer vc_noOfComp    := 1; //Number of components
            //Folowing variables vc_noOfCompWoSip, vc_noOfCompWithSip are initialized here and they are set before each test started within configuration function
            var integer vc_noOfCompWoSip    := 1; //Number of components without SIP components
            var integer vc_noOfCompWithSip  := 1; //Number of components with SIP components
            
        } // End of component DiameterShDh
        
      } // End of group TestComponents