Commit 59650307 authored by schmitting's avatar schmitting
Browse files

Changed during "Validation" session in week 10/2013

parent e4ec06ff

DiameterRx/ttcn/DiameterRx_Steps.ttcn3

+6 −1
Original line number Diff line number Diff line
@@ -159,16 +159,21 @@ 
             {

               setverdict(fail); 

               all timer.stop;

               //TODO: need to be done

               //stop

             }

            [] DIAMP.receive (DIAMETER_MSG:{dWR_MSG := mw_DWR_dummy}) -> value vc_recvDiamMsgDefault

              {

                vc_recv_hopid:= vc_recvDiamMsgDefault.dWR_MSG.header.hopid;

                vc_recv_endid:= vc_recvDiamMsgDefault.dWR_MSG.header.endid;

                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);

                vc_recv_hopid:= vc_recvDiamMsgDefault.cER_MSG.header.hopid;

                vc_recv_endid:= vc_recvDiamMsgDefault.cER_MSG.header.endid;

                f_send_CEA(m_CEA_basic(vc_originHost, vc_originRealm, vc_hostIPAddress));

                repeat;

              };

            [] DIAMP.receive (DIAMETER_MSG:?) -> value vc_recvDiamMsgDefault

DiameterRx/ttcn/DiameterRx_Templates.ttcn

+15 −12
Original line number Diff line number Diff line
@@ -145,11 +145,11 @@ module DiameterRx_Templates { 
        		 template AF_Signalling_Protocol_AVP p_afSignallingProtocol) := {

             aVP_Header := m_aVP_HeaderVid(c_vendIdMedia_Sub_Component_AVP,

             					12 // flow_Number

             					+ lengthof(encvalue(p_flowDescription1))

             					+ lengthof(encvalue(p_flowDescription2))

             					+ lengthof(encvalue(p_flowDescription1))/8

             					+ lengthof(encvalue(p_flowDescription2))/8

               					+ 12 // flow_Usage

             					+ lengthof(encvalue(p_FlowStatus))

               					+ lengthof(encvalue(p_afSignallingProtocol)),

             					+ lengthof(encvalue(p_FlowStatus))/8

               					+ lengthof(encvalue(p_afSignallingProtocol))/8,

               					omit),

             flow_Number := {aVP_Header := m_aVP_HeaderVid(c_vendIdFlow_Number_AVP,4, omit), aVP_Data := p_flowNumber},

             flow_Description := {p_flowDescription1, p_flowDescription2},
@@ -181,8 +181,8 @@ module DiameterRx_Templates { 
           aVP_Header := m_aVP_HeaderVid(c_vendIdFlow_Description_AVP,

           						lengthof(p_action)

           						+ lengthof(p_direction)

           						+ lengthof(encvalue(p_src))

           						+ lengthof(encvalue(p_dst))

           						+ lengthof(encvalue(p_src))/8

           						+ lengthof(encvalue(p_dst))/8

   //        						+ lengthof(p_ports)

           						+ lengthof(p_options),

           						omit),
@@ -267,8 +267,8 @@ module DiameterRx_Templates { 
    			   action_ := "permit",

    			   direction := "out",

    			   proto := "ip",

    			   src := {addr := "1.2.3.4", mask := omit, ports := omit},

    			   dst := {addr := "1.2.3.4", mask := omit, ports := omit},

    			   src := {ipno := 4, addr := "1.2.3.4", mask := omit, ports := omit},

    			   dst := {ipno := 4, addr := "1.2.3.4", mask := omit, ports := omit},

   // 			   ports := "",

    			   options := omit

    		   }
@@ -486,8 +486,8 @@ module DiameterRx_Templates { 
            {

                aVP_Header :=

                    m_aVP_HeaderVid(c_vendIdMedia_Component_Description_AVP,

                                    lengthof(encvalue(p_mediaSubComponent)) //     subComponent (32)

                                    + lengthof(encvalue(p_mediaComponentNr)), //     media_Component_Nr (12)

                                    lengthof(encvalue(p_mediaSubComponent))/8 //     subComponent (32)

                                    + lengthof(encvalue(p_mediaComponentNr))/8, //     media_Component_Nr (12)

                                    omit),

                    media_Sub_component := {p_mediaSubComponent},

                    media_Component_Nr := p_mediaComponentNr
@@ -554,6 +554,8 @@ module DiameterRx_Templates { 
                m_specificAction(INDICATION_OF_LOSS_OF_BEARER_E)

          	}

          	

          	

          	

          	template Experimental_Result_Code_AVP mw_experimentalResultCode(template Experimental_Result_Type p_aVP_Data) := {

				//	Ref: 3GPP TS 29.229	6.2 Result-Code AVP values

					aVP_Header := ?,
@@ -784,6 +786,7 @@ module DiameterRx_Templates { 
                  media_Component_Description := {p_mediaComponentDescription}

              }

              

              

              template

              AAR_MSG m_AAR_FIP_Media1_AFAid_AFCid_sURN_MPSid_SIS_SC_SA(template Session_Id_AVP p_sessionId,

                                        template Origin_Host_AVP p_originHost,