Commit eb7c4dd9 authored by schmitting's avatar schmitting
Browse files

Further changes from validation trials in Berlin

parent c4ee62a1

DiameterGx/ttcn/DiameterGx_Steps.ttcn3

+4 −24
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ 
            vc_destinationRealm := m_destinationRealm(PX_DestinationRealm);

            

            vc_hostIPAddress := valueof(f_IPV4or6_String2Address (PX_DIAMETER_GX_ETS_IPADDR)); 

			vc_hostIPAddress.addressFamily := '0001'O; // NOTE:workaround: tobe considered

            

            vc_send_hopid:=hex2int('00000100'H);

            vc_send_endid:=hex2int('01000000'H);
@@ -281,35 +280,16 @@ 
             {

               setverdict(fail); 

               all timer.stop;

               //stop

               stop;

             }

            [vc_ignore_CER_before_sync_establishement] DIAMP.receive (DIAMETER_MSG:{cER_MSG := mw_CER_dummy}) -> value vc_recvDiamMsgDefault

              {

                vc_ignore_CER_before_sync_establishement := false;

                repeat;

              };

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

              {



                if (ispresent (vc_recvDiamMsgDefault.dWR_MSG.header.hopid)) {

                    vc_recv_hopid := vc_recvDiamMsgDefault.dWR_MSG.header.hopid;

                }

                if (ispresent (vc_recvDiamMsgDefault.dWR_MSG.header.endid)) {

                    vc_recv_endid := vc_recvDiamMsgDefault.dWR_MSG.header.endid;

                }

                f_send_DWA(m_DWA_basic(vc_originHost, vc_originRealm));

                f_send_DWA(m_DWA_dummy);

                repeat;

              };

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

              {



                if (ispresent (vc_recvDiamMsgDefault.cER_MSG.header.hopid)) {

                    vc_recv_hopid := vc_recvDiamMsgDefault.cER_MSG.header.hopid;

                }

                if (ispresent (vc_recvDiamMsgDefault.cER_MSG.header.endid)) {

                    vc_recv_endid := vc_recvDiamMsgDefault.cER_MSG.header.endid;

                }

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

                f_send_CEA(m_CEA_dummy);

                repeat;

              };

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

DiameterGx/ttcn/DiameterGx_Templates.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ module DiameterGx_Templates { 
                        

            template Charging_Rule_Definition_AVP m_chrgRuleDefinition_MK (octetstring p_avpData, template Monitoring_Key_AVP p_monitoringKey) modifies m_chrgRuleDefinition_dummy:=

            {

                aVP_Header := m_aVP_HeaderVid(c_vendIdCharging_Rule_Definition_AVP, lengthof(encvalue(m_chargingRuleName(p_avpData))/8)+lengthof(encvalue(p_monitoringKey))/8, omit),

                aVP_Header := m_aVP_HeaderVid(c_vendIdCharging_Rule_Definition_AVP, lengthof(encvalue(m_chargingRuleName(p_avpData)))/8+lengthof(encvalue(p_monitoringKey))/8, omit),

                charging_Rule_Name := m_chargingRuleName(p_avpData),

                monitoring_Key := p_monitoringKey

            }

DiameterGx/ttcn/DiameterGx_TestCases.ttcn

+352 −1036

File changed.

Preview size limit exceeded, changes collapsed.