Commit 04a0375d authored by Yann Garcia's avatar Yann Garcia
Browse files

Terminate group Frequency/Periodicity range of VAMs

parent 3c542779

ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorLayer.cc

+3 −0
Original line number Original line Diff line number Diff line
@@ -1622,6 +1622,9 @@ int ConfigRsuSimulatorLayer::process_ut_vam_trigger(const OCTETSTRING &data, par 
    if ((flag & 0x40) == 0x40) {

    if ((flag & 0x40) == 0x40) {

      trigger.leaveClusterWithCause() = *p;

      trigger.leaveClusterWithCause() = *p;

    }

    }

    if ((flag & 0x20) == 0x20) {

      trigger.setVbsState() = *p;

    }

    loggers::get_instance().log_msg("ConfigRsuSimulatorLayer::process_ut_vam_trigger: ", trigger);

    loggers::get_instance().log_msg("ConfigRsuSimulatorLayer::process_ut_vam_trigger: ", trigger);





    // Pass it to the ports if any

    // Pass it to the ports if any

ccsrc/Protocols/UpperTester/uppertester_cps_codec.cc

+3 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,9 @@ int uppertester_cps_codec::encode(const LibItsCps__TypesAndValues::UtCpmTrigger 
  // } else if (r.leaveClusterWithCause().is_present()) {

  // } else if (r.leaveClusterWithCause().is_present()) {

  //   flags |= 0x40;

  //   flags |= 0x40;

  //   val = int2oct(r.leaveClusterWithCause(), 1);

  //   val = int2oct(r.leaveClusterWithCause(), 1);

  // } else if (r.setVbsState().is_present()) {

  //   flags |= 0x20;

  //   val = int2oct(r.setVbsState(), 1);

  }

  }

  encoding_buffer.put_c(flags);

  encoding_buffer.put_c(flags);

  encoding_buffer.put_string(val);

  encoding_buffer.put_string(val);

ccsrc/Protocols/UpperTester/uppertester_vru_codec.cc

+3 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,9 @@ int uppertester_vru_codec::encode(const LibItsVru__TypesAndValues::UtVamTrigger 
  } else if (r.ischosen(LibItsVru__TypesAndValues::UtVamTrigger::ALT_leaveClusterWithCause)) {

  } else if (r.ischosen(LibItsVru__TypesAndValues::UtVamTrigger::ALT_leaveClusterWithCause)) {

    flags |= 0x40;

    flags |= 0x40;

    val = int2oct(r.leaveClusterWithCause(), 1);

    val = int2oct(r.leaveClusterWithCause(), 1);

  } else if (r.ischosen(LibItsVru__TypesAndValues::UtVamTrigger::ALT_setVbsState)) {

    flags |= 0x20;

    val = int2oct(r.setVbsState(), 1);

  }

  }

  encoding_buffer.put_c(flags);

  encoding_buffer.put_c(flags);

  encoding_buffer.put_string(val);

  encoding_buffer.put_string(val);

etc/AtsVRU/AtsVRU_Simulator.cfg_

+21 −2
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ LibItsVru_Pics.PICS_PROFILE_ANIMAL := false 
LibItsVru_Pics.PICS_CLUSTERING           := true

LibItsVru_Pics.PICS_CLUSTERING           := true





LibItsVru_Pixits.PX_IUT_VRU_PROFILE_TYPE := 2

LibItsVru_Pixits.PX_IUT_VRU_PROFILE_TYPE := 2

LibItsVru_Pixits.PX_VRU_MIN_CLUSTER_SIZE := 4





[LOGGING]

[LOGGING]

# In this section you can specify the name of the log file and the classes of events

# In this section you can specify the name of the log file and the classes of events
@@ -173,6 +174,8 @@ system.utPort.params := "UT_VRU/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port= 
#ItsVru_TestCases.TC_VBS_MSGF_BV_19

#ItsVru_TestCases.TC_VBS_MSGF_BV_19

# Check that clusterLeaveReason indicates joiningAnotherCluster when the VRU is joining another cluster

# Check that clusterLeaveReason indicates joiningAnotherCluster when the VRU is joining another cluster

#ItsVru_TestCases.TC_VBS_MSGF_BV_20

#ItsVru_TestCases.TC_VBS_MSGF_BV_20



# To be validated

# Check that clusterLeaveReason indicates CancelledJoin when the joining is cancelled

# Check that clusterLeaveReason indicates CancelledJoin when the joining is cancelled

