Commit c1a9f723 authored by wattelet's avatar wattelet
Browse files

Update of HSS role for CF_1cx1dx1gn configuration

parent d4ad314a
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -356,6 +356,13 @@ module DiameterCxDx_PIXITS
    */
    modulepar boolean PX_SIPsupport := false;
    
    /** 
     * @desc    boolean indicator that is true if the HSS interface is accessible for testing Diameter events at the Cx interface for CF_1Dx1Cx1Gm configuration
     *          Note that: in case of false value the TP is pertially covered.
    */
    modulepar boolean PX_HSSsupport := true;

    
    /**
     * @desc Variant values for Server-Assignment-Type AVP
     * @see ETSI DTS/INT-00103-2 V0.0.8 (2014-11) TP_CX_HSS_SA_04
+11 −19
Original line number Diff line number Diff line
@@ -6023,11 +6023,9 @@ module DiameterCxDx_TestCases
                    f_cf_1Dx1Cx1GmUp_CSCF(v_diameterComponent_slf, v_diameterComponent_hss, v_imsComponent_ue1);
    
                    //Start
                    v_diameterComponent_hss.start(f_TC_DX_CSCF_UA_01_HSS());
                    if (PX_HSSsupport) { v_diameterComponent_hss.start(f_TC_DX_CSCF_UA_01_HSS()); }
                    v_diameterComponent_slf.start(f_TC_DX_CSCF_UA_01_SLF());
                    if (PX_SIPsupport) {
                        v_imsComponent_ue1.start(f_TC_DX_CSCF_UA_01_UE(p_cSeq_s));
                    }
                    if (PX_SIPsupport) { v_imsComponent_ue1.start(f_TC_DX_CSCF_UA_01_UE(p_cSeq_s)); }
                    
                    // synchronize PTC on 3 sychronization points
                    f_serverSyncNClients(f_NrofCompsDx(),{c_initDone, c_prDone, LibDiameter_TypesAndValues.c_sync1, c_tbDone, c_poDone});
@@ -6079,14 +6077,12 @@ module DiameterCxDx_TestCases
                    f_cf_1Dx1Cx1GmUp_CSCF(v_diameterComponent_slf, v_diameterComponent_hss, v_imsComponent_ue1);
    
                    //Start
                    v_diameterComponent_hss.start(f_TC_DX_CSCF_SA_01_HSS());
                    if (PX_HSSsupport) { v_diameterComponent_hss.start(f_TC_DX_CSCF_SA_01_HSS()); }
                    v_diameterComponent_slf.start(f_TC_DX_CSCF_SA_01_SLF());
                    if (PX_SIPsupport) {
                        v_imsComponent_ue1.start(f_TC_DX_CSCF_SA_01_UE(p_cSeq_s));
                    }
                    if (PX_SIPsupport) { v_imsComponent_ue1.start(f_TC_DX_CSCF_SA_01_UE(p_cSeq_s)); }
                    
                    // synchronize PTC on 3 sychronization points
                    f_serverSyncNClients(f_NrofCompsDx(),{c_initDone, c_prDone, c_tbDone, c_poDone});
                    f_serverSyncNClients(f_NrofCompsDx(),{c_initDone, c_prDone, LibDiameter_TypesAndValues.c_sync1, c_tbDone, c_poDone});
    
                    f_cf_1Dx1Cx1GmDown_CSCF(v_diameterComponent_slf, v_diameterComponent_hss, v_imsComponent_ue1);
                } // End of TC_DX_CSCF_SA_01
@@ -6134,14 +6130,12 @@ module DiameterCxDx_TestCases
                    f_cf_1Dx1Cx1GmUp_CSCF(v_diameterComponent_slf, v_diameterComponent_hss, v_imsComponent_ue1);
    
                    //Start
                    v_diameterComponent_hss.start(f_TC_DX_CSCF_LI_01_HSS());
                    if (PX_HSSsupport) { v_diameterComponent_hss.start(f_TC_DX_CSCF_LI_01_HSS()); }
                    v_diameterComponent_slf.start(f_TC_DX_CSCF_LI_01_SLF());
                    if (PX_SIPsupport) {
                        v_imsComponent_ue1.start(f_TC_DX_CSCF_LI_01_UE(p_cSeq_s));
                    }
                    if (PX_SIPsupport) { v_imsComponent_ue1.start(f_TC_DX_CSCF_LI_01_UE(p_cSeq_s)); }
                    
                    // synchronize PTC on 3 sychronization points
                    f_serverSyncNClients(f_NrofCompsDx(),{c_initDone, c_prDone, c_tbDone, c_poDone});
                    f_serverSyncNClients(f_NrofCompsDx(),{c_initDone, c_prDone, LibDiameter_TypesAndValues.c_sync1, c_tbDone, c_poDone});
    
                    f_cf_1Dx1Cx1GmDown_CSCF(v_diameterComponent_slf, v_diameterComponent_hss, v_imsComponent_ue1);
                } // End of TC_DX_CSCF_LI_01
@@ -6189,14 +6183,12 @@ module DiameterCxDx_TestCases
                    f_cf_1Dx1Cx1GmUp_CSCF(v_diameterComponent_slf, v_diameterComponent_hss, v_imsComponent_ue1);
    
                    //Start
                    v_diameterComponent_hss.start(f_TC_DX_CSCF_MA_01_HSS());
                    if (PX_HSSsupport) { v_diameterComponent_hss.start(f_TC_DX_CSCF_MA_01_HSS()); }
                    v_diameterComponent_slf.start(f_TC_DX_CSCF_MA_01_SLF());
                    if (PX_SIPsupport) {
                        v_imsComponent_ue1.start(f_TC_DX_CSCF_MA_01_UE(p_cSeq_s));
                    }
                    if (PX_SIPsupport) { v_imsComponent_ue1.start(f_TC_DX_CSCF_MA_01_UE(p_cSeq_s)); }
                    
                    // synchronize PTC on 3 sychronization points
                    f_serverSyncNClients(f_NrofCompsDx(),{c_initDone, c_prDone, c_tbDone, c_poDone});
                    f_serverSyncNClients(f_NrofCompsDx(),{c_initDone, c_prDone, LibDiameter_TypesAndValues.c_sync1, c_tbDone, c_poDone});
    
                    f_cf_1Dx1Cx1GmDown_CSCF(v_diameterComponent_slf, v_diameterComponent_hss, v_imsComponent_ue1);
                } // End of TC_DX_CSCF_MA_01
+16 −18
Original line number Diff line number Diff line
@@ -45,11 +45,15 @@ module DiameterCxDx_TestConfiguration
    ** @desc f_NrofCompsDx returns the number of test components
    ** based on the PIXIT value PX_SIPsupport
    */
    function f_NrofCompsDx() return UInt
        {    if (PX_SIPsupport)
            { return 3 }
            else
            { return 2 }
    function f_NrofCompsDx() return UInt {
      if (PX_SIPsupport) {
          if (PX_HSSsupport) { return 3; }
          return 2;
      }
      else {
          if (PX_HSSsupport) { return 2; }
          return 1;
      }
    };// end f_NrofCompsDx

    group cfUp {
@@ -218,26 +222,20 @@ module DiameterCxDx_TestConfiguration
        ) runs on DiameterCx  {
            //     Create
            v_diameterDx_slf := DiameterCx.create;
            v_diameterCx_hss := DiameterCx.create;
            if (PX_SIPsupport) {
                v_sipGm_ue := ImsComponent.create;
            }
            if (PX_HSSsupport) { v_diameterCx_hss := DiameterCx.create; }
            if (PX_SIPsupport) { v_sipGm_ue := ImsComponent.create; }

            // Connect mtc sync port
            connect(self:syncPort, self:syncPort);
            // Connect client sync ports
            connect(v_diameterDx_slf:syncPort, self:syncPort);
            connect(v_diameterCx_hss:syncPort, self:syncPort);
            if (PX_SIPsupport) {
                connect(v_sipGm_ue:syncPort, self:syncPort);
            }
            if (PX_HSSsupport) { connect(v_diameterCx_hss:syncPort, self:syncPort); }
            if (PX_SIPsupport) { connect(v_sipGm_ue:syncPort, self:syncPort); }
            
            // Map port
            map( v_diameterDx_slf:DIAMP, system:SLF_Dx);
            map( v_diameterCx_hss:DIAMP, system:HSS_Cx ); 
            if (PX_SIPsupport) {
                map( v_sipGm_ue:SIPP, system:UE_Gm ); 
            }
            if (PX_HSSsupport) { map( v_diameterCx_hss:DIAMP, system:HSS_Cx ); }
            if (PX_SIPsupport) { map( v_sipGm_ue:SIPP, system:UE_Gm ); }
            
            // Activate sync default for MTC
            activate(a_mtc_shutdown());