Commit 80a82ee5 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed on UpperTester UtChangePseudonym numbering

parent a602207c

ccsrc/Protocols/UpperTester/uppertester_cam_codec.cc

+3 −3
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ class TTCN_EncDec; 


uint8_t uppertester_cam_codec::c_utCamInitialize              = 0x00;

uint8_t uppertester_cam_codec::c_utCamInitializeResult        = 0x01;

uint8_t uppertester_cam_codec::c_utCamChangePseudonymResult   = 0x05;

uint8_t uppertester_cam_codec::c_utCamTriggerResult           = 0x21;

uint8_t uppertester_cam_codec::c_utCamChangePosition          = 0x02;

uint8_t uppertester_cam_codec::c_utCamChangePositionResult    = 0x03;

uint8_t uppertester_cam_codec::c_utCamChangeCurvature         = 0x30;
@@ -28,9 +30,7 @@ uint8_t uppertester_cam_codec::c_utCamSetEmbarkationStatus = 0x3b; 
uint8_t uppertester_cam_codec::c_utCamSetPtActivation         = 0x3c;

uint8_t uppertester_cam_codec::c_utCamSetDangerousGoods       = 0x3d;

uint8_t uppertester_cam_codec::c_utCamSetLightBarSirene       = 0x3f;

uint8_t uppertester_cam_codec::c_utCamChangePseudonym         = 0x40;

uint8_t uppertester_cam_codec::c_utCamChangePseudonymResult   = 0x41;

uint8_t uppertester_cam_codec::c_utCamTriggerResult           = 0x21;

uint8_t uppertester_cam_codec::c_utCamChangePseudonym         = 0x04;

uint8_t uppertester_cam_codec::c_utCamEventInd                = 0x23;



int uppertester_cam_codec::encode(const Record_Type &msg, OCTETSTRING &data) {

ccsrc/Protocols/UpperTester/uppertester_denm_codec.cc

+2 −2
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ class TTCN_EncDec; 


uint8_t uppertester_denm_codec::c_utDenmInitialize            = 0x00;

uint8_t uppertester_denm_codec::c_utDenmInitializeResult      = 0x01;

uint8_t uppertester_denm_codec::c_utDenmChangePseudonym       = 0x04;

uint8_t uppertester_denm_codec::c_utDenmChangePseudonymResult = 0x05;

uint8_t uppertester_denm_codec::c_utDenmChangePosition        = 0x02;

uint8_t uppertester_denm_codec::c_utDenmChangePositionResult  = 0x03;

uint8_t uppertester_denm_codec::c_utDenmTrigger               = 0x10;
@@ -23,8 +25,6 @@ uint8_t uppertester_denm_codec::c_utDenmUpdateResult = 0x13; 
uint8_t uppertester_denm_codec::c_utDenmTermination           = 0x14;

uint8_t uppertester_denm_codec::c_utDenmTerminationResult     = 0x15;

uint8_t uppertester_denm_codec::c_utDenmEventIndication       = 0x17;

uint8_t uppertester_denm_codec::c_utDenmChangePseudonym       = 0x18;

uint8_t uppertester_denm_codec::c_utDenmChangePseudonymResult = 0x19;



int uppertester_denm_codec::encode(const Record_Type &msg, OCTETSTRING &data) {

  loggers::get_instance().log_msg(">>> uppertester_denm_codec::encode: ", (const Record_Type &)msg);

ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.cc

+13 −13
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ class TTCN_EncDec; 


uint8_t uppertester_geonetworking_codec::c_utGnInitialize            = 0x00;

uint8_t uppertester_geonetworking_codec::c_utGnInitializeResult      = 0x01;

uint8_t uppertester_geonetworking_codec::c_utGnChangePseudonym       = 0x04;

uint8_t uppertester_geonetworking_codec::c_utGnChangePseudonymResult = 0x05;

uint8_t uppertester_geonetworking_codec::c_utGnChangePosition        = 0x02;

uint8_t uppertester_geonetworking_codec::c_utGnChangePositionResult  = 0x03;

uint8_t uppertester_geonetworking_codec::c_utGnTriggerResult         = 0x41;
@@ -21,8 +23,6 @@ uint8_t uppertester_geonetworking_codec::c_utGnTrigger_GeoAnycast = 0x52; 
uint8_t uppertester_geonetworking_codec::c_utGnTrigger_Shb           = 0x53;

uint8_t uppertester_geonetworking_codec::c_utGnTrigger_Tsb           = 0x54;

uint8_t uppertester_geonetworking_codec::c_utGnEventIndication       = 0x55;

uint8_t uppertester_geonetworking_codec::c_utGnChangePseudonym       = 0x56;

uint8_t uppertester_geonetworking_codec::c_utGnChangePseudonymResult = 0x57;



int uppertester_geonetworking_codec::encode(const Record_Type &msg, OCTETSTRING &data) {

  loggers::get_instance().log_msg(">>> uppertester_geonetworking_codec::encode: ", (const Record_Type &)msg);

etc/AtsDENM/AtsDENM.cfg

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ system.utPort.params := "UT_DENM/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port 
# Check that sequenceNumber is set to a next unused value each time an event is detected

#ItsDenm_TestCases.TC_DEN_EVGN_BV_07

# Check that DEN Basic Service generates an update DENM on reception of a valid AppDENM_update request

#ItsDenm_TestCases.TC_DEN_EVUP_BV_01

ItsDenm_TestCases.TC_DEN_EVUP_BV_01

# Check that the actionId is not changed by DENM update, as long as the stationId of the originating ITS-S remains unchanged

#ItsDenm_TestCases.TC_DEN_EVUP_BV_02

# Check that referenceTime is set to the current time when generating a DENM for an updated eventCheck
@@ -216,7 +216,7 @@ system.utPort.params := "UT_DENM/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port 
# Check that IUT does not send a DENM if it is not permitted by signing certificate

#ItsDenm_TestCases.TC_DEN_SSP_BV_02_04

# Check that receiving ITS-S transmits DENM to application if it concerns an unknown actionId and if it is not a termination DENM

ItsDenm_TestCases.TC_DEN_MSRV_BV_01

#ItsDenm_TestCases.TC_DEN_MSRV_BV_01

# Check that receiving ITS-S transmits DENM to application if it concerns a known actionId 

#ItsDenm_TestCases.TC_DEN_MSRV_BV_02

# Check that receiving ITS-S discards termination DENM if it concerns an unknown actionId (own actionId)