Commit 576e9681 authored by pintar's avatar pintar
Browse files

Changes after week 3/2015 validation session

parent 6ca7f255

ttcn/LibDiameter_Interface.ttcn

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ module LibDiameter_Interface 
      var template (value) Destination_Host_AVP vc_destinationHost;

      var template (value) Destination_Realm_AVP vc_destinationRealm;



      var template (value) Destination_Host_AVP vc_destinationHost_IUT;

      var template (value) Destination_Realm_AVP vc_destinationRealm_IUT;



      var template Termination_Cause_AVP vc_terminationCause;

      var template Result_Code_AVP vc_resultCode;

      var template Media_Component_Description_AVP vc_mediaComponentDescription;

ttcn/LibDiameter_Steps.ttcn

+16 −16
Original line number Diff line number Diff line
@@ -1161,8 +1161,8 @@ group GlobalSteps { 
                //S6a messages

                if (ischosen(p_diameterMSG.uLR_MSG)){

                    p_diameterMSG.uLR_MSG.header.msglen := lengthof(encvalue(p_diameterMSG.uLR_MSG))/8;

                    p_diameterMSG.uLR_MSG.header.hopid:=vc_recv_hopid;

                    p_diameterMSG.uLR_MSG.header.endid:=vc_recv_endid;

                    p_diameterMSG.uLR_MSG.header.hopid:=f_inc(vc_send_hopid);

                    p_diameterMSG.uLR_MSG.header.endid:=f_inc(vc_send_endid);

                    vc_sendDiamMsg:=valueof(p_diameterMSG);

                }

                if (ischosen(p_diameterMSG.uLA_MSG)){
@@ -1173,8 +1173,8 @@ group GlobalSteps { 
                }

                if (ischosen(p_diameterMSG.aIR_MSG)){

                    p_diameterMSG.aIR_MSG.header.msglen := lengthof(encvalue(p_diameterMSG.aIR_MSG))/8;

                    p_diameterMSG.aIR_MSG.header.hopid:=vc_recv_hopid;

                    p_diameterMSG.aIR_MSG.header.endid:=vc_recv_endid;

                    p_diameterMSG.aIR_MSG.header.hopid:=f_inc(vc_send_hopid);

                    p_diameterMSG.aIR_MSG.header.endid:=f_inc(vc_send_endid);

                    vc_sendDiamMsg:=valueof(p_diameterMSG);

                }

                if (ischosen(p_diameterMSG.aIA_MSG)){
@@ -1185,8 +1185,8 @@ group GlobalSteps { 
                }

                if (ischosen(p_diameterMSG.cLR_MSG)){

                    p_diameterMSG.cLR_MSG.header.msglen := lengthof(encvalue(p_diameterMSG.cLR_MSG))/8;

                    p_diameterMSG.cLR_MSG.header.hopid:=vc_recv_hopid;

                    p_diameterMSG.cLR_MSG.header.endid:=vc_recv_endid;

                    p_diameterMSG.cLR_MSG.header.hopid:=f_inc(vc_send_hopid);

                    p_diameterMSG.cLR_MSG.header.endid:=f_inc(vc_send_endid);

                    vc_sendDiamMsg:=valueof(p_diameterMSG);

                }

                if (ischosen(p_diameterMSG.cLA_MSG)){
@@ -1197,8 +1197,8 @@ group GlobalSteps { 
                }

                if (ischosen(p_diameterMSG.iDR_MSG)){

                    p_diameterMSG.iDR_MSG.header.msglen := lengthof(encvalue(p_diameterMSG.iDR_MSG))/8;

                    p_diameterMSG.iDR_MSG.header.hopid:=vc_recv_hopid;

                    p_diameterMSG.iDR_MSG.header.endid:=vc_recv_endid;

                    p_diameterMSG.iDR_MSG.header.hopid:=f_inc(vc_send_hopid);

                    p_diameterMSG.iDR_MSG.header.endid:=f_inc(vc_send_endid);

                    vc_sendDiamMsg:=valueof(p_diameterMSG);

                }

                if (ischosen(p_diameterMSG.iDA_MSG)){
@@ -1209,8 +1209,8 @@ group GlobalSteps { 
                }

                if (ischosen(p_diameterMSG.dSR_MSG)){

                    p_diameterMSG.dSR_MSG.header.msglen := lengthof(encvalue(p_diameterMSG.dSR_MSG))/8;

                    p_diameterMSG.dSR_MSG.header.hopid:=vc_recv_hopid;

                    p_diameterMSG.dSR_MSG.header.endid:=vc_recv_endid;

                    p_diameterMSG.dSR_MSG.header.hopid:=f_inc(vc_send_hopid);

                    p_diameterMSG.dSR_MSG.header.endid:=f_inc(vc_send_endid);

                    vc_sendDiamMsg:=valueof(p_diameterMSG);

                }

                if (ischosen(p_diameterMSG.dSA_MSG)){
@@ -1221,8 +1221,8 @@ group GlobalSteps { 
                }

                if (ischosen(p_diameterMSG.pUER_MSG)){

                    p_diameterMSG.pUER_MSG.header.msglen := lengthof(encvalue(p_diameterMSG.pUER_MSG))/8;

                    p_diameterMSG.pUER_MSG.header.hopid:=vc_recv_hopid;

                    p_diameterMSG.pUER_MSG.header.endid:=vc_recv_endid;

                    p_diameterMSG.pUER_MSG.header.hopid:=f_inc(vc_send_hopid);

                    p_diameterMSG.pUER_MSG.header.endid:=f_inc(vc_send_endid);

                    vc_sendDiamMsg:=valueof(p_diameterMSG);

                }

                if (ischosen(p_diameterMSG.pUEA_MSG)){
@@ -1233,8 +1233,8 @@ group GlobalSteps { 
                }

                if (ischosen(p_diameterMSG.rSR_MSG)){

                    p_diameterMSG.rSR_MSG.header.msglen := lengthof(encvalue(p_diameterMSG.rSR_MSG))/8;

                    p_diameterMSG.rSR_MSG.header.hopid:=vc_recv_hopid;

                    p_diameterMSG.rSR_MSG.header.endid:=vc_recv_endid;

                    p_diameterMSG.rSR_MSG.header.hopid:=f_inc(vc_send_hopid);

                    p_diameterMSG.rSR_MSG.header.endid:=f_inc(vc_send_endid);

                    vc_sendDiamMsg:=valueof(p_diameterMSG);

                }

                if (ischosen(p_diameterMSG.rSA_MSG)){
@@ -1245,8 +1245,8 @@ group GlobalSteps { 
                }

                if (ischosen(p_diameterMSG.nOR_MSG)){

                    p_diameterMSG.nOR_MSG.header.msglen := lengthof(encvalue(p_diameterMSG.nOR_MSG))/8;

                    p_diameterMSG.nOR_MSG.header.hopid:=vc_recv_hopid;

                    p_diameterMSG.nOR_MSG.header.endid:=vc_recv_endid;

                    p_diameterMSG.nOR_MSG.header.hopid:=f_inc(vc_send_hopid);

                    p_diameterMSG.nOR_MSG.header.endid:=f_inc(vc_send_endid);

                    vc_sendDiamMsg:=valueof(p_diameterMSG);

                }

                if (ischosen(p_diameterMSG.nOA_MSG)){

ttcn/LibDiameter_Templates.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ module LibDiameter_Templates { 
            }



            template Supported_Features_AVP mw_supportedFeatures_dummy := {

                aVP_Header := m_aVP_HeaderVid_Mbit1(c_supported_Features_AVP_Code, 1, c_vendId3gpp),

                aVP_Header := mw_aVP_HeaderVid_Mbit1(c_supported_Features_AVP_Code, ?, c_vendId3gpp),

                vendor_Id       := ?,

                feature_list_Id := *,

                feature_list    := ?,