Quality checker corrections (a4f6d707) · Commits · TTCN-3 Libraries / LibIts

ttcn/CALM/FNTP/LibItsFntp_Functions.ttcn3

+23 −23

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ module LibItsFntp_Functions {
		import from CALMfntp language "ASN.1:1997" all;
		import from LibItsMgt_Functions {
		altstep
		a_mgtMnSapPortDefault, a_mgtSapAwaitFWTupdate
		a_mgtMnSapPortDefault, a_mgtSapAwaitFwtUpdate
		};
		import from LibItsFntp_TypesAndValues {
		const c_portDyn, c_portNon;
		@@ -203,7 +203,7 @@ module LibItsFntp_Functions {
		log("* f_initializeFntpForwardingTable: INFO: portNumber value is: " & int2str(vc_portNumber.portLong) & " *");
		}
		// And wait for a MN-SAP.MN-COMMAND/FWTupdate message sent by IST management entity to update the forwarding table
		f_mnSapAwaitFWTupdate();
		f_mnSapAwaitFwtUpdate();

		} // End of function f_initializeFntpForwardingTable

		@@ -262,19 +262,19 @@ module LibItsFntp_Functions {
		* @desc Wait for MN-SAP.MN-COMMAND/FWTupdate message sent by IST management entity to update the forwarding table
		* @verdict Unchanged
		*/
		function f_mnSapAwaitFWTupdate() runs on ItsCalm {
		function f_mnSapAwaitFwtUpdate() runs on ItsCalm {

		tc_ac.start;
		alt {
		[] a_mgtSapAwaitFWTupdate() {
		[] a_mgtSapAwaitFwtUpdate() {
		tc_ac.stop;
		log("* f_mnSapAwaitFWTupdate: INFO: Expected message not received *");
		log("* f_mnSapAwaitFwtUpdate: INFO: Expected message not received *");
		}
		[] tc_ac.timeout {
		log("* f_mnSapAwaitFWTupdate: ERROR: MN-SAP FWTupdate service primitive not received *");
		log("* f_mnSapAwaitFwtUpdate: ERROR: MN-SAP FWTupdate service primitive not received *");
		}
		} // End of 'alt' statement
		} // End of function f_mnSapAwaitFWTupdate()
		} // End of function f_mnSapAwaitFwtUpdate()

		} // End of group testerFunctions

		@@ -309,7 +309,7 @@ module LibItsFntp_Functions {
		p_insapDestAddress,
		bit2oct(
		encvalue(
		m_fntpBasicNPDU(
		m_fntpBasicNpdu(
		p_sourcePort,
		p_destinationPort,
		p_hops
		@@ -341,7 +341,7 @@ module LibItsFntp_Functions {
		p_insapDestAddress,
		bit2oct(
		encvalue(
		md_fntpExtendedNPDU_InvalidCtrlField(
		md_fntpExtendedNpdu_invalidCtrlField(
		p_sourcePort,
		p_destinationPort,
		p_hops
		@@ -371,7 +371,7 @@ module LibItsFntp_Functions {
		p_insapDestAddress,
		bit2oct(
		encvalue(
		md_fntpExtendedNPDU_InvalidBitSet(
		md_fntpExtendedNpdu_invalidBitSet(
		p_sourcePort,
		p_destinationPort,
		omit
		@@ -399,22 +399,22 @@ module LibItsFntp_Functions {
		in template (value) LLserviceAddr p_insapSourceAddress,
		in template (value) LLserviceAddr 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
		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
		in template (value) AccessParameters p_accessParams
		) runs on ItsCalm {
		f_acTriggerEvent(
		m_generateFntpNpduCip(
		md_generateFntpNpduCip(
		p_insapSourceAddress,
		p_insapDestAddress,
		bit2oct(
		encvalue(
		md_fntpExtendedNPDU_CIP(
		md_fntpExtendedNpdu_cip(
		p_sourcePort,
		p_destinationPort,
		p_hops,
		p_rxCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough
		p_txCIP // TODO Perhaps this parameter is not required, p_accessParams would be enough
		p_rxCip, // TODO Perhaps this parameter is not required, p_accessParams would be enough
		p_txCip // TODO Perhaps this parameter is not required, p_accessParams would be enough
		)
		)
		),
		@@ -491,7 +491,7 @@ module LibItsFntp_Functions {
		p_insapDestAddress,
		bit2oct(
		encvalue(
		md_fntpForwardingNpdu_UnknownITS_SCU_ID(
		md_fntpForwardingNpdu_unknownItsScuId(
		p_sourcePort,
		p_destinationPort,
		p_hops,
		@@ -527,25 +527,25 @@ module LibItsFntp_Functions {
		in template (value) LLserviceAddr 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
		in template (value) TXcip p_txCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough
		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
		in template (value) AccessParameters p_accessParams
		) runs on ItsCalm {
		f_acTriggerEvent(
		m_generateFntpNpduCip(
		md_generateFntpNpduCip(
		p_insapSourceAddress,
		p_insapDestAddress,
		bit2oct(
		encvalue(
		md_fntpForwardingNpdu_CIP(
		md_fntpForwardingNpdu_cip(
		p_sourcePort,
		p_destinationPort,
		p_hops,
		p_fromPort,
		p_toPort,
		p_counter,
		p_rxCIP, // TODO Perhaps this parameter is not required, p_accessParams would be enough
		p_txCIP // TODO Perhaps this parameter is not required, p_accessParams would be enough
		p_rxCip, // TODO Perhaps this parameter is not required, p_accessParams would be enough
		p_txCip // TODO Perhaps this parameter is not required, p_accessParams would be enough
		) // End of field 'md_fntpForwardingNpdu_CIP'
		) // End of function 'encvalue'
		), // End of function 'bit2oct'

ttcn/CALM/FNTP/LibItsFntp_Pixits.ttcn3

+2 −2

Original line number	Diff line number	Diff line
		@@ -193,7 +193,7 @@ module LibItsFntp_Pixits {
		* <li>CIID Identifies the Communication Interface of the ITS-SCU. 0 indicates unknown or not existent</li>
		* <li>scuID Identifies the ITS-SCU in the ITS station</li>
		*/
		group linkIDs {
		group linkIds {

		group cf01 {

		@@ -243,7 +243,7 @@ module LibItsFntp_Pixits {
		localCIID := PX_WL_LOCAL_CIID
		}

		} // End of group linkIDs
		} // End of group linkIds

		/**
		* @desc Source and destination Ports

ttcn/CALM/FNTP/LibItsFntp_Templates.ttcn3

+87 −95

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/CALM/FNTP/LibItsFntp_TypesAndValues.ttcn3

+2 −2

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ module LibItsFntp_TypesAndValues {
		*/
		type union AcFntpPrimitive {
		AcGenerateFntpNpdu acGenerateFntpNpdu,
		acGenerateSamMessagePdu acGenerateSamMessagePdu,
		AcGenerateSamMessagePdu acGenerateSamMessagePdu,
		AcGenerateCtxMessagePdu acGenerateCtxMessagePdu
		}

		@@ -140,7 +140,7 @@ module LibItsFntp_TypesAndValues {
		* @desc Generate a SAM message
		* @member samPDU The SAM pdu
		*/
		type record acGenerateSamMessagePdu {
		type record AcGenerateSamMessagePdu {
		INsapPrimitivesUp samPdu
		}

ttcn/CALM/FSAP/LibItsFsap_Functions.ttcn3

+11 −11

Original line number	Diff line number	Diff line
		@@ -218,7 +218,7 @@ module LibItsFsap_Functions {
		* @see PX_WL_REMOTE_CIID_BC
		* @verdict Unchanged
		*/
		function f_getIutSrcRemoteCIID() return EUI64 {
		function f_getIutSrcRemoteCiId() return EUI64 {
		return PX_SRC_REMOTE_CIID;
		}

		@@ -228,7 +228,7 @@ module LibItsFsap_Functions {
		* @see PX_WL_LOCAL_CIID
		* @verdict Unchanged
		*/
		function f_getIutSrcLocalCIID() return EUI64 {
		function f_getIutSrcLocalCiId() return EUI64 {
		return PX_WL_LOCAL_CIID;
		}

		@@ -255,7 +255,7 @@ module LibItsFsap_Functions {
		* @return The ITS application object ID (ITS-AID)
		* @see PX_APPLICATION_ID
		*/
		function f_getIutApplicationID() return ApplicationID {
		function f_getIutApplicationId() return ApplicationID {
		return PX_APPLICATION_ID;
		}

		@@ -264,7 +264,7 @@ module LibItsFsap_Functions {
		* @return The ITS application object ID (ITS-AID)
		* @see PX_CLIENT_APPLICATION_ID
		*/
		function f_getIutClientApplicationID() return ApplicationID {
		function f_getIutClientApplicationId() return ApplicationID {
		return PX_CLIENT_APPLICATION_ID;
		}

		@@ -273,7 +273,7 @@ module LibItsFsap_Functions {
		* @return The globally unique ITS-AID of the ITS-S application
		* @see PX_ITS_AID
		*/
		function f_getIutServiceID() return ITSaid {
		function f_getIutServiceId() return ITSaid {
		return PX_ITS_AID;
		}

		@@ -282,7 +282,7 @@ module LibItsFsap_Functions {
		* @return The client identifier value
		* @see PX_SERVER_ID
		*/
		function f_getIutServerID() return StationID {
		function f_getIutServerId() return StationID {
		return PX_SERVER_ID;
		}

		@@ -291,7 +291,7 @@ module LibItsFsap_Functions {
		* @return The service client ITS station value
		* @see PX_CLIENT_ID
		*/
		function f_getIutClientID() return StationID {
		function f_getIutClientId() return StationID {
		return PX_CLIENT_ID;
		}

		@@ -300,7 +300,7 @@ module LibItsFsap_Functions {
		* @return The scheduling information
		* @see PX_GSCHED_ACCESS_TECH_NONIP
		*/
		function f_getIutGcScheduleWithAccessTechAndNonIP() return GCschedule {
		function f_getIutGcScheduleWithAccessTechAndNonIp() return GCschedule {
		return { PX_GSCHED_ACCESS_TECH_NONIP };
		}

		@@ -309,7 +309,7 @@ module LibItsFsap_Functions {
		* @return The scheduling information
		* @see PX_GSCHED_ACCESS_UNKNOWN_TECH_NONIP
		*/
		function f_getIutGCscheduleWithUnknownAccessTechAndNonIP() return GCschedule {
		function f_getIutGCscheduleWithUnknownAccessTechAndNonIp() return GCschedule {
		return { PX_GSCHED_ACCESS_UNKNOWN_TECH_NONIP };
		}

		@@ -319,7 +319,7 @@ module LibItsFsap_Functions {
		* @return The scheduling information
		* @see PX_GSCHED_NONIP
		*/
		function f_getIutGCscheduleWithNonIP() return GCschedule {
		function f_getIutGCscheduleWithNonIp() return GCschedule {
		return { PX_GSCHED_NONIP };
		}

		@@ -382,7 +382,7 @@ module LibItsFsap_Functions {
		* @return The non-IP information on services offered
		* @see PX_NO_IP_SERVICE_WITH_UNKNOWN_SERVICE_ID
		*/
		function f_getIutServicelistWithUnknownServiceID() return ServiceList {
		function f_getIutServicelistWithUnknownServiceId() return ServiceList {
		return { PX_NO_IP_SERVICE_WITH_UNKNOWN_SERVICE_ID };
		}

Admin message