Commit c20247d6 authored by YannGarcia's avatar YannGarcia
Browse files

Build AtsDENM Release.2

parent 9d610acb

ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorLayer.cc

+4 −4
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void ConfigRsuSimulatorLayer::sendMsg(const LibItsDenm__TypesAndValues::UtDenmRe 
    encoding_buffer.put_c(static_cast<const unsigned char>(uppertester_denm_codec::c_utDenmTriggerResult));

    const LibItsDenm__TypesAndValues::UtDenmTriggerResult &r = send_par.utDenmTriggerResult();

    encoding_buffer.put_c((unsigned char)static_cast<const boolean>(r.result()));

    OCTETSTRING os = int2oct(r.actionId().originatingStationID(), 4);

    OCTETSTRING os = int2oct(r.actionId().originatingStationId(), 4);

    encoding_buffer.put_s(os.lengthof(), static_cast<const unsigned char *>(os));

    os = int2oct(r.actionId().sequenceNumber(), 2);

    encoding_buffer.put_s(os.lengthof(), static_cast<const unsigned char *>(os));
@@ -125,7 +125,7 @@ void ConfigRsuSimulatorLayer::sendMsg(const LibItsDenm__TypesAndValues::UtDenmRe 
    encoding_buffer.put_c(static_cast<const unsigned char>(uppertester_denm_codec::c_utDenmUpdateResult));

    const LibItsDenm__TypesAndValues::UtDenmUpdateResult &r = send_par.utDenmUpdateResult();

    encoding_buffer.put_c((unsigned char)static_cast<const boolean>(r.result()));

    OCTETSTRING os = int2oct(r.actionId().originatingStationID(), 4);

    OCTETSTRING os = int2oct(r.actionId().originatingStationId(), 4);

    encoding_buffer.put_s(os.lengthof(), static_cast<const unsigned char *>(os));

    os = int2oct(r.actionId().sequenceNumber(), 2);

    encoding_buffer.put_s(os.lengthof(), static_cast<const unsigned char *>(os));
@@ -668,7 +668,7 @@ int ConfigRsuSimulatorLayer::process_ut_denm_update(const OCTETSTRING &data, par 
    loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_denm_update: flag=%02x", flag);

    LibItsDenm__TypesAndValues::UtDenmUpdate update; // See ETSI TR 103 099 Cause C.4.1 GenerateDenmEvent

    // Statuion ID

    update.actionId().originatingStationID() = oct2int(OCTETSTRING(4, p));

    update.actionId().originatingStationId() = oct2int(OCTETSTRING(4, p));

    p += 4;

    // SequenceNumber

    update.actionId().sequenceNumber() = oct2int(OCTETSTRING(2, p));
@@ -754,7 +754,7 @@ int ConfigRsuSimulatorLayer::process_ut_denm_termination(const OCTETSTRING &data 
    unsigned char  msg_id = *p++;

    loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_denm_termination: msg_id=%02x", msg_id);

    LibItsDenm__TypesAndValues::UtDenmTermination termination;

    termination.actionId().originatingStationID() = oct2int(OCTETSTRING(4, p));

    termination.actionId().originatingStationId() = oct2int(OCTETSTRING(4, p));

    p += 4;

    termination.actionId().sequenceNumber() = oct2int(OCTETSTRING(2, p));

ccsrc/Protocols/UpperTester/uppertester_denm_codec.cc

+3 −3
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ int uppertester_denm_codec::encode_(const Base_Type &type, const TTCN_Typedescri 
      const OPTIONAL<INTEGER> &o = dynamic_cast<const OPTIONAL<INTEGER> &>(type);

      const INTEGER &          i = static_cast<const INTEGER &>(*o.get_opt_value());

      encoding_buffer.put_string(int2oct(i, 2));

    } else if (s.rfind(".originatingStationID") != string::npos) {

    } else if (s.rfind(".originatingStationId") != string::npos) {

      const INTEGER &i = static_cast<const INTEGER &>(type);

      loggers::get_instance().log_msg("uppertester_denm_codec::encode_: i=", i);

      encoding_buffer.put_string(int2oct(i, 4));
@@ -256,7 +256,7 @@ int uppertester_denm_codec::decode(const OCTETSTRING &data, LibItsDenm__TypesAnd 
    ptr += 1;

    OCTETSTRING os(4, ptr);

    ptr += 4;

    r.actionId().originatingStationID() = oct2int(os);

    r.actionId().originatingStationId() = oct2int(os);

    os                                  = OCTETSTRING(2, ptr);

    r.actionId().sequenceNumber()       = oct2int(os);

    msg.utDenmTriggerResult()           = r;
@@ -267,7 +267,7 @@ int uppertester_denm_codec::decode(const OCTETSTRING &data, LibItsDenm__TypesAnd 
    ptr += 1;

    OCTETSTRING os(4, ptr);

    ptr += 4;

    r.actionId().originatingStationID() = oct2int(os);

    r.actionId().originatingStationId() = oct2int(os);

    os                                  = OCTETSTRING(2, ptr);

    r.actionId().sequenceNumber()       = oct2int(os);

    msg.utDenmUpdateResult()            = r;

ccsrc/Protocols/UpperTester/uppertester_denm_layer.cc

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ void uppertester_denm_layer::sendMsg(const LibItsDenm__TypesAndValues::UtDenmTri 
  loggers::get_instance().log_msg(">>> uppertester_denm_layer::sendMsg", send_par);



  if (_params[params_its::loopback].compare("1") == 0) {

    LibItsDenm__TypesAndValues::UtDenmTriggerResult trigger_result(true, ITS__Container::ActionID(std::stoi(_params[params_its::station_id]), 1));

    LibItsDenm__TypesAndValues::UtDenmTriggerResult trigger_result(true, ETSI__ITS__CDD::ActionId(std::stoi(_params[params_its::station_id]), 1));

    LibItsDenm__TypesAndValues::UtDenmResults       ut_denm_results;

    ut_denm_results.utDenmTriggerResult() = trigger_result;

    to_all_upper_ports(ut_denm_results, p_params);
@@ -90,7 +90,7 @@ void uppertester_denm_layer::sendMsg(const LibItsDenm__TypesAndValues::UtDenmUpd 
  loggers::get_instance().log_msg(">>> uppertester_denm_layer::sendMsg", send_par);



  if (_params[params_its::loopback].compare("1") == 0) {

    LibItsDenm__TypesAndValues::UtDenmUpdateResult update_result(true, ITS__Container::ActionID(std::stoi(_params[params_its::station_id]), 1));

    LibItsDenm__TypesAndValues::UtDenmUpdateResult update_result(true, ETSI__ITS__CDD::ActionId(std::stoi(_params[params_its::station_id]), 1));

    LibItsDenm__TypesAndValues::UtDenmResults      ut_denm_results;

    ut_denm_results.utDenmUpdateResult() = update_result;

    to_all_upper_ports(ut_denm_results, p_params);

ccsrc/framework/include/params_its.hh

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public: //! \publicsection 
  static const std::string& longitude;  //! Test system Longitude parameter name

  static const std::string& expiry;     //! Test system GeoNetworking Lifetime parameter name (in ms)



  static const std::string& station_id; //! To indicate to the peer ITS_Container::stationID

  static const std::string& station_id; //! To indicate to the peer ETSI-ITS-CDD::StationIs



  static const std::string& device_mode;  //! To indicate to the lower layer to act as a standalone device

  static const std::string& secured_mode; //! To indicate to the lower layer to apply signature on message exchanges as defined in IEEE 1609.2&  ETSI TS 102 965

etc/AtsDENM/AtsDENM.cfg

+9 −9
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ ItsDenm_TestCases.TC_DEN_MSGF_BV_01 
#ItsDenm_TestCases.TC_DEN_MSGF_BV_02

# Check that DEN Basic Service generates a new DENM on reception of a valid AppDENM_Trigger request

#ItsDenm_TestCases.TC_DEN_EVGN_BV_01

# Check that a new ActionID value is assigned for each newly generated DENM

# Check that a new ActionId value is assigned for each newly generated DENM

#ItsDenm_TestCases.TC_DEN_EVGN_BV_02

# Check that a newly created ActionID contains the StationID of the originating ITS-S that detected the event

# Check that a newly created ActionId contains the StationID of the originating ITS-S that detected the event

#ItsDenm_TestCases.TC_DEN_EVGN_BV_03

# Check that Cause and subcause values included in DENM as provided by application

#ItsDenm_TestCases.TC_DEN_EVGN_BV_04
@@ -161,19 +161,19 @@ ItsDenm_TestCases.TC_DEN_MSGF_BV_01 
#ItsDenm_TestCases.TC_DEN_SSP_BV_01_01

# Check that IUT does not send a DENM if it is not permitted by signing certificate

#ItsDenm_TestCases.TC_DEN_SSP_BV_01_02

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

# 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

#Check that receiving ITS-S transmits DENM to application if it concerns a known ActionID and referenceTime is greater than highest value received for this ActionID

#Check that receiving ITS-S transmits DENM to application if it concerns a known ActionId and referenceTime is greater than highest value received for this ActionId

#ItsDenm_TestCases.TC_DEN_MSRV_BV_02

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

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

#ItsDenm_TestCases.TC_DEN_MSRV_BO_03

# Check that receiving ITS-S discards termination DENM if it concerns an unknown ActionID (other actionID)

# Check that receiving ITS-S discards termination DENM if it concerns an unknown ActionId (other actionID)

#ItsDenm_TestCases.TC_DEN_MSRV_BO_04

# Check that receiving ITS-S discards DENM if referenceTime is lower than highest value received for this ActionID

# Check that receiving ITS-S discards DENM if referenceTime is lower than highest value received for this ActionId

#ItsDenm_TestCases.TC_DEN_MSRV_BO_05

# Check that receiving ITS-S discards DENM if detectionTime is smaller than highest value received for this ActionID

# Check that receiving ITS-S discards DENM if detectionTime is smaller than highest value received for this ActionId

#ItsDenm_TestCases.TC_DEN_MSRV_BO_06

# Check that receiving ITS-S transmits DENM to application if it concerns a known ActionID and referenceTime is equal to highest received value and detectionTime is more recent

# Check that receiving ITS-S transmits DENM to application if it concerns a known ActionId and referenceTime is equal to highest received value and detectionTime is more recent

#ItsDenm_TestCases.TC_DEN_MSRV_BV_07

# Check that receiving ITS-S discards DENM for new event if SSP value of the signing certificate is not consistent with the causeCode

#ItsDenm_TestCases.TC_DEN_MSRV_BO_08_01