#ItsVru_TestCases.TC_VBS_MSGF_BV_21

#ItsVru_TestCases.TC_VBS_MSGF_BV_21

# Check that clusterLeaveReason indicates FailedJoin when the joining is cancelled

# Check that clusterLeaveReason indicates FailedJoin when the joining is cancelled
@@ -288,7 +291,7 @@ system.utPort.params := "UT_VRU/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port= 
# Check that a VBS in VRU-ACTIVE-STANDALONE stops the transmission of VAMs when changing to VRU-IDLE

# Check that a VBS in VRU-ACTIVE-STANDALONE stops the transmission of VAMs when changing to VRU-IDLE

#ItsVru_TestCases.TC_VBS_CLTR_BV_03

#ItsVru_TestCases.TC_VBS_CLTR_BV_03

# Check that a cluster breaking VRU stops sending cluster VAMs

# Check that a cluster breaking VRU stops sending cluster VAMs

#ItsVru_TestCases.TC_VBS_CLTR_BV_04

ItsVru_TestCases.TC_VBS_CLTR_BV_04

# Check that a VRU sends an indication of joining a cluster for timeClusterJoinNotification including the identified cluster and time at which it stops sending individual VAMs

# Check that a VRU sends an indication of joining a cluster for timeClusterJoinNotification including the identified cluster and time at which it stops sending individual VAMs

#ItsVru_TestCases.TC_VBS_CLTR_BV_05

#ItsVru_TestCases.TC_VBS_CLTR_BV_05

# Check that a VBS sends individual VAMs after a cancelled-join oder failed-join including the same station ID as before and the cluster leave notification for timeClusterLeaveNotification

# Check that a VBS sends individual VAMs after a cancelled-join oder failed-join including the same station ID as before and the cluster leave notification for timeClusterLeaveNotification
@@ -298,7 +301,23 @@ system.utPort.params := "UT_VRU/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port= 
# Check that a cluster leader indicates a cluster ID change for timeClusterIdChangeNotification before the change

# Check that a cluster leader indicates a cluster ID change for timeClusterIdChangeNotification before the change

#ItsVru_TestCases.TC_VBS_CLTR_BV_09

#ItsVru_TestCases.TC_VBS_CLTR_BV_09

# Check that a cluster leader sends a cluster VAM with the new ID as soon as possible

# Check that a cluster leader sends a cluster VAM with the new ID as soon as possible

#ItsVru_TestCases.TC_VBS_CLTR_BV_10()

#ItsVru_TestCases.TC_VBS_CLTR_BV_10



#  Check that a VBS starts sending VAMs when the state changes from VRU-IDLE to VRU-ACTIVE-STANDALONE

#ItsVru_TestCases.TC_VBS_CLTR_BV_01

# Check that the cluster size is set to minClusterSize and the VRU profile field is set to the VRU profile

#ItsVru_TestCases.TC_VBS_CLTR_BV_02

# Check that the minimum time elapsed between the start of consecutive VAM generation events is equal or larger than T_Gen_Vam

#ItsVru_TestCases.TC_VBS_FRPE_TI_04

# Check that T_GenVam is set to T_GenVamMin if the value for T_GenVam is not provided by the VBS management entity or smaller than T_GenVamMin in case of ITS-G5

#ItsVru_TestCases.TC_VBS_FRPE_TI_05



# Check that the minimum time elapsed between the start of consecutive VAM generation events is equal or larger than T_Gen_Vam

#ItsVru_TestCases.TC_VBS_FRPE_TI_01 runs on ItsVru system ItsVruSystem {

# Check that the LF container is included in the first VAM generation

#ItsVru_TestCases.TC_VBS_FRPE_BV_02

# Check that the LF container is included periodically after 2000 ms

#ItsVru_TestCases.TC_VBS_FRPE_BV_03





# Check that the ITS-AID indicates the application for which permissions are being granted

# Check that the ITS-AID indicates the application for which permissions are being granted

#ItsVru_TestCases.TC_VBS_SECC_BV_02

#ItsVru_TestCases.TC_VBS_SECC_BV_02

AtsDENM @ 75c82d2b

Compare c8bb06d4 to 75c82d2b
Original line number Original line Diff line number Diff line 
Subproject commit c8bb06d44ebe44cb303b1114cafaf159458bfbaf
 
Subproject commit 75c82d2b1916c002da1b0c1dc9cbfdad1208ccc5