Commit 07f311d5 authored by garciay's avatar garciay
Browse files

Enhance AtsRSUSimulator to validate Test System & ATSs

parent 32015341
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -750,14 +750,11 @@ module TestCodec_CAM {
          [v_got_cam == false] camPort.receive(CamInd : ?) {
            v_got_cam := true;
            setverdict(pass);
            repeat;
          }
          [] tc_ac.timeout { // Give time to receive LS_REQUEST from the simulator
            if (v_got_cam == false) {
            setverdict(fail, "Expected message not received1");
          }
        }
        }
                
        unmap(self:camPort, system:camPort);
                
+1 −4
Original line number Diff line number Diff line
@@ -446,14 +446,11 @@ module TestCodec_DENM {
          [v_got_denm == false] denmPort.receive(DenmInd : ?) {
            v_got_denm := true;
            setverdict(pass);
            repeat;
          }
          [] tc_ac.timeout {
            if (v_got_denm == false) {
            setverdict(fail, "Expected message not received1");
          }
        }
        }
                
        unmap(self:denmPort, system:denmPort);
	
+35 −11
Original line number Diff line number Diff line
@@ -224,6 +224,25 @@ module TestCodec_GeoNetworking {
      its_aid := p_its_aid
      }
      
      /**
       * @desc    Receive template for GeoNetworking SHB Packet
       * @param   p_sourceLongPosVec  Long position vector of source (Default: ?)
       * @param   p_hopLimit          Maximum number of hops (Default: ?)
       */
      template (present) GnNonSecuredPacket mw_geoNwShbPacket_nextHeader(
                                                                         in template (present) LongPosVector p_sourceLongPosVec := ?,
                                                                         in template (present) UInt8 p_hopLimit := ?,
                                                                         in template (present) NextHeader p_nextHeader := ?
                                                                         ) modifies mw_geoNwShbPacket := {
      commonHeader := mw_commonHeaderWithHopLimit(
                                                  p_nextHeader,
                                                  m_shbHeaderType,
                                                  p_hopLimit
                                                  ),
      extendedHeader := mw_shbHeader(p_sourceLongPosVec),
      payload := ?
      }
      
    } // End of group LibItsGeoNetworking_DummyTemplates
        
    group testGeoNetMessages {
@@ -1012,7 +1031,7 @@ module TestCodec_GeoNetworking {
                                                                                         3456, 
                                                                                         m_dummyGeoBroadcastArea1
                                                                                         ),
                                                                  Lifetime: {multiplier := c_defaultLifetime, ltBase := e_100s}
                                                                  Lifetime: {multiplier := c_defaultLifetime, ltBase := e_100s} // FIXME Looks like a TITAN bug!
                                                                  )));
        
        geoNetworkingPort.send(v_gnReq);
@@ -1083,8 +1102,8 @@ module TestCodec_GeoNetworking {
        var LongPosVector v_longPosVectorIut;
        var GeoNetworkingInd v_msg;
        
        if ((PX_GN_UPPER_LAYER != e_any) and (PX_GN_UPPER_LAYER != e_btpA)) {
          setverdict(inconc, "PX_GN_UPPER_LAYER shall be set to e_any when using xxx_61_beacon or e_btpA when using xxx_61_cam");
        if (PX_GN_UPPER_LAYER != e_any) {
          setverdict(inconc, "PX_GN_UPPER_LAYER shall be set to e_any when using xxx_61_beacon and xxx_61_cam");
          stop;
        }
        
@@ -1092,7 +1111,7 @@ module TestCodec_GeoNetworking {
        map(self:acPort, system:acPort);
        
        // A small sleep to provide TA to read pcap file is it used
        tc_noac.start(1.0);
        tc_noac.start(5.0);
        alt {
          [] tc_noac.timeout {
          }
@@ -1123,9 +1142,11 @@ module TestCodec_GeoNetworking {
                                                                                         m_dummyLongPosVectorNodeB, 
                                                                                         3456, 
                                                                                         m_dummyGeoBroadcastArea1
                                                                                         ))));
                
                                                                                         ),
                                                                  Lifetime: {multiplier := c_defaultLifetime, ltBase := e_100s} // FIXME Looks like a TITAN bug!
                                                                  )));
        geoNetworkingPort.send(v_gnReq);
        
        tc_ac.start;
        alt {
          [] geoNetworkingPort.receive(
@@ -1152,7 +1173,11 @@ module TestCodec_GeoNetworking {
          [] geoNetworkingPort.receive(
                                       mw_geoNwInd(
                                                   mw_geoNwPdu(
                                                               mw_geoNwShbPacket(?)
                                                               mw_geoNwShbPacket_nextHeader(
                                                                                            -,
                                                                                            -,
                                                                                            e_btpA
                                                                                            )
                                                               )
                                                   )) -> value v_msg {
            log("Receive SHB packet: ", v_msg.msgIn);
@@ -1160,12 +1185,11 @@ module TestCodec_GeoNetworking {
              v_got_shb := true;
              setverdict(pass);
            }
            repeat;
          }
          [] geoNetworkingPort.receive(
                                       mw_geoNwInd(
                                                   mw_geoNwPdu(
                                                               mw_geoNwBeaconPacket(?)
                                                               mw_geoNwBeaconPacket
                                                               )
                                                   )) -> value v_msg {
            log("Receive beacon packet: ", v_msg.msgIn);