Commit 37f0e1ee authored by pintar's avatar pintar
Browse files

New PIXIT module and additional port definitions

parent 86421698
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -15,12 +15,16 @@ module LibDiameter_Interface
    //LibDiameter
    import from LibDiameter_TypesAndValues all;
    
    type port LowerLayerPPort message {
          inout Lower_Layer_Primitive}; //LLP 
    
    type port DiameterPort message {
          inout Lower_Layer_Primitive}; //LLP with DIAMETER_MSG
          inout DIAMETER_MSG}; //DIAMETER_MSG
	
    type component DiameterComponent
    {
      //port
      port 	LowerLayerPPort LLPP;
      port 	DiameterPort DIAMP;
      
	  //TODO global variables have to be defined
+25 −0
Original line number Diff line number Diff line
/**
 *	@author 	STF 434
 *  @version    $Id:$
 *	@desc		This module provides PIXITS used by the test component 
 *              for DIAMETER tests.
 */

module LibDiameter_PIXITS
{	
	//  LibCommon
    import from LibCommon_BasicTypesAndValues all;
    import from LibCommon_DataStrings all;
    
    group Diameter_PIXITparameters{
          modulepar {

          /** @desc	boolean for Lower Layer Primitives
          *			if true than LLP are enabled and LLP port is enabled
          *			if false than LLP are disabled and LLP port is disabled
          */
           boolean	PX_DIAM_LLP_ENABLED := false;
          } //	modulepar
      } //group Diameter_PIXITparameters
  
} // end module DiameterSip_PIXITS
 No newline at end of file
+13 −13
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ group AwaitingMessage {
		tc_wait.start;
		alt
		{
        	[]DIAMP.receive	(mw_llp_dataIndication(vc_ETS_conn, p_diameterMSG)) -> value v_MSG
        	[]LLPP.receive	(mw_llp_dataIndication(vc_ETS_conn, p_diameterMSG)) -> value v_MSG
        	  {
        		tc_wait.stop;
        		//TODO store received params
@@ -49,7 +49,7 @@ group SendMessage {
	function f_send(template DIAMETER_MSG p_diameterMSG) runs on DiameterComponent
	{
	    
		DIAMP.send(m_llp_dataRequest(vc_ETS_conn, p_diameterMSG));	  
		LLPP.send(m_llp_dataRequest(vc_ETS_conn, p_diameterMSG));	  
	}
		

@@ -73,18 +73,18 @@ group Preambles {
        
        vc_ETS_conn:=1; // init connection ID, or even better random for each component
        
        DIAMP.send(m_llp_connect(vc_ETS_address, vc_ETS_port, vc_SUT_address, vc_SUT_port,vc_ETS_conn));
        LLPP.send(m_llp_connect(vc_ETS_address, vc_ETS_port, vc_SUT_address, vc_SUT_port,vc_ETS_conn));
        tc_wait.start;
        alt
        {

            [] DIAMP.receive	(mw_llp_connectConfirm(vc_ETS_address, vc_ETS_port, vc_SUT_address, vc_SUT_port,vc_ETS_conn)) -> value v_MSG
            [] LLPP.receive	(mw_llp_connectConfirm(vc_ETS_address, vc_ETS_port, vc_SUT_address, vc_SUT_port,vc_ETS_conn)) -> value v_MSG
              {
                tc_wait.stop;
                log("Connection established");
              };
            
            [] DIAMP.receive	(mw_llp_disconnectIndication(vc_ETS_conn))
            [] LLPP.receive	(mw_llp_disconnectIndication(vc_ETS_conn))
              {
                tc_wait.stop;
                vc_ETS_conn:=0;
@@ -109,14 +109,14 @@ group Preambles {
    {
        var Lower_Layer_Primitive v_MSG;
        
        DIAMP.send(m_llp_listen(vc_ETS_address, vc_ETS_port, vc_SUT_address, vc_SUT_port));
        LLPP.send(m_llp_listen(vc_ETS_address, vc_ETS_port, vc_SUT_address, vc_SUT_port));
        tc_wait.start;
        alt
        {
            [] DIAMP.receive	(mw_llp_connectIndication(*,*,*,*,*)) -> value v_MSG
            [] LLPP.receive	(mw_llp_connectIndication(*,*,*,*,*)) -> value v_MSG
              {
                tc_wait.stop;
                vc_ETS_conn:=v_MSG.ll_header._ETS_conn;
                vc_ETS_conn:=v_MSG.ll_header.ETS_conn;
                log("Connection established");
              };
            [] tc_wait.timeout
@@ -139,10 +139,10 @@ group Postambles {
    function f_postambleDisconnect() runs on DiameterComponent
    {
        
        DIAMP.send(m_llp_disconnect(vc_ETS_conn));
        LLPP.send(m_llp_disconnect(vc_ETS_conn));
        vc_ETS_conn:=0;
        
        all timer stop;
        all timer.stop;
        //stop;
        
    }
@@ -164,7 +164,7 @@ group DefaultsTestStep
           //stop
         }

        [] DIAMP.receive	(mw_llp_disconnectIndication(vc_ETS_conn))
        [] LLPP.receive	(mw_llp_disconnectIndication(vc_ETS_conn))
          {
            tc_wait.stop;
            vc_ETS_conn:=0;
@@ -181,11 +181,11 @@ group DefaultsTestStep
           all timer.stop;
           //stop
         }
        [] DIAMP.receive	(mw_llp_dataIndication(vc_ETS_conn, */*DWR*/))
        [] LLPP.receive	(mw_llp_dataIndication(vc_ETS_conn, */*DWR*/))
          {
            //f_send(/*DWA*/);
          };
        [] DIAMP.receive	(mw_llp_dataIndication(vc_ETS_conn, */*CER*/))
        [] LLPP.receive	(mw_llp_dataIndication(vc_ETS_conn, */*CER*/))
          {
            //f_send(/*CEA*/);
          };
+4 −4
Original line number Diff line number Diff line
@@ -177,22 +177,22 @@ module LibDiameter_Templates {
              reserved_bits := ?
            }
            
            template DiameterHeader m_diameterHeaderReq_dummy(Command_Code p_cmdcode, integer p_applidSip) := {
            template DiameterHeader m_diameterHeaderReq_dummy(Command_Code p_cmdcode, integer p_applid) := {
                version := c_versionId,
                msglen := 0,					//Message lenght with AVPs has to be calculated
                cmdflags := m_cmdFlagsReq,		//RPETrrrr 
                cmdcode := p_cmdcode,			//Command code
                applid := p_applidSip,			//Diameter common messages =0, Vendor specific applications = 16777216 - 4294967294(0x01000000-0xfffffffe)
                applid := p_applid,			//Diameter common messages =0, Vendor specific applications = 16777216 - 4294967294(0x01000000-0xfffffffe) -Gx=16777238,Rx=16777236, 3GPP Cx/Dx=13777216,3GPP Sh=16777217
                hopid := omit,
                endid := omit
            }
            
            template DiameterHeader mw_diameterHeaderAns_dummy(Command_Code p_cmdcode, integer p_applidSip) := {
            template DiameterHeader mw_diameterHeaderAns_dummy(Command_Code p_cmdcode, integer p_applid) := {
                version := c_versionId,
                msglen := ?,					//Message lenght with AVPs has to be calculated
                cmdflags := mw_cmdFlags,		//RPETrrrr 
                cmdcode := p_cmdcode,			//Command code
                applid := p_applidSip,			//Diameter common messages =0, Vendor specific applications = 16777216 - 4294967294(0x01000000-0xfffffffe)
                applid := p_applid,			//Diameter common messages =0, Vendor specific applications = 16777216 - 4294967294(0x01000000-0xfffffffe) -Gx=16777238,Rx=16777236, 3GPP Cx/Dx=13777216,3GPP Sh=16777217
                hopid := *,
                endid := *
            }
+220 −4

File changed.

Preview size limit exceeded, changes collapsed.