Commit 0a12bc39 authored by reinaortega's avatar reinaortega
Browse files

Several names changed

parent cae5928c

ttcn/V2G/LibItsV2G_Functions.ttcn

+6 −11
Original line number Diff line number Diff line
@@ -210,9 +210,9 @@ 
		 * @param p_sdpReponse If function must send a SDP Response or must not

		 * @see f_prInitialState()

		 */

		function f_prSdpRequestReceived(in boolean p_sdpResponse) runs on ItsV2G {

		function f_prSdpRequestReceived() runs on ItsV2G {

			f_prInitialState();

			f_sdpRequestReceived(p_sdpResponse);

			f_receiveSdpRequest();

		}



		/**
@@ -223,7 +223,7 @@ 
		 */

		function f_prSendSdpMessage(in template Sdp_Message p_sdpMessage) runs on ItsV2G {

			f_prInitialState();

			f_sendv2gMessage(m_generateSdpMessage(p_sdpMessage));

			f_sendV2Gmessage(m_sdpReq(p_sdpMessage));

		}

        

    } // end of group preambles
@@ -233,10 +233,10 @@ 
		 * @desc Received a SDP Request

		 * @param p_response If function must send a SDP Response or must not

		 */

		function f_sdpRequestReceived(in boolean p_response) runs on ItsV2G {

		function f_receiveSdpRequest() runs on ItsV2G {

			tc_v2g_secc_sequenceTimeout.start;

            alt {

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

                [] v2gPort.receive(mw_sdpInd ( mw_sdpRequestMessage (mw_sdpRequestHeader, mw_sdpRequestPayload_generic))) -> value vc_v2gIndMessage

				{ 

					tc_v2g_secc_sequenceTimeout.stop;

                    log("*** TP_EVCC_SDP_CLI_BV_01: PASS: SDP request message received BEFORE expiry of the sequence performance timer***");
@@ -246,11 +246,6 @@ 
                    log("*** TP_EVCC_SDP_CLI_BV_01: FAIL: SDP session request message not receive ***");

                    setverdict(fail);

                }         

            }

			if (p_response)	

			{

				// Send SDP Response accordingly to the SDP request received

				f_sendSdpResponse(vc_v2gIndMessage.sdpIn);

            }

		}
@@ -277,7 +272,7 @@ 
		 * @desc Send a V2G message

		 * @param p_v2gMessage V2G message to be sent

		 */

		function f_sendv2gMessage(in template V2Greq p_v2gMessage) runs on ItsV2G

		function f_sendV2Gmessage(in template V2Greq p_v2gMessage) runs on ItsV2G

		{			

			v2gPort.send(p_v2gMessage);

		}

ttcn/V2G/LibItsV2G_Templates.ttcn

+33 −11
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ module LibItsV2G_Templates { 
		* @desc    Receive template for V2G Message (V2Gport Primitive)

		* @param   p_v2gMsg V2G Message to be received

		*/

	   template V2Gind mw_v2gMessageInd (

	   template V2Gind mw_v2gInd (

		   in template (present) V2G_Message p_v2gMsg

	   ) := { 

		   v2gIn := p_v2gMsg
@@ -64,13 +64,13 @@ module LibItsV2G_Templates { 
		* @desc    Receive template for SDP Message (V2Gport Primitive)

		* @param   p_sdpMsg SDP Message to be received

		*/

	   template V2Gind mw_sdpMessageInd (

	   template V2Gind mw_sdpInd (

		   in template (present) Sdp_Message p_sdpMsg

	   ) := { 

		   sdpIn := p_sdpMsg 

	   };



	   template V2Greq m_generateSdpMessage (

	   template V2Greq m_sdpReq (

	   		in template (present) Sdp_Message p_sdpMsg

	   ) := {

		   sdpOut := p_sdpMsg
@@ -108,7 +108,7 @@ module LibItsV2G_Templates { 
		/**

         * @desc    Receive template for Generic Header SDP

         */

		template Sdp_Header mw_sdpGenericHeader := {

		template Sdp_Header mw_sdpHeader_generic := {

			protocolVersion := ?,

			inverseProtocolVersion := ?,

			payloadType := ?,
@@ -119,7 +119,7 @@ module LibItsV2G_Templates { 
         * @desc    Receive template for Header SDP Request Message

		 * @see		mw_sdpGenericHeader

         */

		template Sdp_Header mw_sdpHeaderRequest modifies mw_sdpGenericHeader := {

		template Sdp_Header mw_sdpRequestHeader modifies mw_sdpHeader_generic := {

			protocolVersion := c_protocolVersion1,

			inverseProtocolVersion := c_inverseProtocolVersion1,

			payloadType := c_sdpRequestMessagePayloadType,
@@ -130,7 +130,7 @@ module LibItsV2G_Templates { 
         * @desc    Receive template for Header SDP Response Message

		 * @see		mw_sdpGenericHeader

         */

		template Sdp_Header mw_sdpHeaderReponse modifies mw_sdpGenericHeader := {

		template Sdp_Header mw_sdpReponseHeader modifies mw_sdpHeader_generic := {

			protocolVersion := c_protocolVersion1,

			inverseProtocolVersion := c_inverseProtocolVersion1,

			payloadType := c_sdpResponseMessagePayloadType,
@@ -140,7 +140,7 @@ module LibItsV2G_Templates { 
		/**

         * @desc    Receive template for Generic Payload of a SDP Request Message

         */

		template Sdp_Request mw_sdpGenericPayloadRequest := {

		template Sdp_Request mw_sdpRequestPayload_generic := {

			security := ?,

			transportProtocol := ?

		}
@@ -148,7 +148,7 @@ module LibItsV2G_Templates { 
		/**

         * @desc    Receive template for Generic Payload of a SDP Response Message

         */

		template Sdp_Response mw_sdpGenericPayloadResponse := {

		template Sdp_Response mw_sdpResponsePayload_generic := {

			seccIPAddress := ?,

			seccPort := ?,

			security := ?,
@@ -161,8 +161,8 @@ module LibItsV2G_Templates { 
		 * @param p_transProto Transport Protocol field

		 * @see	mw_sdpGenericPayloadRequest

         */

		template Sdp_Request mw_sdpSpecificPayloadRequest(in Oct1 p_sec, in Oct1 p_transProto)

		modifies mw_sdpGenericPayloadRequest := {

		template Sdp_Request mw_sdpRequestPayload(in Oct1 p_sec, in Oct1 p_transProto)

		modifies mw_sdpRequestPayload_generic := {

			security := p_sec,

			transportProtocol := p_transProto

		}
@@ -198,7 +198,7 @@ module LibItsV2G_Templates { 
		 * @param p_sdpH	Header of the message

		 * @param p_sdpP	Payload of a Request message

         */

		template Sdp_Message m_generateSdpRequestMessage (in template Sdp_Header p_sdpH,

		template Sdp_Message m_sdpRequestMessage (in template Sdp_Header p_sdpH,

		in template Sdp_Request p_sdpP) := {

			sdpHeader := p_sdpH,

			sdpPayload := {
@@ -206,6 +206,28 @@ module LibItsV2G_Templates { 
			}

		}

		

		/**

		 * @desc    Send template for SDP Request Message Header

		 * @see     mw_sdpGenericHeader

		 */

		template Sdp_Header m_sdpRequestHeader := {

			protocolVersion := c_protocolVersion1,

			inverseProtocolVersion := c_inverseProtocolVersion1,

			payloadType := c_sdpRequestMessagePayloadType,

			payloadLength := c_sdpRequestPayloadLength

		}

		

		/**

		 * @desc    Send template for SDP Request Message Payload

		 * @param p_sec Security Encoding field

		 * @param p_transProto Transport Protocol field

		 * @see mw_sdpGenericPayloadRequest

		 */

		template Sdp_Request m_sdpRequestPayload(in Oct1 p_sec, in Oct1 p_transProto) := {

			security := p_sec,

			transportProtocol := p_transProto

		}



    } // end sdpMessageTemplates