Commit 11296813 authored by garciay's avatar garciay
Browse files

Add its_aid port information in GeoNetworkingReq

parent 049adf80
...@@ -5428,6 +5428,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -5428,6 +5428,7 @@ module ItsGeoNetworking_TpFunctions {
-, -,
c_defaultHopLimit c_defaultHopLimit
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -6347,6 +6348,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -6347,6 +6348,7 @@ module ItsGeoNetworking_TpFunctions {
-, -,
c_defaultHopLimit c_defaultHopLimit
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -6436,6 +6438,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -6436,6 +6438,7 @@ module ItsGeoNetworking_TpFunctions {
vc_localSeqNumber vc_localSeqNumber
) )
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -6513,6 +6516,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -6513,6 +6516,7 @@ module ItsGeoNetworking_TpFunctions {
-, -,
c_defaultHopLimit c_defaultHopLimit
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -6629,6 +6633,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -6629,6 +6633,7 @@ module ItsGeoNetworking_TpFunctions {
-, -,
1 1
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -6676,7 +6681,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -6676,7 +6681,7 @@ module ItsGeoNetworking_TpFunctions {
vc_localSeqNumber vc_localSeqNumber
) )
); );
f_sendGeoNetMessage(m_geoNwReq_withLinkLayerDestination(v_gnPacket, f_getIutMacAddress())); f_sendGeoNetMessage(m_geoNwReq_withLinkLayerDestination(v_gnPacket, -, f_getIutMacAddress()));
f_sleep(PX_TAC); f_sleep(PX_TAC);
...@@ -6832,6 +6837,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -6832,6 +6837,7 @@ module ItsGeoNetworking_TpFunctions {
-, -,
c_defaultHopLimit c_defaultHopLimit
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -6996,6 +7002,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -6996,6 +7002,7 @@ module ItsGeoNetworking_TpFunctions {
-, -,
c_defaultHopLimit c_defaultHopLimit
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -7105,6 +7112,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -7105,6 +7112,7 @@ module ItsGeoNetworking_TpFunctions {
-, -,
c_defaultHopLimit - 1 c_defaultHopLimit - 1
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -7162,6 +7170,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -7162,6 +7170,7 @@ module ItsGeoNetworking_TpFunctions {
-, -,
c_defaultHopLimit c_defaultHopLimit
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -7310,6 +7319,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -7310,6 +7319,7 @@ module ItsGeoNetworking_TpFunctions {
-, -,
c_defaultHopLimit c_defaultHopLimit
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -7559,6 +7569,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -7559,6 +7569,7 @@ module ItsGeoNetworking_TpFunctions {
-, -,
c_defaultHopLimit - 1 c_defaultHopLimit - 1
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -7611,6 +7622,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -7611,6 +7622,7 @@ module ItsGeoNetworking_TpFunctions {
-, -,
c_defaultHopLimit c_defaultHopLimit
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -7726,7 +7738,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -7726,7 +7738,7 @@ module ItsGeoNetworking_TpFunctions {
} }
// Test Body // Test Body
f_sendGeoNetMessage(m_geoNwReq_withLinkLayerDestination(valueof(v_gnPacket), f_getIutMacAddress())); f_sendGeoNetMessage(m_geoNwReq_withLinkLayerDestination(valueof(v_gnPacket), -, f_getIutMacAddress()));
f_sleep(PX_TAC); f_sleep(PX_TAC);
...@@ -7765,6 +7777,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -7765,6 +7777,7 @@ module ItsGeoNetworking_TpFunctions {
-, -,
c_defaultHopLimit c_defaultHopLimit
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -14205,6 +14218,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -14205,6 +14218,7 @@ module ItsGeoNetworking_TpFunctions {
f_getGeoBroadcastArea(c_area1) f_getGeoBroadcastArea(c_area1)
) )
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
...@@ -14321,6 +14335,7 @@ module ItsGeoNetworking_TpFunctions { ...@@ -14321,6 +14335,7 @@ module ItsGeoNetworking_TpFunctions {
f_getGeoBroadcastArea(c_area1) f_getGeoBroadcastArea(c_area1)
) )
), ),
-,
f_getIutMacAddress() f_getIutMacAddress()
) )
); );
......
...@@ -315,6 +315,7 @@ module ItsMapem_TpFunctions { ...@@ -315,6 +315,7 @@ module ItsMapem_TpFunctions {
tc_ac.stop; tc_ac.stop;
log("*** " & testcasename() & ": INFO: Successfully received well-formed MAPEM. ***"); log("*** " & testcasename() & ": INFO: Successfully received well-formed MAPEM. ***");
f_utTriggerEvent(m_utTriggerEvent(startTLMService)); f_utTriggerEvent(m_utTriggerEvent(startTLMService));
v_tlmServiceStarted := true;
tc_ac.start; tc_ac.start;
repeat; repeat;
} }
......
...@@ -389,7 +389,8 @@ module ItsRSUsSimulator_Functions { ...@@ -389,7 +389,8 @@ module ItsRSUsSimulator_Functions {
} }
function f_send( function f_send(
in template (value) Payload p_payload in template (value) Payload p_payload,
in UInt32 p_its_aid
) runs on ItsRSUsSimulator { ) runs on ItsRSUsSimulator {
var GeoNetworkingPdu v_geoNetworkingPdu; var GeoNetworkingPdu v_geoNetworkingPdu;
...@@ -405,7 +406,7 @@ module ItsRSUsSimulator_Functions { ...@@ -405,7 +406,7 @@ module ItsRSUsSimulator_Functions {
m_defaultLifetime, m_defaultLifetime,
c_defaultHopLimit c_defaultHopLimit
)); ));
f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_geoNetworkingPdu))); f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_geoNetworkingPdu, p_its_aid)));
} }
function f_processSrem( function f_processSrem(
...@@ -433,11 +434,11 @@ module ItsRSUsSimulator_Functions { ...@@ -433,11 +434,11 @@ module ItsRSUsSimulator_Functions {
PICS_SSEM_BTP_SOURCE_PORT PICS_SSEM_BTP_SOURCE_PORT
) )
); );
// Send SSEM
f_send(v_payload, PICS_SSEM_ITS_AID);
} // else, ignore message } // else, ignore message
} // else, ignore message } // else, ignore message
} // else, ignore message } // else, ignore message
// TODO Process message, and send SSEM
} }
function f_incLocalSeqNumber() runs on ItsRSUsSimulator return UInt16 { function f_incLocalSeqNumber() runs on ItsRSUsSimulator return UInt16 {
......
...@@ -77,21 +77,21 @@ module ItsRSUsSimulator_TestCases { ...@@ -77,21 +77,21 @@ module ItsRSUsSimulator_TestCases {
[PICS_GENERATE_CAM] tc_cam.timeout { [PICS_GENERATE_CAM] tc_cam.timeout {
log("*** " & testcasename() & ": DEBUG: Processing CAM ***"); log("*** " & testcasename() & ": DEBUG: Processing CAM ***");
f_prepare_cam(v_payload); f_prepare_cam(v_payload);
f_send(v_payload); f_send(v_payload, PICS_CAM_ITS_AID);
tc_cam.start; tc_cam.start;
repeat; repeat;
} }
[PICS_GENERATE_DENM] tc_denm.timeout { [PICS_GENERATE_DENM] tc_denm.timeout {
log("*** " & testcasename() & ": DEBUG: Processing DENM ***"); log("*** " & testcasename() & ": DEBUG: Processing DENM ***");
f_prepare_denm(v_payload); f_prepare_denm(v_payload);
f_send(v_payload); f_send(v_payload, PICS_DENM_ITS_AID);
tc_denm.start; tc_denm.start;
repeat; repeat;
} }
[PICS_GENERATE_MAPEM] tc_mapem.timeout { [PICS_GENERATE_MAPEM] tc_mapem.timeout {
log("*** " & testcasename() & ": DEBUG: Processing MAPEM ***"); log("*** " & testcasename() & ": DEBUG: Processing MAPEM ***");
f_prepare_mapem(v_payload); f_prepare_mapem(v_payload);
f_send(v_payload); f_send(v_payload, PICS_MAPEM_ITS_AID);
tc_mapem.start; tc_mapem.start;
repeat; repeat;
} }
...@@ -99,7 +99,7 @@ module ItsRSUsSimulator_TestCases { ...@@ -99,7 +99,7 @@ module ItsRSUsSimulator_TestCases {
log("*** " & testcasename() & ": DEBUG: Processing SPATEM ***"); log("*** " & testcasename() & ": DEBUG: Processing SPATEM ***");
for (var integer v_counter := 0; v_counter < lengthof(vc_rsuMessagesValueList[PX_RSU_ID - 1].spatems); v_counter := v_counter + 1) { for (var integer v_counter := 0; v_counter < lengthof(vc_rsuMessagesValueList[PX_RSU_ID - 1].spatems); v_counter := v_counter + 1) {
f_prepare_spatem(vc_rsuMessagesValueList[PX_RSU_ID - 1].spatems[v_counter], v_payload); f_prepare_spatem(vc_rsuMessagesValueList[PX_RSU_ID - 1].spatems[v_counter], v_payload);
f_send(v_payload); f_send(v_payload, PICS_SPATEM_ITS_AID);
} }
tc_spatem.start; tc_spatem.start;
repeat; repeat;
...@@ -107,7 +107,7 @@ module ItsRSUsSimulator_TestCases { ...@@ -107,7 +107,7 @@ module ItsRSUsSimulator_TestCases {
[PICS_GENERATE_IVIM] tc_ivim.timeout { [PICS_GENERATE_IVIM] tc_ivim.timeout {
log("*** " & testcasename() & ": DEBUG: Processing IVIM ***"); log("*** " & testcasename() & ": DEBUG: Processing IVIM ***");
f_prepare_ivim(v_payload); f_prepare_ivim(v_payload);
f_send(v_payload); f_send(v_payload, PICS_IVIM_ITS_AID);
tc_ivim.start; tc_ivim.start;
repeat; repeat;
} }
......
...@@ -79,7 +79,7 @@ module test_LibItsMapemSpatem_TypesAndValues { ...@@ -79,7 +79,7 @@ module test_LibItsMapemSpatem_TypesAndValues {
v_spatReq := valueof( v_spatReq := valueof(
m_spatemReq( m_spatemReq(
m_spatemPdu( m_spatemPdu(
m_spat m_spatem(m_intersections)
))); )));
log("v_spatReq=", v_spatReq); log("v_spatReq=", v_spatReq);
test_PDU<SpatemReq>( test_PDU<SpatemReq>(
......
...@@ -18,7 +18,7 @@ module test_all /*language "TTCN-3:2009 Advanced Parameterization"*/ { ...@@ -18,7 +18,7 @@ module test_all /*language "TTCN-3:2009 Advanced Parameterization"*/ {
import from test_LibItsSecurity_TypesAndValues all; import from test_LibItsSecurity_TypesAndValues all;
// import from test_LibItsMapemSpatem_TypesAndValues all; import from test_LibItsMapemSpatem_TypesAndValues all;
// import from test_LibItsIvim_TypesAndValues all; // import from test_LibItsIvim_TypesAndValues all;
// //
......
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