Some quality errors fixed, after running t3q application. (ec63de57) · Commits · TTCN-3 Libraries / LibIts

ttcn/FNTP/LibItsFntp_Functions.ttcn3

+39 −39

Original line number	Diff line number	Diff line
		@@ -347,14 +347,14 @@ module LibItsFntp_Functions {
		function f_acGenerateFntpNPDU(
		in template (value) PortNumber p_sourcePort,
		in template (value) PortNumber p_destinationPort,
		in template (value) LLserviceAddr p_insap_source_address,
		in template (value) LLserviceAddr p_insap_dest_address,
		in template (value) LLserviceAddr p_insapSourceAddress,
		in template (value) LLserviceAddr p_insapDestAddress,
		in FNTPhopCount p_hops
		) runs on ItsNt {
		f_acTriggerEvent(
		m_generateFntpNPDU(
		p_insap_source_address,
		p_insap_dest_address,
		p_insapSourceAddress,
		p_insapDestAddress,
		bit2oct(
		encvalue(
		m_fntpBasicNPDU(
		@@ -372,21 +372,21 @@ module LibItsFntp_Functions {
		* @desc Triggers lower tester to send FNTP station-internal NDPU with several hops and an invalid control field
		* @param p_sourcePort Source port
		* @param p_destinationPort Destination port
		* @param p_insap_source_address IN-SAP source port
		* @param p_insap_dest_address IN-SAP destination port
		* @param p_insapSourceAddress IN-SAP source port
		* @param p_insapDestAddress IN-SAP destination port
		* @param p_hops N-hops value
		*/
		function f_acGenerateFntpNPDU_InvalidCtrlField(
		in template (value) PortNumber p_sourcePort,
		in template (value) PortNumber p_destinationPort,
		in template (value) LLserviceAddr p_insap_source_address, // TODO Rename in p_insap_source_address
		in template (value) LLserviceAddr p_insap_dest_address, // TODO Rename in p_insap_dest_address
		in template (value) LLserviceAddr p_insapSourceAddress, // TODO Rename in p_insapSourceAddress
		in template (value) LLserviceAddr p_insapDestAddress, // TODO Rename in p_insapDestAddress
		in template (value) FNTPhopCount p_hops
		) runs on ItsNt {
		f_acTriggerEvent(
		m_generateFntpNPDU(
		p_insap_source_address,
		p_insap_dest_address,
		p_insapSourceAddress,
		p_insapDestAddress,
		bit2oct(
		encvalue(
		md_fntpExtendedNPDU_InvalidCtrlField(
		@@ -404,19 +404,19 @@ module LibItsFntp_Functions {
		* @desc Triggers lower tester to send FNTP station-internal NDPU with bit5 set
		* @param p_sourcePort Source port
		* @param p_destinationPort Destination port
		* @param p_insap_source_address IN-SAP source port
		* @param p_insap_dest_address IN-SAP destination port
		* @param p_insapSourceAddress IN-SAP source port
		* @param p_insapDestAddress IN-SAP destination port
		*/
		function f_acGenerateFntpNPDU_InvalidBitSet(
		in template (value) PortNumber p_sourcePort,
		in template (value) PortNumber p_destinationPort,
		in template (value) LLserviceAddr p_insap_source_address, // TODO Rename in p_insap_source_address
		in template (value) LLserviceAddr p_insap_dest_address // TODO Rename in p_insap_dest_address
		in template (value) LLserviceAddr p_insapSourceAddress, // TODO Rename in p_insapSourceAddress
		in template (value) LLserviceAddr p_insapDestAddress // TODO Rename in p_insapDestAddress
		) runs on ItsNt {
		f_acTriggerEvent(
		m_generateFntpNPDU(
		p_insap_source_address,
		p_insap_dest_address,
		p_insapSourceAddress,
		p_insapDestAddress,
		bit2oct(
		encvalue(
		md_fntpExtendedNPDU_InvalidBitSet(
		@@ -434,8 +434,8 @@ module LibItsFntp_Functions {
		* @desc Triggers test adapter to send FNTP NDPU
		* @param p_sourcePort Source port
		* @param p_destinationPort Destination port
		* @param p_insap_source_address IN-SAP source port
		* @param p_insap_dest_address IN-SAP destination port
		* @param p_insapSourceAddress IN-SAP source port
		* @param p_insapDestAddress IN-SAP destination port
		* @param p_hops N-hops value
		* @param p_rxCIP Receive (RX) parameter settings
		* @param p_txCIP Transmit (TX) parameters of a VCI
		@@ -444,8 +444,8 @@ module LibItsFntp_Functions {
		function f_acGenerateFntpNPDU_CIP(
		in template (value) PortNumber p_sourcePort,
		in template (value) PortNumber p_destinationPort,
		in template (value) LLserviceAddr p_insap_source_address, // TODO Rename in p_insap_source_address
		in template (value) LLserviceAddr p_insap_dest_address, // TODO Rename in p_insap_dest_address
		in template (value) LLserviceAddr p_insapSourceAddress, // TODO Rename in p_insapSourceAddress
		in template (value) LLserviceAddr p_insapDestAddress, // TODO Rename in p_insapDestAddress
		in template (value) FNTPhopCount p_hops,
		in template (value) RXcip p_rxCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough
		in template (value) TXcip p_txCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough
		@@ -453,8 +453,8 @@ module LibItsFntp_Functions {
		) runs on ItsNt {
		f_acTriggerEvent(
		m_generateFntpNPDU_CIP(
		p_insap_source_address,
		p_insap_dest_address,
		p_insapSourceAddress,
		p_insapDestAddress,
		bit2oct(
		encvalue(
		md_fntpExtendedNPDU_CIP(
		@@ -487,15 +487,15 @@ module LibItsFntp_Functions {
		in template (value) PortNumber p_destinationPort,
		in template (value) PortNumber p_fromPort,
		in template (value) PortNumber p_toPort,
		in template (value) LLserviceAddr p_insap_source_address, // TODO Rename in p_insap_source_address
		in template (value) LLserviceAddr p_insap_dest_address, // TODO Rename in p_insap_dest_address
		in template (value) LLserviceAddr p_insapSourceAddress, // TODO Rename in p_insapSourceAddress
		in template (value) LLserviceAddr p_insapDestAddress, // TODO Rename in p_insapDestAddress
		in template (value) FNTPpacketCounter p_counter,
		in template (value) FNTPhopCount p_hops
		) runs on ItsNt {
		f_acTriggerEvent(
		m_generateFntpNPDU(
		p_insap_source_address,
		p_insap_dest_address,
		p_insapSourceAddress,
		p_insapDestAddress,
		bit2oct(
		encvalue(
		md_fntpForwardingNPDU(
		@@ -528,15 +528,15 @@ module LibItsFntp_Functions {
		in template (value) PortNumber p_destinationPort,
		in template (value) PortNumber p_fromPort,
		in template (value) PortNumber p_toPort,
		in template (value) LLserviceAddr p_insap_source_address, // TODO Rename in p_insap_source_address
		in template (value) LLserviceAddr p_insap_dest_address, // TODO Rename in p_insap_dest_address
		in template (value) LLserviceAddr p_insapSourceAddress, // TODO Rename in p_insapSourceAddress
		in template (value) LLserviceAddr p_insapDestAddress, // TODO Rename in p_insapDestAddress
		in template (value) FNTPpacketCounter p_counter,
		in template (value) FNTPhopCount p_hops
		) runs on ItsNt {
		f_acTriggerEvent(
		m_generateFntpNPDU(
		p_insap_source_address,
		p_insap_dest_address,
		p_insapSourceAddress,
		p_insapDestAddress,
		bit2oct(
		encvalue(
		md_fntpForwardingNPDU_UnknownITS_SCU_ID(
		@@ -571,8 +571,8 @@ module LibItsFntp_Functions {
		in template (value) PortNumber p_destinationPort,
		in template (value) PortNumber p_fromPort,
		in template (value) PortNumber p_toPort,
		in template (value) LLserviceAddr p_insap_source_address, // TODO Rename in p_insap_source_address
		in template (value) LLserviceAddr p_insap_dest_address, // TODO Rename in p_insap_dest_address
		in template (value) LLserviceAddr p_insapSourceAddress, // TODO Rename in p_insapSourceAddress
		in template (value) LLserviceAddr p_insapDestAddress, // TODO Rename in p_insapDestAddress
		in template (value) FNTPpacketCounter p_counter,
		in template (value) FNTPhopCount p_hops,
		in template (value) RXcip p_rxCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough
		@@ -581,8 +581,8 @@ module LibItsFntp_Functions {
		) runs on ItsNt {
		f_acTriggerEvent(
		m_generateFntpNPDU_CIP(
		p_insap_source_address,
		p_insap_dest_address,
		p_insapSourceAddress,
		p_insapDestAddress,
		bit2oct(
		encvalue(
		md_fntpForwardingNPDU_CIP(
		@@ -616,19 +616,19 @@ module LibItsFntp_Functions {
		* @verdict Unchanged on success, set to fail otherwise
		* @see ISO/CD 21218 - Clause 8.2.2
		*/
		function oct2npdu(in octetstring p_data, in charstring p_syncPoint, out FNTPNPDU p_decoded) runs on ItsAdapterComponent {
		function f_oct2npdu(in octetstring p_data, in charstring p_syncPoint, out FNTPNPDU p_decoded) runs on ItsAdapterComponent {
		var integer v_result;

		v_result := decvalue(oct2bit(p_data), p_decoded);
		if (v_result == 1) {
		f_selfOrClientSyncAndVerdictTestBody(p_syncPoint, e_error);
		log("* oct2npdu: FAIL: 'decvalue' operation failed *");
		log("* f_oct2npdu: FAIL: 'decvalue' operation failed *");
		} else if (v_result == 2) {
		f_selfOrClientSyncAndVerdictTestBody(p_syncPoint, e_error);
		log("* oct2npdu: FAIL: 'decvalue' operation failed, not enougth bits *");
		log("* f_oct2npdu: FAIL: 'decvalue' operation failed, not enougth bits *");
		}
		log("* oct2npdu: INFO: Decoded message done *");
		} // End of function oct2npdu
		log("* f_oct2npdu: INFO: Decoded message done *");
		} // End of function f_oct2npdu

		} // End of group internalFunctions

ttcn/LibIts_Interface.ttcn

+5 −6

Original line number	Diff line number	Diff line
		@@ -109,9 +109,6 @@ module LibIts_Interface {
		*/
		type component ItsFa extends ItsAdapterComponent {

		// component variables
		var CamInd vc_camMsg;

		// FA1 ports
		port CamPort camPort;
		port DenmPort denmPort;
		@@ -119,11 +116,13 @@ module LibIts_Interface {
		// FA2 ports
		port CooperPort cooperPort;

		//timers

		//component variables
		var CamInd vc_camMsg;
		//default
		var default vc_default := null;

		// timers

		//global variables
		var SequenceNo vc_sequenceNo := 0;
		var boolean vc_camReceived := false;
		@@ -264,7 +263,7 @@ module LibIts_Interface {
		*/
		type port IicpPort message {
		inout
		IicpResp,
		IicpReq,
		IicpResp;
		} // End of port IicpPort