Commit 2c9fc5b2 authored by reinaortega's avatar reinaortega
Browse files

Some issues

parent 1e89cf7a

ttcn/V2G/LibItsV2G_Functions.ttcn

+4 −6
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ 
            

            map(self:utPort, system:utPort);

            map(self:v2gPort, system:v2gPort);

            f_connect4SelfOrClientSync();

            

        } // end f_cfUp
@@ -135,7 +134,6 @@ 
            

            unmap(self:utPort, system:utPort);

            unmap(self:v2gPort, system:v2gPort);

            f_disconnect4SelfOrClientSync();

            

        } // end f_cfDown
@@ -225,15 +223,15 @@ 
		 * @param p_response If function must send a SDP Response or must not

		 */

		function f_sdpRequestReceived(in boolean p_response) runs on ItsV2G {

			t_v2g_secc_sequenceTimeout.start( c_v2g_seccSequenceTimeout * 0.95 );

			tc_v2g_secc_sequenceTimeout.start;

            alt {

                [] v2gPort.receive(mw_sdpMessageInd ( mw_sdpRequestMessage (mw_sdpHeaderRequest, mw_sdpGenericPayloadRequest))) -> value vc_v2gIndMessage

				{ 

					t_v2g_secc_sequenceTimeout.stop;

					tc_v2g_secc_sequenceTimeout.stop;

                    log("*** TP_EVCC_SDP_CLI_BV_01: PASS: SDP request message received BEFORE expiry of the sequence performance timer***");

                    setverdict(pass);

                }   

                [] t_v2g_secc_sequenceTimeout.timeout {

                [] tc_v2g_secc_sequenceTimeout.timeout {

                    log("*** TP_EVCC_SDP_CLI_BV_01: FAIL: SDP session request message not receive ***");

                    setverdict(fail);

                }
@@ -251,7 +249,7 @@ 
		 */

		function f_sendSdpResponse(in Sdp_Message p_sdpRequest) runs on ItsV2G

		{

			// To be completed!!!

			// To be completed!!! -> Use templates for sending and not variables!

			var V2Greq v_sdpResponseMessage;



			v_sdpResponseMessage.sdpOut.sdpPayload.sdpResponse.security := p_sdpRequest.sdpPayload.sdpRequest.security;

ttcn/V2G/LibItsV2G_TestSystem.ttcn

+8 −8
Original line number Diff line number Diff line
@@ -37,17 +37,17 @@ module LibItsV2G_TestSystem { 


        group v2gApplicationLayerPorts {

            

            group xxxPorts {

            group ap1Ports {



                /**

                 * @desc XXX V2G Application Layer Port  

                 * @desc AP1 V2G Application Layer Port  

                 */

                type port V2Gport message {

                    in V2Gind;

                    out V2Greq;

                } // end V2Gport

                                

            } // End of group xxxPorts

            } // End of group ap1Ports

            

        } // End of group v2gApplicationLayerPorts
@@ -80,7 +80,7 @@ module LibItsV2G_TestSystem { 
        port V2Gport v2gPort;

                

        // timers

		timer t_v2g_secc_sequenceTimeout;

		timer tc_v2g_secc_sequenceTimeout := c_v2g_seccSequenceTimeout * 0.95;

        

        // Global variables    E X A M P L E 

        var sessionIDType_TYPE vc_sId;
@@ -91,10 +91,10 @@ module LibItsV2G_TestSystem { 
        

    group v2gApplicationLayerPrimitives { 

            

        group xxxPrimitives {

        group ap1Primitives {



            /**

             * @desc XXX V2G Indication Primitive 

             * @desc AP1 V2G Indication Primitive 

             */

            type union V2Gind {

				V2G_Message v2gIn,
@@ -102,14 +102,14 @@ module LibItsV2G_TestSystem { 
            }

        

            /**

             * @desc XXX V2G Request Primitive 

             * @desc AP1 V2G Request Primitive 

             */

            type union V2Greq {

				V2G_Message v2gOut,

				Sdp_Message	sdpOut

            }

                        

        } // end xxxPrimitives

        } // end ap1Primitives

        

    } // End of group v2gApplicationLayerPrimitives    

    with {

ttcn/V2G/LibItsV2G_TypesAndValues.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ module LibItsV2G_TypesAndValues { 
    

    // LibIts

	//import from iso_15118_2_2010_MsgBody all; //language "XSD" all with {extension "File:V2G_CI_MsgBody.xsd" };

	//import from iso_15118_2_2010_AppProtocol all;//language "XSD" all with {extension "File:XSD/V2G_CI_AppProtocol.xsd" };

	import from iso_15118_2_2010_AppProtocol all;//language "XSD" all with {extension "File:XSD/V2G_CI_AppProtocol.xsd" };

	//import from iso_15118_2_2010_MsgDataTypes all;//language "XSD" all with {extension "File:XSD/V2G_CI_MsgDataTypes.xsd" };

	import from iso_15118_2_2010_MsgDef all;//language "XSD" all with {extension "File:XSD/V2G_CI_MsgDef.xsd" };

	//import from iso_15118_2_2010_MsgHeader all;//language "XSD" all with {extension "File:XSD/V2G_CI_MsgHeader.xsd" };

ttcn/V2G/LibItsV2G_Templates.ttcn

+1 −1

File changed.

Contains only whitespace changes.