Commit 382d54ca authored by Yann Garcia's avatar Yann Garcia
Browse files

Merging Titan/TTwb branches

parent b9f7e1c8
...@@ -39,7 +39,7 @@ module LibItsCam_Templates { ...@@ -39,7 +39,7 @@ module LibItsCam_Templates {
in template (present) CAM p_camMsg in template (present) CAM p_camMsg
) := { ) := {
msgIn := p_camMsg, msgIn := p_camMsg,
recvTime := *, recvTime := ?,
gnNextHeader := *, gnNextHeader := *,
gnHeaderType := *, gnHeaderType := *,
gnHeaderSubtype := *, gnHeaderSubtype := *,
......
...@@ -126,7 +126,7 @@ module LibItsCam_TestSystem language "TTCN-3:2010 Real Time and Performance Test ...@@ -126,7 +126,7 @@ module LibItsCam_TestSystem language "TTCN-3:2010 Real Time and Performance Test
*/ */
type record CamInd { type record CamInd {
CAM msgIn, CAM msgIn,
UInt64 recvTime optional, UInt64 recvTime,
UInt8 gnNextHeader optional, UInt8 gnNextHeader optional,
UInt8 gnHeaderType optional, UInt8 gnHeaderType optional,
UInt8 gnHeaderSubtype optional, UInt8 gnHeaderSubtype optional,
......
...@@ -64,7 +64,7 @@ module LibItsDenm_Templates { ...@@ -64,7 +64,7 @@ module LibItsDenm_Templates {
template (present) DENM p_denMsg template (present) DENM p_denMsg
) := { ) := {
msgIn := p_denMsg, msgIn := p_denMsg,
recvTime := *, recvTime := ?,
gnNextHeader := *, gnNextHeader := *,
gnHeaderType := *, gnHeaderType := *,
gnHeaderSubtype := *, gnHeaderSubtype := *,
......
...@@ -130,7 +130,7 @@ module LibItsDenm_TestSystem { ...@@ -130,7 +130,7 @@ module LibItsDenm_TestSystem {
*/ */
type record DenmInd { type record DenmInd {
DENM msgIn, DENM msgIn,
UInt64 recvTime optional, UInt64 recvTime,
UInt8 gnNextHeader optional, UInt8 gnNextHeader optional,
UInt8 gnHeaderType optional, UInt8 gnHeaderType optional,
UInt8 gnHeaderSubtype optional, UInt8 gnHeaderSubtype optional,
......
...@@ -9,7 +9,6 @@ module LibItsDenm_TypesAndValues { ...@@ -9,7 +9,6 @@ module LibItsDenm_TypesAndValues {
//LibCommon //LibCommon
import from LibCommon_BasicTypesAndValues all; import from LibCommon_BasicTypesAndValues all;
import from LibCommon_DataStrings all;
// LibIts // LibIts
import from DENM_PDU_Descriptions language "ASN.1:1997" all; import from DENM_PDU_Descriptions language "ASN.1:1997" all;
......
...@@ -185,7 +185,7 @@ module LibItsGeoNetworking_Functions { ...@@ -185,7 +185,7 @@ module LibItsGeoNetworking_Functions {
f_initialiseComponent(v_positionTable, v_areaTable, c_compNodeB); f_initialiseComponent(v_positionTable, v_areaTable, c_compNodeB);
} // End of group f_cf01Up } // End of function f_cf01Up
function f_cf01Down() runs on ItsGeoNetworking system ItsGeoNetworkingSystem { function f_cf01Down() runs on ItsGeoNetworking system ItsGeoNetworkingSystem {
...@@ -270,7 +270,7 @@ module LibItsGeoNetworking_Functions { ...@@ -270,7 +270,7 @@ module LibItsGeoNetworking_Functions {
} }
} }
} // End of group f_cf02Up } // End of function f_cf02Up
/** /**
* @desc Deletes configuration cf02 * @desc Deletes configuration cf02
...@@ -293,7 +293,7 @@ module LibItsGeoNetworking_Functions { ...@@ -293,7 +293,7 @@ module LibItsGeoNetworking_Functions {
unmap(self:utPort, system:utPort); unmap(self:utPort, system:utPort);
disconnect(self:syncPort, mtc:syncPort); disconnect(self:syncPort, mtc:syncPort);
} // End of group f_cf02Down } // End of function f_cf02Down
/** /**
* @desc This configuration features: * @desc This configuration features:
...@@ -364,7 +364,7 @@ module LibItsGeoNetworking_Functions { ...@@ -364,7 +364,7 @@ module LibItsGeoNetworking_Functions {
} }
} }
} // End of group f_cf03Up } // End of function f_cf03Up
/** /**
* @desc Deletes configuration cf03 * @desc Deletes configuration cf03
...@@ -387,7 +387,7 @@ module LibItsGeoNetworking_Functions { ...@@ -387,7 +387,7 @@ module LibItsGeoNetworking_Functions {
unmap(self:utPort, system:utPort); unmap(self:utPort, system:utPort);
disconnect(self:syncPort, mtc:syncPort); disconnect(self:syncPort, mtc:syncPort);
} // End of group f_cf03Down } // End of function f_cf03Down
/** /**
* @desc This configuration features: * @desc This configuration features:
...@@ -460,7 +460,7 @@ module LibItsGeoNetworking_Functions { ...@@ -460,7 +460,7 @@ module LibItsGeoNetworking_Functions {
} }
} }
} // End of group f_cf04Up } // End of function f_cf04Up
/** /**
* @desc Deletes configuration cf04 * @desc Deletes configuration cf04
...@@ -483,7 +483,7 @@ module LibItsGeoNetworking_Functions { ...@@ -483,7 +483,7 @@ module LibItsGeoNetworking_Functions {
unmap(self:utPort, system:utPort); unmap(self:utPort, system:utPort);
disconnect(self:syncPort, mtc:syncPort); disconnect(self:syncPort, mtc:syncPort);
} // End of group f_cf04Down } // End of function f_cf04Down
/** /**
* @desc This configuration features: * @desc This configuration features:
...@@ -574,7 +574,7 @@ module LibItsGeoNetworking_Functions { ...@@ -574,7 +574,7 @@ module LibItsGeoNetworking_Functions {
unmap(self:utPort, system:utPort); unmap(self:utPort, system:utPort);
disconnect(self:syncPort, mtc:syncPort); disconnect(self:syncPort, mtc:syncPort);
} // End of group f_cf05Down } // End of function f_cf05Down
/** /**
* @desc This configuration features: * @desc This configuration features:
...@@ -666,7 +666,7 @@ module LibItsGeoNetworking_Functions { ...@@ -666,7 +666,7 @@ module LibItsGeoNetworking_Functions {
unmap(self:utPort, system:utPort); unmap(self:utPort, system:utPort);
disconnect(self:syncPort, mtc:syncPort); disconnect(self:syncPort, mtc:syncPort);
} // End of group f_cf06Down } // End of function f_cf06Down
/** /**
* @desc This configuration features: * @desc This configuration features:
...@@ -757,7 +757,7 @@ module LibItsGeoNetworking_Functions { ...@@ -757,7 +757,7 @@ module LibItsGeoNetworking_Functions {
unmap(self:utPort, system:utPort); unmap(self:utPort, system:utPort);
disconnect(self:syncPort, mtc:syncPort); disconnect(self:syncPort, mtc:syncPort);
} // End of group f_cf07Down } // End of function f_cf07Down
/** /**
* @desc Behavior function for initializing component's variables and tables * @desc Behavior function for initializing component's variables and tables
......
...@@ -59,7 +59,7 @@ module LibItsIvim_Templates { ...@@ -59,7 +59,7 @@ module LibItsIvim_Templates {
template (present) IVIM p_iviMsg := ? template (present) IVIM p_iviMsg := ?
) := { ) := {
msgIn := p_iviMsg, msgIn := p_iviMsg,
recvTime := *, recvTime := ?,
gnNextHeader := *, gnNextHeader := *,
gnHeaderType := *, gnHeaderType := *,
gnHeaderSubtype := *, gnHeaderSubtype := *,
......
...@@ -126,7 +126,7 @@ module LibItsIvim_TestSystem { ...@@ -126,7 +126,7 @@ module LibItsIvim_TestSystem {
*/ */
type record IvimInd { type record IvimInd {
IVIM msgIn, IVIM msgIn,
UInt64 recvTime optional, UInt64 recvTime,
UInt8 gnNextHeader optional, UInt8 gnNextHeader optional,
UInt8 gnHeaderType optional, UInt8 gnHeaderType optional,
UInt8 gnHeaderSubtype optional, UInt8 gnHeaderSubtype optional,
......
...@@ -54,7 +54,7 @@ module LibItsMapemSpatem_Templates { ...@@ -54,7 +54,7 @@ module LibItsMapemSpatem_Templates {
template (present) MAPEM p_mapemMsg template (present) MAPEM p_mapemMsg
) := { ) := {
msgIn := p_mapemMsg, msgIn := p_mapemMsg,
recvTime := *, recvTime := ?,
gnNextHeader := *, gnNextHeader := *,
gnHeaderType := *, gnHeaderType := *,
gnHeaderSubtype := *, gnHeaderSubtype := *,
...@@ -138,7 +138,7 @@ module LibItsMapemSpatem_Templates { ...@@ -138,7 +138,7 @@ module LibItsMapemSpatem_Templates {
template (present) SPATEM p_spatemMsg template (present) SPATEM p_spatemMsg
) := { ) := {
msgIn := p_spatemMsg, msgIn := p_spatemMsg,
recvTime := *, recvTime := ?,
gnNextHeader := *, gnNextHeader := *,
gnHeaderType := *, gnHeaderType := *,
gnHeaderSubtype := *, gnHeaderSubtype := *,
......
...@@ -104,7 +104,7 @@ module LibItsMapemSpatem_TestSystem { ...@@ -104,7 +104,7 @@ module LibItsMapemSpatem_TestSystem {
type record MapemInd { type record MapemInd {
MAPEM msgIn, MAPEM msgIn,
UInt64 recvTime optional, UInt64 recvTime,
UInt8 gnNextHeader optional, UInt8 gnNextHeader optional,
UInt8 gnHeaderType optional, UInt8 gnHeaderType optional,
UInt8 gnHeaderSubtype optional, UInt8 gnHeaderSubtype optional,
...@@ -121,7 +121,7 @@ module LibItsMapemSpatem_TestSystem { ...@@ -121,7 +121,7 @@ module LibItsMapemSpatem_TestSystem {
type record SpatemInd { type record SpatemInd {
SPATEM msgIn, SPATEM msgIn,
UInt64 recvTime optional, UInt64 recvTime,
UInt8 gnNextHeader optional, UInt8 gnNextHeader optional,
UInt8 gnHeaderType optional, UInt8 gnHeaderType optional,
UInt8 gnHeaderSubtype optional, UInt8 gnHeaderSubtype optional,
......
...@@ -40,7 +40,7 @@ module LibItsRtcmem_Templates { ...@@ -40,7 +40,7 @@ module LibItsRtcmem_Templates {
template (present) RTCMEM p_rtcmemMsg template (present) RTCMEM p_rtcmemMsg
) := { ) := {
msgIn := p_rtcmemMsg, msgIn := p_rtcmemMsg,
recvTime := *, recvTime := ?,
gnNextHeader := *, gnNextHeader := *,
gnHeaderType := *, gnHeaderType := *,
gnHeaderSubtype := *, gnHeaderSubtype := *,
......
...@@ -92,7 +92,7 @@ module LibItsRtcmem_TestSystem { ...@@ -92,7 +92,7 @@ module LibItsRtcmem_TestSystem {
type record RtcmemInd { type record RtcmemInd {
RTCMEM msgIn, RTCMEM msgIn,
UInt64 recvTime optional, UInt64 recvTime,
UInt8 gnNextHeader optional, UInt8 gnNextHeader optional,
UInt8 gnHeaderType optional, UInt8 gnHeaderType optional,
UInt8 gnHeaderSubtype optional, UInt8 gnHeaderSubtype optional,
......
...@@ -424,6 +424,39 @@ module LibItsSremSsem_Functions { ...@@ -424,6 +424,39 @@ module LibItsSremSsem_Functions {
} }
} }
/**
* @desc Awaits a SREM and returns it
* @param p_rcvMsg The expected message to be received.
*/
function f_awaitSreMessageCancellation(
template (present) RequestID p_requestID := ?
) runs on ItsSremSsem {
tc_ac.start;
alt {
[] sremSsemPort.receive(
mw_sremInd(
mw_sremPdu(
mw_sremWellFormatted(
mw_requestorDescription,
{
mw_signalRequestPackage(
mw_signalRequest(
?,
p_requestID,
priorityCancellation
))
},
?
)))) {
tc_ac.stop;
}
[] tc_ac.timeout {
log("*** " & testcasename() & ": INFO: Timeout while awaiting the reception of a message ***");
f_selfOrClientSyncAndVerdict("error", e_timeout);
}
}
}
} // End of group receiveFunctions } // End of group receiveFunctions
group miscellaneousFunctions { group miscellaneousFunctions {
......
...@@ -53,7 +53,7 @@ module LibItsSremSsem_Templates { ...@@ -53,7 +53,7 @@ module LibItsSremSsem_Templates {
template (present) SREM p_sremMsg template (present) SREM p_sremMsg
) := { ) := {
msgIn := p_sremMsg, msgIn := p_sremMsg,
recvTime := *, recvTime := ?,
gnNextHeader := *, gnNextHeader := *,
gnHeaderType := *, gnHeaderType := *,
gnHeaderSubtype := *, gnHeaderSubtype := *,
...@@ -137,7 +137,7 @@ module LibItsSremSsem_Templates { ...@@ -137,7 +137,7 @@ module LibItsSremSsem_Templates {
template (present) SSEM p_ssemMsg := ? template (present) SSEM p_ssemMsg := ?
) := { ) := {
msgIn := p_ssemMsg, msgIn := p_ssemMsg,
recvTime := *, recvTime := ?,
gnNextHeader := *, gnNextHeader := *,
gnHeaderType := *, gnHeaderType := *,
gnHeaderSubtype := *, gnHeaderSubtype := *,
......
...@@ -104,7 +104,7 @@ module LibItsSremSsem_TestSystem { ...@@ -104,7 +104,7 @@ module LibItsSremSsem_TestSystem {
type record SremInd { type record SremInd {
SREM msgIn, SREM msgIn,
UInt64 recvTime optional, UInt64 recvTime,
UInt8 gnNextHeader optional, UInt8 gnNextHeader optional,
UInt8 gnHeaderType optional, UInt8 gnHeaderType optional,
UInt8 gnHeaderSubtype optional, UInt8 gnHeaderSubtype optional,
...@@ -123,7 +123,7 @@ module LibItsSremSsem_TestSystem { ...@@ -123,7 +123,7 @@ module LibItsSremSsem_TestSystem {
type record SsemInd { type record SsemInd {
SSEM msgIn, SSEM msgIn,
UInt64 recvTime optional, UInt64 recvTime,
UInt8 gnNextHeader optional, UInt8 gnNextHeader optional,
UInt8 gnHeaderType optional, UInt8 gnHeaderType optional,
UInt8 gnHeaderSubtype optional, UInt8 gnHeaderSubtype optional,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment