Commit 1d061142 authored by garciay's avatar garciay
Browse files

Update UT primitives

parent 6590e889
......@@ -53,11 +53,11 @@ module LibItsIvim_TypesAndValues {
* @desc Upper Tester message to request triggering of an event at IUT
*/
type record UtIvimTrigger {
TimestampIts repetitionInterval optional,
TimestampIts validFrom optional,
TimestampIts validTo optional,
TimestampIts repetitionInterval optional/*,
IVIManagementContainer.connectedIviStructures connectedIviStructures optional,
IviStructure.optional_ optional_ optional
IviStructure.optional_ optional_ optional*/
}
/**
......
......@@ -337,55 +337,205 @@ module LibItsMapemSpatem_Templates {
group mapemSpatemTemplates {
template (omit) IntersectionReferenceID m_intersectionReferenceID(
in template (value) IntersectionID p_intersectionID := 0,
in template (omit) RoadRegulatorID p_roadRegulatorID := omit
) := {
region := p_roadRegulatorID, // a globally unique regional assignment value typical assigned to a regional DOT authority the value zero shall be used for testing needs
id := p_intersectionID // a unique mapping to the intersection in question within the above region of use
}
template (omit) Connection m_connction(
in template (value) ConnectingLane p_connectingLane,
in template (omit) IntersectionReferenceID p_remoteIntersection := omit,
in template (omit) SignalGroupID p_signalGroup := omit,
in template (omit) RestrictionClassID p_userClass := omit,
in template (omit) LaneConnectionID p_connectionID := omit
) := {
connectingLane := p_connectingLane, // The index of the connecting lane and also the maneuver from the current lane to it
remoteIntersection := p_remoteIntersection, // This entry is only used when the indicated connecting lane belongs to another intersection layout.
signalGroup := p_signalGroup, // The matching signal group send by the SPAT message for this lane/maneuver.
userClass := p_userClass, // The Restriction Class of users this applies to
connectionID := p_connectionID // An optional connection index used to relate this lane connection to any dynamic clearance data in the SPAT
}
group mapemTemplates {
/**
* @desc Send template for MAPEM Message
*/
template (value) MapData m_defaultMapem := {
timeStamp := omit,
msgIssueRevision := PX_MSG_ISSUE_REVISION,
layerType := omit,
layerID := omit,
intersections := omit,
roadSegments := omit,
dataParameters := omit,
restrictionList := omit,
regional := omit
}
/**
* @desc Receive template for MAPEM Message
*/
template (present) MapData mw_defaultMapem := {
timeStamp := *,
msgIssueRevision := ?,
layerType := *,
layerID := *,
intersections := *,
roadSegments := *,
dataParameters := *,
restrictionList := *,
regional := *
}
/**
* @desc Receive template for MAPEM Message with no LayerType
*/
template (present) MapData mw_mapemWellFormatted modifies mw_defaultMapem := {
layerType := omit,
layerID := omit
}
group mapemTemplatesSend {
/**
* @desc Send template for MAPEM Message
*/
template (value) MapData m_defaultMapem := {
timeStamp := omit,
msgIssueRevision := PX_MSG_ISSUE_REVISION,
layerType := omit,
layerID := omit,
intersections := omit,
roadSegments := omit,
dataParameters := omit,
restrictionList := omit,
regional := omit
}
/**
* @desc Receive template for MAPEM Message
*/
template (omit) MapData m_mapem(
in template (value) MsgCount p_msgIssueRevision,
in template (omit) IntersectionGeometryList p_intersectionGeometryList := omit,
in template (omit) RoadSegmentList p_roadSegments := omit
) modifies m_defaultMapem := {
msgIssueRevision := p_msgIssueRevision,
intersections := p_intersectionGeometryList,
roadSegments := p_roadSegments
}
template (omit) IntersectionGeometry m_intersectionGeometry(
in template (value) IntersectionReferenceID p_intersectionReferenceID,
in template (value) MsgCount p_revision,
in template (value) Position3D p_position3D,
in template (value) LaneList p_laneList,
in template (omit) LaneWidth p_laneWidth := 2000
) := {
name := omit, //For debug use only
id := p_intersectionReferenceID, // A globally unique value set, consisting of a regionID and intersection ID assignment
revision := p_revision, // Required default values about lane descriptions follow
refPoint := p_position3D, // The reference from which subsequent data points are offset until a new point is used.
laneWidth := p_laneWidth, // Reference width used by all subsequent lanes unless a new width is given speedLimits SpeedLimitList OPTIONAL,
laneSet := p_laneList, // Data about one or more lanes (all lane data is found here)
preemptPriorityData := omit, // data about one or more regional preempt or priority zones
regional := omit
}
template (value) Position3D m_position3D(
in template (value) Latitude p_latitude,
in template (value) Longitude p_longitude
) := {
lat := p_latitude, // in 1/10th micro degrees
long := p_longitude, // in 1/10th micro degrees
elevation := omit, // in 10 cm units
regional := omit
}
template (omit) GenericLane m_laneList(
in template (value) LaneID p_laneID,
in template (value) LaneAttributes p_laneAttributes,
in template (value) NodeListXY p_nodeListXY,
in template (omit) ConnectsToList p_connectsToList := omit,
in template (omit) ApproachID p_ingressApproach := omit,
in template (omit) ApproachID p_egressApproach := omit,
in template (omit) AllowedManeuvers p_allowedManeuvers := omit
) := {
laneID := p_laneID, // The unique ID number assigned to this lane object
name := omit, // often for debug use only but at times used to name ped crossings
ingressApproach := p_ingressApproach, // inbound Approach IDs to which this lane belongs
egressApproach := p_egressApproach, // outbound Approach IDs to which this lane belongs
laneAttributes := p_laneAttributes, // All Attribute information about the basic selected lane type
maneuvers := p_allowedManeuvers, // the permitted maneuvers for this lane
nodeList := p_nodeListXY, // Lane spatial path information as well as various Attribute information along the node path
// Attributes found here are more general and may come and go over the length of the lane.
connectsTo := p_connectsToList, // a list of other lanes and their signal group IDs each connecting lane and its signal group ID is given, therefore this element provides the information formerly in "signalGroups" in prior editions.
overlays := omit,
regional := omit
}
template (omit) RoadSegment m_roadSegment(
in template (value) RoadSegmentReferenceID p_id,
in template (value) MsgCount p_revision,
in template (value) Position3D p_position3D,
in template (value) RoadLaneSetList p_roadLaneSet,
in template (omit) SpeedLimitList p_speedLimits := omit,
in template (omit) LaneWidth p_laneWidth := 2000
) := {
name := omit,
id := p_id, // a globally unique value for the segment
revision := p_revision, // Required default values about the descriptions to follow
refPoint := p_position3D, // the reference from which subsequent data points are offset until a new point is used.
laneWidth := p_laneWidth, // Reference width used by all subsequent lanes unless a new width is given
speedLimits := p_speedLimits, // Reference regulatory speed limits used by all subsequent lanes unless a new speed is given
roadLaneSet := p_roadLaneSet,
regional := omit
}
template (value) RegulatorySpeedLimit m_speedLimits(
in template (value) SpeedLimitType p_speedLimitType,
in template (value) Velocity p_velocity
) := {
type_ := p_speedLimitType, // The type of regulatory speed which follows
speed := p_velocity // The speed in units of 0.02 m/s
}
} // End of group mapemTemplatesSend
/**
* @desc Receive template for MAPEM Message with no LayerType
*/
template (present) MapData mw_mapemLayerType(
in template (present) LayerID p_layerID := ?
) modifies mw_mapemWellFormatted := {
layerType := ?,
layerID := p_layerID
}
group mapemTemplatesRecv {
/**
* @desc Receive template for MAPEM Message
*/
template (present) MapData mw_defaultMapem := {
timeStamp := *,
msgIssueRevision := ?,
layerType := *,
layerID := *,
intersections := *,
roadSegments := *,
dataParameters := *,
restrictionList := *,
regional := *
}
/**
* @desc Receive template for MAPEM Message with no LayerType
*/
template (present) MapData mw_mapemWellFormatted modifies mw_defaultMapem := {
layerType := omit,
layerID := omit
}
/**
* @desc Receive template for MAPEM Message with no LayerType
*/
template (present) MapData mw_mapemLayerType(
in template (present) LayerID p_layerID := ?
) modifies mw_mapemWellFormatted := {
layerType := ?,
layerID := p_layerID
}
template (present) IntersectionGeometry mw_intersectionGeometry(
template (present) IntersectionReferenceID p_id := ?,
template (present) MsgCount p_revision := ?,
template (present) Position3D p_position3D := ?,
template (present) LaneList p_laneList := ?
) := {
name := *, //For debug use only
id := p_id, // A globally unique value set, consisting of a regionID and intersection ID assignment
revision := p_revision, // Required default values about lane descriptions follow
refPoint := p_position3D, // The reference from which subsequent data points are offset until a new point is used.
laneWidth := *, // Reference width used by all subsequent lanes unless a new width is given speedLimits SpeedLimitList OPTIONAL,
laneSet := p_laneList, // Data about one or more lanes (all lane data is found here)
preemptPriorityData := *, // data about one or more regional preempt or priority zones
regional := *
}
template (present) RoadSegment mw_roadSegment(
template (present) RoadSegmentReferenceID p_id := ?,
template (present) MsgCount p_revision := ?,
template (present) Position3D p_position3D := ?,
template (present) RoadLaneSetList p_roadLaneSet := ?
) := {
name := *,
id := p_id, // a globally unique value for the segment
revision := p_revision, // Required default values about the descriptions to follow
refPoint := p_position3D, // the reference from which subsequent data points are offset until a new point is used.
laneWidth := *, // Reference width used by all subsequent lanes unless a new width is given
speedLimits := *, // Reference regulatory speed limits used by all subsequent lanes unless a new speed is given
roadLaneSet := p_roadLaneSet,
regional := *
}
} // End of group mapemTemplatesRecv
} // End of group mapemTemplates
......@@ -416,11 +566,6 @@ module LibItsMapemSpatem_Templates {
regional := omit
}
template (value) IntersectionReferenceID m_intersectionReferenceID := {
region := omit,
id := PX_INTERSECTION_ID
}
template (value) MovementList m_movements := { m_movement };
template (value) MovementState m_movement := {
......
......@@ -35,9 +35,9 @@ module LibItsMapemSpatem_TypesAndValues {
type enumerated Event {
startTLMService (0),
stopTLMService (1),
spatemNewContent (2),
mapemNewContent (3),
mapemNewContentWithFragmentation (4),
mapemNewContent (2),
mapemNewContentWithFragmentation (3),
spatemNewContent (4),
mapemRepL10s (5),
mapemRepG10s (6)
}
......
......@@ -56,14 +56,14 @@ module LibItsSremSsem_Functions {
* @param p_event The event to trigger.
*/
function f_utTriggerEvent(
in template (value) UtSremSsemTrigger p_event
in template (value) UtSremTrigger p_event
) runs on ItsSremSsem {
var UtSremSsemTriggerResult v_result;
var UtSremTriggerResult v_result;
utPort.send ( p_event );
tc_wait.start;
alt {
[] utPort.receive ( UtSremSsemTriggerResult:? ) -> value v_result {
[] utPort.receive ( UtSremTriggerResult:? ) -> value v_result {
tc_wait.stop;
if ( not v_result ) {
f_selfOrClientSyncAndVerdict("MapSpat Trigger failed", e_error);
......
......@@ -17,9 +17,11 @@ module LibItsSremSsem_Pixits {
// LibItsSremSsem
import from LibItsSremSsem_TypesAndValues all;
modulepar DSecond PX_SECOND := 0;
modulepar BasicVehicleRole PX_BASICEVEHICLEROLE := emergency;
modulepar RequestImportanceLevel PX_REQUESTIMPORTANCELEVEL := requestImportanceLevel13;
modulepar RequestorDescription PX_REQUESTOR;
modulepar DSecond PX_SECOND := 0;
modulepar SignalStatus PX_STATUS;
......
......@@ -18,8 +18,8 @@ module LibItsSremSsem_Templates {
import from DSRC language "ASN.1:1997" all;
// LibItsCommon
import from LibItsCommon_Functions all;
import from LibItsCommon_TypesAndValues all;
import from LibItsCommon_Functions all;
// LibItsSremSsem
import from LibItsSremSsem_TestSystem all;
......@@ -185,9 +185,9 @@ module LibItsSremSsem_Templates {
* @param p_its_aid ITS-AID value
*/
template (present) SsemInd mw_ssemIndWithSecurityParameters(
template (present) SSEM p_ssemMsg,
template Bit128 p_ssp := *,
template UInt32 p_its_aid := *
template (present) SSEM p_ssemMsg,
template Bit128 p_ssp := *,
template UInt32 p_its_aid := *
) modifies mw_ssemInd := {
ssp := p_ssp,
its_aid := p_its_aid
......@@ -208,8 +208,12 @@ module LibItsSremSsem_Templates {
/**
* @desc Send template for Upper Tester Trigger event
*/
template (value) UtSremSsemTrigger m_utTriggerEvent ( Event p_event ) := {
event := p_event
template (value) UtSremTrigger m_utTriggerEvent(
in template (value) BasicVehicleRole p_basicVehicleRole,
in template (value) RequestImportanceLevel p_requestImportanceLevel
) := {
basicVehicleRole := p_basicVehicleRole,
requestImportanceLevel := p_requestImportanceLevel
}
}
......@@ -346,10 +350,47 @@ module LibItsSremSsem_Templates {
second := PX_SECOND,
sequenceNumber := omit,
requests := omit,
requestor := PX_REQUESTOR,
requestor := m_requestorDescription(m_vehicleID(f_getIutStationId())),
regional := omit
}
template (omit) RequestorDescription m_requestorDescription(
in template (value) VehicleID p_id,
in template (omit) RequestorType p_type := omit,
in template (omit) RequestorPositionVector p_position := omit,
in template (omit) TransitVehicleStatus p_transitStatus := omit,
in template (omit) TransitVehicleOccupancy p_transitOccupancy := omit
) := {
id := p_id, // The ID used in the BSM or CAM of the requestor
type_ := p_type, // Information regarding all type and class data about the requesting vehicle
position := p_position, // The location of the requesting vehicle
name := omit, // A human readable name for debugging use
routeName := omit, // A string for transit operations use
transitStatus := p_transitStatus, // current vehicle state (loading, etc.)
transitOccupancy := p_transitOccupancy, // current vehicle occupancy
transitSchedule := omit, // current vehicle schedule adherence
regional := omit
}
template (value) VehicleID m_vehicleID(
in template (value) StationID p_stationID
) := {
stationID := p_stationID
}
template (omit) RequestorType m_requestorType(
in template (value) BasicVehicleRole p_role,
in template (omit) RequestSubRole p_subrole := omit,
in template (omit) RequestImportanceLevel p_request := omit
) := {
role := p_role, // Basic role of this user at this time
subrole := p_subrole, // A local list with role based items
request := p_request, // A local list with request items
iso3883 := omit,
hpmsType := omit, // HPMS classification types
regional := omit
}
/**
* @desc Receive template for SREM Message
*/
......
......@@ -33,9 +33,9 @@ module LibItsSremSsem_TestSystem {
*/
type port UpperTesterPort message {
out
UtInitialize, UtSremSsemTrigger;
UtInitialize, UtSremTrigger;
in
UtInitializeResult, UtSremSsemTriggerResult, UtSremEventInd , UtSsemEventInd;
UtInitializeResult, UtSremTriggerResult, UtSremEventInd , UtSsemEventInd;
} // end UpperTesterPort
} // end portDefinitions
......
......@@ -29,22 +29,16 @@ module LibItsSremSsem_TypesAndValues {
/**
* @desc Upper Tester message to request triggering of an event at IUT
*/
type record UtSremSsemTrigger {
Event event
type record UtSremTrigger {
BasicVehicleRole basicVehicleRole,
RequestImportanceLevel requestImportanceLevel
}
type enumerated Event {
ssemNewContent (0),
sremNewContent (1),
sremRepL10s (2),
sremRepG10s (3)
}
type record of UtSremSsemTrigger UtSremSsemTriggerList;
type record of UtSremTrigger UtSremTriggerList;
/**
* @desc Upper Tester result message of request of triggering of an event at IUT
*/
type boolean UtSremSsemTriggerResult;
type boolean UtSremTriggerResult;
/**
* @desc Upper Tester message to check event/status at IUT
......
Supports Markdown
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