Commit 48d1f520 authored by schmitting's avatar schmitting
Browse files

Validation Results included

parent bb2e16b4
Loading
Loading
Loading
Loading
+321 −302

File changed.

Preview size limit exceeded, changes collapsed.

+0 −60
Original line number Diff line number Diff line
@@ -91,18 +91,6 @@
            f_preambleDiameterBaseServer(c_applIdGx);
        }
        
        function f_ConfigUp_PCRF(DiameterComponent p_diameterComponent_pcrf, 
        						 GtpComponent p_gtpComponent1, GtpComponent p_gtpComponent2) runs on ServerSyncComp
        {
            if (PX_GTPsupport) {
    			f_cf_1Gx2GtpRUp(p_diameterComponent_pcrf, p_gtpComponent1,
    							p_gtpComponent2);
    		} else {
    			action("Please trigger PCEF for CCR initial request.");
    			f_cf_1GxRUp(p_diameterComponent_pcrf);
    		}
        }
                
    }// end group Preambles
    
    group Postambles {
@@ -252,52 +240,4 @@
    
    } //end group CheckFunctions
             
    group DefaultAltsteps {
    
    	
    	
    	/**
    	* @desc	This default handles receiving of the sync server
    	*		STOP message and calls the RT HUT postamble. (copy from common lib)
    	*/	
    	altstep a_diameter_catchSyncStop() runs on DiameterComponent 
    	{
    		[]	syncPort.receive(m_syncServerStop)
    		{
    			tc_sync.stop ;
    			log("**** a_diamater_catchSyncStop: Test component received STOP signal from MTC - going to IDLE state **** ");
    			syncPort.send(m_syncClientStop);
    			f_terminate_diameter_component();
    			log("**** a_diameter_catchSyncStop: TEST COMPONENT NOW STOPPING ITSELF! **** ") ;
    			setverdict(inconc);
    			stop ;
    		}
    	} 
    
        altstep a_diameter_default() runs on DiameterComponent
        {
            [] any timer.timeout 
             {
               setverdict(fail); 
               all timer.stop;
               stop;
             }
            [] DIAMP.receive (DIAMETER_MSG:{dWR_MSG := mw_DWR_dummy}) -> value vc_recvDiamMsgDefault
              {
                f_send_DWA(m_DWA_dummy);
                repeat;
              };
            [] DIAMP.receive (DIAMETER_MSG:{cER_MSG := mw_CER_dummy}) -> value vc_recvDiamMsgDefault
              {
                f_send_CEA(m_CEA_dummy);
                repeat;
              };
            [] DIAMP.receive (DIAMETER_MSG:?) -> value vc_recvDiamMsgDefault
              {
                  //TODO: need to be done
                  setverdict (fail);
              };
        }
    
    }// end group DefaultAltsteps
} // end module DiameterGx_Steps
 No newline at end of file
+138 −155

File changed.

Preview size limit exceeded, changes collapsed.

+44 −44
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                // Start
@@ -801,7 +801,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -826,7 +826,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -851,7 +851,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -876,7 +876,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -900,7 +900,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -926,7 +926,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -949,7 +949,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -972,7 +972,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -995,7 +995,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1018,7 +1018,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1043,7 +1043,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1066,7 +1066,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1091,7 +1091,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1113,7 +1113,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1135,7 +1135,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1157,7 +1157,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1179,7 +1179,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1201,7 +1201,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1223,7 +1223,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1245,7 +1245,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1267,7 +1267,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1289,7 +1289,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1311,7 +1311,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1333,7 +1333,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1355,7 +1355,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1377,7 +1377,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1399,7 +1399,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1421,7 +1421,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1443,7 +1443,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1465,7 +1465,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1487,7 +1487,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1510,7 +1510,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1535,7 +1535,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1559,7 +1559,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
		
                //Start
@@ -1583,7 +1583,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
				
                //Start
@@ -1605,7 +1605,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
						
                //Start
@@ -1627,7 +1627,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
						
                //Start
@@ -1649,7 +1649,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
						
                //Start
@@ -1671,7 +1671,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
						
                //Start
@@ -1693,7 +1693,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
						
                //Start
@@ -1715,7 +1715,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
						
               //Start
@@ -1739,7 +1739,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
						
                //Start
@@ -1761,7 +1761,7 @@ module DiameterGx_TestCases
                var GtpComponent v_gtpComponent_1;
				var GtpComponent v_gtpComponent_2;
				
				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,
				f_cf_1Gx2GtpRUp(v_diameterComponent_pcrf, v_gtpComponent_1,
									v_gtpComponent_2);
						
                //Start
+13 −10
Original line number Diff line number Diff line
@@ -119,26 +119,31 @@ module DiameterGx_TestConfiguration

            //Create
            p_diameterComponent_pcrf := DiameterComponent.create ;
            if (PX_GTPsupport) {
                p_gtpComponent1 := GtpComponent.create ;
                p_gtpComponent2 := GtpComponent.create ;
            }
            
            //Connect
            connect(p_diameterComponent_pcrf:syncPort, self:syncPort) ;
            if (PX_GTPsupport) {
                connect(p_gtpComponent1:syncPort, self:syncPort) ;
                connect(p_gtpComponent2:syncPort, self:syncPort) ;
            }
            //Map 
            map(p_diameterComponent_pcrf:DIAMP, system:PCRF_Gx);// Diameter Init test Configuration
            if (PX_GTP) {
            if (PX_GTPsupport) {
                map(p_gtpComponent1:GTP, system:GTP1);// Diameter Init test Configuration
                map(p_gtpComponent2:GTP, system:GTP2);// Diameter Init test Configuration
            }
            else {action("Please trigger PCEF for CCR initial request.");}
            
            if (PX_DIAM_LLP_ENABLED){
                map(p_diameterComponent_pcrf:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
            }
            
            f_setVerdict(v_ret);
        }//end f_cf_1GxRUp
        }//end f_cf_1Gx2GtpRUp

	}//end group cfUp
	
@@ -221,10 +226,8 @@ module DiameterGx_TestConfiguration
            disconnect(p_gtpComponent2:syncPort, self:syncPort);
            //Unmap
            unmap(p_diameterComponent_pcrf:DIAMP, system:PCRF_Gx);
            if (PX_GTP) {
            unmap(p_gtpComponent1:GTP, system:GTP1);// Diameter Init test Configuration
            unmap(p_gtpComponent2:GTP, system:GTP2);// Diameter Init test Configuration
            }
            if (PX_DIAM_LLP_ENABLED){
                unmap(p_diameterComponent_pcrf:LLPP, system:LLIMS);
            }
Loading