Commit 312dc93b authored by garciay's avatar garciay
Browse files

Update AtsPki

Add support of UtGnTrigger in AtsRSUsSimulator test suite
parent 780f1227
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ module ItsPki_Functions {
                                     in template (value) HeaderInfo p_headerInfo,
                                     in SignerIdentifier p_signerIdentifier,
                                     in boolean p_addMissingHeaders := true
    ) runs on ItsGeoNetworking return GeoNetworkingPdu {
    ) runs on ItsGeoNetworking {
        // Local variables
        var GnNonSecuredPacket v_gnNonSecuredPacket;
        var GeoNetworkingPdu v_securedGnPdu;
@@ -112,7 +112,7 @@ module ItsPki_Functions {
                                 in SignerIdentifier p_signerIdentifierType,
                                 in charstring p_certificateName := ""/*,
                                 in boolean p_addMissingHeaders := true*/
    ) runs on ItsSecurityBaseComponent return boolean {
    ) runs on ItsGeoNetworking return boolean {
        // Local variables
        var EtsiTs103097Certificate v_aaCertificate, v_atCertificate;
         
+18 −18
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ module ItsPki_TestCases {
    import from ItsPki_Functions all;
    import from ItsPki_TestSystem all;
    
        testcase TC_SEC_PKI_SND_EA_01_BV() runs on ItsSecurityBaseComponent system ItsPkiSystem {
        testcase TC_SEC_PKI_SND_EA_01_BV() runs on ItsGeoNetworking system ItsPkiSystem {
                
            // Local variables
            var LongPosVector v_longPosVectorIut;
@@ -90,7 +90,7 @@ module ItsPki_TestCases {
            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
            
            // Test Body
            v_securedGnPdu := f_sendEnrollmentRequest(
            f_sendEnrollmentRequest(
                                    m_innerEcRequest(
                                                     "TODO",
                                                     m_publicKeys(
+30 −3
Original line number Diff line number Diff line
@@ -883,12 +883,38 @@ module ItsRSUsSimulator_Functions {
    
    altstep a_process_cf_ut_command() runs on ItsRSUsSimulator {
      var UtGnInitialize v_utGnInitialize;
      var UtGnTrigger v_utGnTrigger;
      
        [] cfPort.receive(UtGnInitialize:?) -> value v_utGnInitialize {
          log("v_utGnInitialize = ", v_utGnInitialize);
          cfPort.send(UtGnResults: { utGnInitializeResult := true } );
          repeat;
        }
        [] cfPort.receive(UtGnTrigger:?) -> value v_utGnTrigger {
          log("v_utGnTrigger = ", v_utGnTrigger);
          if (ischosen(v_utGnTrigger.geoUnicast)) {
            var GnNonSecuredPacket v_geoNwUnicastPacket := valueof(
                                                                   m_geoNwUnicastPacket_with_payload(
                                                                                                     vc_longPosVectorRsu,
                                                                                                     f_getIutShortPosVector(),
                                                                                                     f_incLocalSeqNumber(),
                                                                                                     c_defaultHopLimit,
                                                                                                     v_utGnTrigger.geoUnicast.trafficClass,
                                                                                                     v_utGnTrigger.geoUnicast.payload
                                                                                                    ));
            var GeoNetworkingPdu v_geoNwPdu := valueof(
                                                       m_geoNwPdu(
                                                                  v_geoNwUnicastPacket,
                                                                  v_utGnTrigger.geoUnicast.lifetime,
                                                                  c_defaultHopLimit
                                                                 )
                                                      );
            // FIXME Check what to do with GN_Address v_geoNwPdu.gnPacket.packet.extendedHeader.geoUnicastHeader. := v_utGnTrigger.geoUnicast.gnAddress;
            geoNetworkingPort.send(m_geoNwReq_linkLayerBroadcast(v_geoNwPdu));
          }
          cfPort.send(UtGnResults: { utGnTriggerResult := true } );
          repeat;
        }
        [vc_cam == true] cfPort.receive(UtCamInitialize:?) {
          cfPort.send(UtCamResults: { utCamInitializeResult := true } );
          repeat;
@@ -902,9 +928,10 @@ module ItsRSUsSimulator_Functions {
          cfPort.send(UtDenmResults: { utDenmInitializeResult := true } );
          repeat;
        }
        /* [PICS_GENERATE_DENM == true] utPort.receive(UtDenmInitialize:?) { */
        /*     utPort.send(UtDenmResults: { utDenmInitializeResult := true }); */
        /* } */
        [vc_denm == true] utPort.receive(UtDenmInitialize:?) {
          utPort.send(UtDenmResults: { utDenmInitializeResult := true });
          repeat;
        }
        [] cfPort.receive {
          // Ignore it
          log("*** " & testcasename() & ": INFO: Unexpected CF message received ***");
+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ module ItsRSUsSimulator_TestSystem {
      out 
      CfInitialize, CfResult, UtGnResults, UtCamResults, UtDenmResults;
      in 
      CfEvent, CfEventInd, UtGnInitialize, UtCamInitialize, UtDenmInitialize, UtCamTrigger
      CfEvent, CfEventInd, UtGnInitialize, UtCamInitialize, UtDenmInitialize, UtGnTrigger, UtCamTrigger
      } // End of ConfigRsuSimulatorPort
        
  } // End of group configRsuSimulatorPort