Test day with both Peek and Commsignia (7a26c771) · Commits · TTCN-3 Libraries / LibIts

ttcn/CALM/FNTP/LibItsFntp_Functions.ttcn3

+155 −136

Original line number	Diff line number	Diff line
		@@ -41,8 +41,7 @@ module LibItsFntp_Functions {
		const c_portDyn, c_portNon;
		type
		UtFntpEvent, UtFntpEventInd,
		CfFntpEventInd,
		AcFntpPrimitive
		CfFntpEventInd
		};
		import from LibItsFntp_Pics {
		modulepar PICS_ITS_MGT_NOT
		@@ -88,7 +87,7 @@ module LibItsFntp_Functions {
		}

		// Map
		map(self:acPort, system:acPort);
		// map(self:acPort, system:acPort);
		map(self:utPort, system:utPort);
		map(self:cfPort, system:cfPort);
		map(self:fntpPort, system:fntpPort);
		@@ -127,7 +126,7 @@ module LibItsFntp_Functions {
		vc_pduCounter := 0;

		// Map
		map(self:acPort, system:acPort);
		// map(self:acPort, system:acPort);
		map(self:utPort, system:utPort);
		map(self:cfPort, system:cfPort);
		map(self:fntpPort, system:fntpPort);
		@@ -154,7 +153,7 @@ module LibItsFntp_Functions {
		deactivate;

		// Unmap
		unmap(self:acPort, system:acPort);
		// unmap(self:acPort, system:acPort);
		unmap(self:utPort, system:utPort);
		unmap(self:cfPort, system:cfPort);
		unmap(self:fntpPort, system:fntpPort);
		@@ -172,7 +171,7 @@ module LibItsFntp_Functions {
		deactivate;

		// Unmap
		unmap(self:acPort, system:acPort);
		// unmap(self:acPort, system:acPort);
		unmap(self:utPort, system:utPort);
		unmap(self:cfPort, system:cfPort);
		unmap(self:fntpPort, system:fntpPort);
		@@ -208,6 +207,7 @@ module LibItsFntp_Functions {
		f_utInitializeIut(m_utFntpInitialize);
		f_cfInitialize(m_cfFntpInitialize);
		f_sleepIgnoreDef(PX_WAIT_FOR_IUT_READY); // Wait until the IUT is in a stable situation (beaconing...)
		cfPort.clear; // Because TestConfigIICP should trigger management port deletion message
		} // End of function f_initialState

		/**
		@@ -460,7 +460,7 @@ module LibItsFntp_Functions {
		* @desc Trigger a basic FNTPNPDU to create an entry in forwarding table for a known peer station
		*/
		function f_setupKnownPeerStation() runs on ItsCalm {
		f_acGenerateBasicFntpNpdu(
		f_sendBasicFntpNpdu( // FIXME Use fntpPort instead of acPort
		f_getIutRemotePortNumberValue(),
		vc_portNumber,
		m_llServiceAddr(mw_linkId(f_getIutRemoteDestCiidUc(), f_getIutWlLocalCiid())),
		@@ -505,13 +505,14 @@ module LibItsFntp_Functions {

		group adapterControl {

		function f_acGenerateBasicFntpNpdu(
		function f_sendBasicFntpNpdu(
		in template (value) PortNumber p_sourcePort,
		in template (value) PortNumber p_destinationPort,
		in template (value) LLserviceAddr p_inSapSourceAddress,
		in template (value) LLserviceAddr p_inSapDestAddress
		) runs on ItsCalm {
		f_acTriggerEvent(
		fntpPort.send(
		m_fntpReq(
		m_generateFntpNpdu(
		p_inSapSourceAddress,
		p_inSapDestAddress,
		@@ -524,8 +525,9 @@ module LibItsFntp_Functions {
		)
		)
		)
		)
		);
		} // End of function f_acGenerateBasicFntpNpdu
		} // End of function f_sendBasicFntpNpdu

		/**
		* @desc Triggers test adapter to send FNTP forwarding NDPU
		@@ -538,7 +540,7 @@ module LibItsFntp_Functions {
		* @param p_counter Expected value of FNTP packet counter counter field
		* @param p_hops N-hops value
		*/
		function f_acGenerateFntpForwardingNpdu(
		function f_sendForwardingNpdu(
		in template (value) PortNumber p_sourcePort,
		in template (value) PortNumber p_destinationPort,
		in template (value) PortNumber p_fromPort,
		@@ -548,7 +550,8 @@ module LibItsFntp_Functions {
		in template (value) FNTPpacketCounter p_counter,
		in template (value) FNTPhopCount p_hops
		) runs on ItsCalm {
		f_acTriggerEvent(
		fntpPort.send(
		m_fntpReq(
		m_generateFntpNpdu(
		p_inSapSourceAddress,
		p_inSapDestAddress,
		@@ -565,8 +568,9 @@ module LibItsFntp_Functions {
		)
		)
		)
		)
		);
		} // End of function f_acGenerateFntpForwardingNpdu
		} // End of function f_sendForwardingNpdu

		/**
		* @desc Triggers test adapter to send FNTP NDPU
		@@ -576,14 +580,15 @@ module LibItsFntp_Functions {
		* @param p_destinationPort IN-SAP destination port
		* @param p_hops N-hops value
		*/
		function f_acGenerateExtendedFntpNpdu(
		function f_sendExtendedFntpNpdu(
		in template (value) PortNumber p_sourcePort,
		in template (value) PortNumber p_destinationPort,
		in template (value) LLserviceAddr p_inSapSourceAddress,
		in template (value) LLserviceAddr p_inSapDestAddress,
		in FNTPhopCount p_hops
		) runs on ItsCalm {
		f_acTriggerEvent(
		fntpPort.send(
		m_fntpReq(
		m_generateFntpNpdu(
		p_inSapSourceAddress,
		p_inSapDestAddress,
		@@ -597,16 +602,17 @@ module LibItsFntp_Functions {
		)
		)
		)
		)
		);
		} // End of function f_acGenerateExtendedFntpNpdu
		} // End of function f_sendExtendedFntpNpdu

		/**
		* @desc Triggers event in the test system adaptation via IN-SAP interface.
		* @param p_event The event to trigger
		*/
		function f_acTriggerEvent(template (value) AcFntpPrimitive p_event) runs on ItsCalm {
		/* TODO To be removed function f_acTriggerEvent(template (value) AcFntpPrimitive p_event) runs on ItsCalm {
		acPort.send(p_event);
		}
		} */

		/**
		* @desc Triggers lower tester to send FNTP station-internal NDPU with several hops and an invalid control field
		@@ -616,14 +622,15 @@ module LibItsFntp_Functions {
		* @param p_inSapDestAddress IN-SAP destination port
		* @param p_hops N-hops value
		*/
		function f_acGenerateFntpNpduInvalidCtrlField(
		function f_sendFntpNpduInvalidCtrlField(
		in template (value) PortNumber p_sourcePort,
		in template (value) PortNumber p_destinationPort,
		in template (value) LLserviceAddr p_inSapSourceAddress,
		in template (value) LLserviceAddr p_inSapDestAddress,
		in template (value) FNTPhopCount p_hops
		) runs on ItsCalm {
		f_acTriggerEvent(
		fntpPort.send(
		m_fntpReq(
		m_generateFntpNpdu(
		p_inSapSourceAddress,
		p_inSapDestAddress,
		@@ -637,8 +644,9 @@ module LibItsFntp_Functions {
		)
		)
		)
		)
		);
		} // End of function f_acGenerateFntpNpduInvalidCtrlField
		} // End of function f_sendFntpNpduInvalidCtrlField

		/**
		* @desc Triggers lower tester to send FNTP station-internal NDPU with bit5 set
		@@ -647,13 +655,14 @@ module LibItsFntp_Functions {
		* @param p_inSapSourceAddress IN-SAP source port
		* @param p_inSapDestAddress IN-SAP destination port
		*/
		function f_acGenerateFntpNpduInvalidBitSet(
		function f_sendFntpNpduInvalidBitSet(
		in template (value) PortNumber p_sourcePort,
		in template (value) PortNumber p_destinationPort,
		in template (value) LLserviceAddr p_inSapSourceAddress,
		in template (value) LLserviceAddr p_inSapDestAddress
		) runs on ItsCalm {
		f_acTriggerEvent(
		fntpPort.send(
		m_fntpReq(
		m_generateFntpNpdu(
		p_inSapSourceAddress,
		p_inSapDestAddress,
		@@ -667,8 +676,9 @@ module LibItsFntp_Functions {
		)
		)
		)
		)
		);
		} // End of function f_acGenerateFntpNpduInvalidBitSet
		} // End of function f_sendFntpNpduInvalidBitSet

		/**
		* @desc Triggers test adapter to send FNTP NDPU
		@@ -681,7 +691,7 @@ module LibItsFntp_Functions {
		* @param p_txCIP Transmit (TX) parameters of a VCI
		* @param p_accessParams Access parameters
		*/
		function f_acGenerateFntpNpduCip(
		function f_sendFntpNpduCip(
		in template (value) PortNumber p_sourcePort,
		in template (value) PortNumber p_destinationPort,
		in template (value) LLserviceAddr p_inSapSourceAddress,
		@@ -691,7 +701,8 @@ module LibItsFntp_Functions {
		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(
		fntpPort.send(
		m_fntpReq(
		md_generateFntpNpduCip(
		p_inSapSourceAddress,
		p_inSapDestAddress,
		@@ -708,8 +719,9 @@ module LibItsFntp_Functions {
		),
		p_accessParams
		)
		)
		);
		} // End of function f_acGenerateFntpNpduCip
		} // End of function f_sendFntpNpduCip

		/**
		* @desc Triggers test adapter to send FNTP forwarding NDPU with an unknown ITS-SCU-ID
		@@ -722,7 +734,7 @@ module LibItsFntp_Functions {
		* @param p_counter Expected value of FNTP packet counter counter field
		* @param p_hops N-hops value
		*/
		function f_acGenerateFntpForwardingNpduWithUnknownItsSciId(
		function f_sendFntpForwardingNpduWithUnknownItsSciId(
		in template (value) PortNumber p_sourcePort,
		in template (value) PortNumber p_destinationPort,
		in template (value) PortNumber p_fromPort,
		@@ -732,7 +744,8 @@ module LibItsFntp_Functions {
		in template (value) FNTPpacketCounter p_counter,
		in template (value) FNTPhopCount p_hops
		) runs on ItsCalm {
		f_acTriggerEvent(
		fntpPort.send(
		m_fntpReq(
		m_generateFntpNpdu(
		p_inSapSourceAddress,
		p_inSapDestAddress,
		@@ -749,8 +762,9 @@ module LibItsFntp_Functions {
		) // End of function encvalue
		) // End of function bit2oct
		) // End of field 'm_generateFntpNPDU'
		)
		);
		} // End of function f_acGenerateFntpForwardingNpduWithUnknownItsSciId
		} // End of function f_sendFntpForwardingNpduWithUnknownItsSciId

		/**
		* @desc Triggers test adapter to send FNTP forwarding NDPU with CIP
		@@ -765,7 +779,7 @@ module LibItsFntp_Functions {
		* @param p_rxCIP Receive (RX) parameter settings
		* @param p_txCIP Transmit (TX) parameters of a VCI
		*/
		function f_acGenerateFntpForwardingNpduCip(
		function f_sendFntpForwardingNpduCip(
		in template (value) PortNumber p_sourcePort,
		in template (value) PortNumber p_destinationPort,
		in template (value) PortNumber p_fromPort,
		@@ -778,7 +792,8 @@ module LibItsFntp_Functions {
		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(
		fntpPort.send(
		m_fntpReq(
		md_generateFntpNpduCip(
		p_inSapSourceAddress,
		p_inSapDestAddress,
		@@ -798,9 +813,9 @@ module LibItsFntp_Functions {
		), // End of function 'bit2oct'
		p_accessParams
		)
		)
		);
		} // End of function f_acGenerateFntpForwardingNpduCip

		} // End of function f_sendFntpForwardingNpduCip

		} // End of group adapterControl

		@@ -849,6 +864,10 @@ module LibItsFntp_Functions {
		return PX_WL_LOCAL_CIID;
		}

		function f_getIutWlRemoteCiid() return EUI64 {
		return PX_WL_REMOTE_CIID;
		}

		/**
		* @desc Get the local identifier of the VCI for broadcast on ITS-S host
		* @return The local identifier of the VCI for broadcast on ITS-S host

ttcn/CALM/FNTP/LibItsFntp_Pixits.ttcn3

+12 −5

Original line number	Diff line number	Diff line
		@@ -84,11 +84,18 @@ module LibItsFntp_Pixits {
		group routerWlanVcisMac {

		/**
		* @desc Identifies the VCI on ITS-S router (e.g. It coud be the G5 radio MAC address of the IUT)
		* @desc Identifies the VCI localCIID on ITS-S router (e.g. It coud be the G5 radio MAC address of the IUT)
		* @see ISO 21218 - Clause 6.2 Link Identifier
		*/
		// modulepar EUI64 PX_WL_LOCAL_CIID := '0A0B0CFFFE0D0E0F'O; Commsignia setting
		modulepar EUI64 PX_WL_LOCAL_CIID := 'A22D8CFFFF198063'O; // Peek setting
		modulepar EUI64 PX_WL_LOCAL_CIID := '0A0B0CFFFE0D0E0F'O; // Commsignia setting
		// modulepar EUI64 PX_WL_LOCAL_CIID := 'A22D8CFFFF198063'O; // Peek setting

		/**
		* @desc Identifies the VCI remoteCIID on ITS-S router (e.g. It coud be the G5 radio MAC address of the IUT)
		* @see ISO 21218 - Clause 6.2 Link Identifier
		*/
		modulepar EUI64 PX_WL_REMOTE_CIID := '0A0B0CFFFE0D0E0F'O; // Commsignia setting
		// modulepar EUI64 PX_WL_REMOTE_CIID := 'D4CA6DFFFF55A72C'O; // Peek setting

		/**
		* @desc Identifies the VCI for broadcast on ITS-S router
		@@ -166,7 +173,7 @@ module LibItsFntp_Pixits {
		/**
		* @desc Identifies uniquely a specific CI in a specific ITS-SCU for broadcast
		*/
		modulepar EUI64 PX_DEST_REMOTE_CIID_BC := 'FFFFFFFFFEFFFFFF'O;
		modulepar EUI64 PX_DEST_REMOTE_CIID_BC := 'FFFFFFFFFEFFFFFF'O/'FFFFFFFFFFFFFFFF'O/;

		/**
		* @desc Identifies uniquely a specific CI in a specific ITS-SCU for multicast
		@@ -181,7 +188,7 @@ module LibItsFntp_Pixits {
		/**
		* @desc Identifies a second VCI for unicast (peer to peer) on ITS-SCU
		*/
		modulepar EUI64 PX_SECOND_REMOTE_CIID_BC := '000000FFFE000000'O;
		modulepar EUI64 PX_SECOND_REMOTE_CIID_BC := '040002FFFE010005'O;

		} // End of peerItsStationVcisMac

ttcn/CALM/FNTP/LibItsFntp_Templates.ttcn3

+91 −102

Original line number	Diff line number	Diff line
		@@ -54,8 +54,7 @@ module LibItsFntp_Templates {
		group fntpPortsValues;
		type
		UtFntpEvent, UtFntpEventInd,
		CfFntpEventInd,
		AcFntpPrimitive
		CfFntpEventInd
		};
		import from LibItsFntp_Pixits all;
		import from LibItsMgt_Functions {
		@@ -607,8 +606,8 @@ module LibItsFntp_Templates {
		* @param p_counter Expected value of FNTP packet counter counter field
		*/
		template (present) FNTPNPDU mdw_fntpForwardingNpdu(
		in template (present) UInt16 p_sourcePort,
		in template (present) UInt16 p_destinationPort,
		in template (present) UInt16 p_sourcePort, // FIXME Change it into PortNumber
		in template (present) UInt16 p_destinationPort, // FIXME Change it into PortNumber
		in template (present) PortNumber p_fromPort,
		in template (present) PortNumber p_toPort,
		in template (present) FNTPpacketCounter p_counter,
		@@ -704,13 +703,11 @@ module LibItsFntp_Templates {
		* @param p_inData The FNTP NPDU in octetstring format
		* @see ISO/CD 21218 - Clause 8.3.3
		*/
		template (value) AcFntpPrimitive m_generateFntpNpdu(
		template (value) INsapPrimitivesUp m_generateFntpNpdu(
		in template (value) LLserviceAddr p_insapSourceAddress,
		in template (value) LLserviceAddr p_insapDestAddress,
		in template (value) INdata p_inData
		) := {
		acGenerateFntpNpdu := {
		fntpNPDU := {
		spRef := 0,
		servPrimitive := {
		IN_UNITDATA_indication :=
		@@ -720,9 +717,7 @@ module LibItsFntp_Templates {
		p_inData
		)
		}
		}
		} // End of field 'acGenerateFntpNpdu'
		} // End of template m_generateFntpNpdu
		} // End of template m_generateFntpNpdu1

		/**
		* @desc Generate a FNTP NPDU through IN-SAP
		@@ -733,22 +728,17 @@ module LibItsFntp_Templates {
		* @see ISO/CD 21218 - Clause 8.3.3 & Clause 8.5
		* @see ISO 29281-2 - Clause 7.10.1
		*/
		template (value) AcFntpPrimitive md_generateFntpNpduCip(
		template (value) INsapPrimitivesUp md_generateFntpNpduCip(
		in template (value) LLserviceAddr p_insapSourceAddress,
		in template (value) LLserviceAddr p_insapDestAddress,
		in template (value) INdata p_inData,
		in template (present) AccessParameters p_accessParams
		) modifies m_generateFntpNpdu := {
		acGenerateFntpNpdu := {
		fntpNPDU := {
		spRef := 0,
		servPrimitive := {
		IN_UNITDATA_indication := {
		accessParams := p_accessParams
		} // End of field 'inUnitdataInd'
		} // End of field 'servPrimitive'
		} // End of field 'acGenerateFntpNpdu'
		} // End of field 'fntpNPDU'
		} // End of template m_generateFntpNpduCip

		/**
		@@ -759,14 +749,11 @@ module LibItsFntp_Templates {
		* @see ISO/CD 21218 - Clause 8.3.3
		* @see ISO 29281 - Clause 7.9.3
		*/
		template (value) AcFntpPrimitive m_generateSamMessagePdu(
		template (value) INsapPrimitivesUp m_generateSamMessagePdu(
		in template (value) LLserviceAddr p_insapSourceAddress,
		in template (value) LLserviceAddr p_insapDestAddress,
		in template (value) INdata p_sam
		) := {
		acGenerateSamMessagePdu := {
		samPdu := {
		spRef := 0,
		servPrimitive := {
		IN_UNITDATA_indication := {
		source_addr := p_insapSourceAddress,
		@@ -779,8 +766,6 @@ module LibItsFntp_Templates {
		}
		} // End of field 'inUnitdataInd'
		} // End of field 'servPrimitive'
		} // End of field 'samPDU'
		} // End of field 'acGenerateSamMessagePdu'
		} // End of template m_generateSamMessagePdu

		/**
		@@ -791,14 +776,11 @@ module LibItsFntp_Templates {
		* @see ISO/CD 21218 - Clause 8.3.3
		* @see ISO 29281 - Clause 7.9.4
		*/
		template (value) AcFntpPrimitive m_generateCtxMessagePdu(
		template (value) INsapPrimitivesUp m_generateCtxMessagePdu(
		in template (value) LLserviceAddr p_insapSourceAddress,
		in template (value) LLserviceAddr p_insapDestAddress,
		in template (value) INdata p_ctx
		) := {
		acGenerateCtxMessagePdu := {
		ctxPdu := {
		spRef := 0,
		servPrimitive := {
		IN_UNITDATA_indication := {
		source_addr := p_insapSourceAddress,
		@@ -811,8 +793,6 @@ module LibItsFntp_Templates {
		}
		} // End of field 'inUnitdataInd'
		} // End of field 'servPrimitive'
		} // End of field 'ctxPdu'
		} // End of field 'acGenerateCtxMessagePdu'
		} // End of template m_generateCtxMessagePdu

		} // End of group taPrimitives
		@@ -927,7 +907,8 @@ module LibItsFntp_Templates {
		* @desc Receive a succesful COMMAND.confirm primitive
		* @see ISO/CD 29281-2 Clause 8.2.1 NF-FNTP-PORT.request
		*/
		template (present) NFsapPrimitivesUp mw_fntpCommConfirm_success := { //FIXME To be renamed
		template (present) UtFntpEventInd mw_fntpCommConfirm_success := { //FIXME To be renamed
		nfSapPrimitivesUp := {
		spRef := 1,
		servPrimitive := {
		NFfntpCommConfirm := {
		@@ -936,49 +917,57 @@ module LibItsFntp_Templates {
		errStatus := c_errStatus_success
		} // End of field 'NFfntpCommConfirm'
		} // End of field 'servPrimitive'
		} // End of field 'nfSapPrimitivesUp'
		} // End of template mw_fntpCommConfirm_success

		/**
		* @desc Receive a succesful COMMAND.confirm primitive
		* @see ISO/CD 29281-2 Clause 8.2.1 NF-FNTP-PORT.request
		*/
		template (present) NFsapPrimitivesUp mdw_fntpCommConfirm_success(
		template (present) UtFntpEventInd mdw_fntpCommConfirm_success(
		in template (value) PortNumber p_port
		) modifies mw_fntpCommConfirm_success := { //FIXME To be renamed
		spRef := 1,
		nfSapPrimitivesUp := {
		servPrimitive := {
		NFfntpCommConfirm := {
		commRef := ?,
		servicePort := p_port,
		errStatus := c_errStatus_success
		} // End of field 'NFfntpCommConfirm'
		} // End of field 'servPrimitive'
		} // End of field 'nfSapPrimitivesUp'
		} // End of template mw_fntpCommConfirm_success

		/**
		* @desc Receive a succesful COMMAND.confirm primitive
		* @see ISO/CD 29281-2 Clause 8.2.1 NF-FNTP-PORT.request
		*/
		template (present) NFsapPrimitivesUp mdw_fntpCommConfirm_anyError
		modifies mw_fntpCommConfirm_success := {
		template (present) UtFntpEventInd mdw_fntpCommConfirm_anyError(
		in template (present) PortNumber p_port
		) modifies mw_fntpCommConfirm_success := {
		nfSapPrimitivesUp := {
		servPrimitive := {
		NFfntpCommConfirm := {
		servicePort := p_port,
		errStatus := complement(c_errStatus_success)
		} // End of field 'NFfntpCommConfirm'
		} // End of field 'servPrimitive'
		} // End of field 'nfSapPrimitivesUp'
		} // End of template mdw_fntpCommConfirm_anyError

		/**
		* @desc Receive an unsuccesful COMMAND.confirm primitive
		* @see ISO/WD 29281-2 Clause 8.3.2
		*/
		template (present) NFsapPrimitivesUp mdw_fntpCommConfirm_unspecFailure
		modifies mw_fntpCommConfirm_success := {
		template (present) UtFntpEventInd mdw_fntpCommConfirm_unspecFailure(
		in template (present) PortNumber p_port
		) modifies mdw_fntpCommConfirm_anyError := {
		nfSapPrimitivesUp := {
		servPrimitive := {
		NFfntpCommConfirm := {
		errStatus := c_errStatus_unspecFailure
		} // End of field 'NFfntpCommConfirm'
		} // End of field 'servPrimitive'
		} // End of field 'nfSapPrimitivesUp'
		} // End of template mdw_fntpCommConfirm_fail

		/**
		@@ -1195,12 +1184,12 @@ module LibItsFntp_Templates {

		/**
		* @desc Receive template for configuration message (CfPort Primitive)
		* @param p_requestRequest Expected MN_Request_rquest message
		* @param p_mnRequestRequest Expected MN_Request_rquest message
		*/
		template CfFntpEventInd mw_cfFntpEventInd(
		template (present) MN_Request_request p_requestRequest
		template (present) MN_Request_request p_mnRequestRequest
		) := {
		mnRequestRequest := p_requestRequest
		mnRequestRequest := p_mnRequestRequest
		} // End of template mw_cfFntpEventInd

		} // End of group cfPrimitives

ttcn/CALM/FNTP/LibItsFntp_TypesAndValues.ttcn3

+10 −10

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/CALM/FSAP/LibItsFsap_Functions.ttcn3

+18 −19

File changed.

Preview size limit exceeded, changes collapsed.