Commit 3e69ac00 authored by YannGarcia's avatar YannGarcia
Browse files

Update module.mk

parent 0aafb7a3
Loading
Loading
Loading
Loading
+2 −108
Original line number Diff line number Diff line
@@ -4182,113 +4182,7 @@ module ItsPki_TestCases {
        
      } // End of group f_TC_SECPKI_ITSS_CTL_05_BV
      
      group f_TC_SECPKI_ITSS_CTL_xx { // FIXME Issue while trying to use CAM Template & EncDec functions because of CAM Test imported, need CAM port and UpperTester_CAM Port which are not part of the PKI Test Interface. Need to separate them. See ETSI TTF 011
        /*group cam_templates { // FIXME Issue while trying to use CAM Template & EncDec functions because of CAM Test imported, need CAM port and UpperTester_CAM Port which are not part of the PKI Test Interface. Need to separate them. See ETSI TTF 011
          
          function f_integer2Latitude(in integer p_latitude) return Latitude {
            var Latitude v_latitude := f_abs(p_latitude);
            return v_latitude;
          }
          function f_integer2Longitude(in integer p_longitude) return Longitude {
            var Longitude v_longitude := f_abs(p_longitude);
            return v_longitude;
          }
          template (value) ReferencePosition m_tsPosition := {
            latitude := f_integer2Latitude(f_getTsLatitude()),
            longitude := f_integer2Longitude(f_getTsLongitude()),
            positionConfidenceEllipse := {
              semiMajorConfidence   := LibItsCommon_ASN1_NamedNumbers.SemiAxisLength_oneCentimeter_,
              semiMinorConfidence   := LibItsCommon_ASN1_NamedNumbers.SemiAxisLength_oneCentimeter_,
              semiMajorOrientation  := LibItsCommon_ASN1_NamedNumbers.HeadingValue_wgs84North_
            },
            altitude := {
              altitudeValue := LibItsCommon_ASN1_NamedNumbers.AltitudeValue_referenceEllipsoidSurface_,
              altitudeConfidence := unavailable
            }
          }
          template (value) CAM m_camMsg_vehicle_HF_BV(
                                                      StationID p_stationId,
                                                      GenerationDeltaTime p_generationTime,
                                                      template (value) ReferencePosition p_referencePosition
                                                      ) := {
            header := {
              protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
              messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_cam_,
              stationID := p_stationId
            },
            cam := {
              generationDeltaTime := p_generationTime,
                camParameters := {
                basicContainer := {
                  stationType := LibItsCommon_ASN1_NamedNumbers.StationType_passengerCar_,
                  referencePosition := p_referencePosition
                },
                highFrequencyContainer := {
                  basicVehicleContainerHighFrequency := {
                    heading := {
                      headingValue := LibItsCommon_ASN1_NamedNumbers.HeadingValue_wgs84North_, //0
                      headingConfidence := 10
                    },
                    speed := {
                      speedValue := 45,
                      speedConfidence := 5
                    },
                    driveDirection := forward,
                    vehicleLength := {
                     vehicleLengthValue := 50,
                     vehicleLengthConfidenceIndication := noTrailerPresent
                    },
                    vehicleWidth := 21,
                    longitudinalAcceleration := {
                      longitudinalAccelerationValue := LibItsCommon_ASN1_NamedNumbers.LongitudinalAccelerationValue_unavailable_,
                      longitudinalAccelerationConfidence := LibItsCommon_ASN1_NamedNumbers.AccelerationConfidence_unavailable_
                    },
                    curvature := {
                      curvatureValue := LibItsCommon_ASN1_NamedNumbers.CurvatureValue_straight_,
                      curvatureConfidence := unavailable
                    },
                    curvatureCalculationMode := yawRateUsed,
                    yawRate := {
                      yawRateValue := LibItsCommon_ASN1_NamedNumbers.YawRateValue_straight_,
                      yawRateConfidence := unavailable
                    },
                    accelerationControl := omit,
                    lanePosition := omit,
                    steeringWheelAngle := omit,
                    lateralAcceleration := omit,
                    verticalAcceleration := omit, 
                    performanceClass := omit,
                    cenDsrcTollingZone := omit
                  }
                },
                lowFrequencyContainer := omit,
                specialVehicleContainer := omit
              }
            }
          } // End of template m_camMsg_vehicle_HF_BV
        
          template (value) CAM m_camMsg_vehicle(
                                                StationID p_stationId,
                                                GenerationDeltaTime p_generationTime,
                                                template (value) ReferencePosition p_referencePosition
                                                ) modifies m_camMsg_vehicle_HF_BV := {
            cam := {
              camParameters := {
                lowFrequencyContainer := {
                  basicVehicleContainerLowFrequency := {
                    vehicleRole := default_,
                    exteriorLights := LibItsCommon_ASN1_NamedNumbers.ExteriorLights_daytimeRunningLightsOn_,
                    pathHistory := {}
                  }
                }
              }
            }
          } // End of template m_camMsg_vehicle
          
        }*/ // End of group cam_templates
      group f_TC_SECPKI_ITSS_CTL_xx {
        
        function f_sendSecuredCam(in charstring p_certificate_id) runs on ItsPkiItss return GeoNetworkingPdu {
          // Local variables
@@ -4304,7 +4198,7 @@ module ItsPki_TestCases {
                                     in charstring p_configId,
                                     in HeaderInfo p_headerInfo,
                                     in SignerIdentifier p_signerIdentifier,
                                     in template (value) StationID p_station_id := f_getTsStationId()
                                     in template (value) StationId p_station_id := f_getTsStationId()
        ) runs on ItsPkiItss return GeoNetworkingPdu {
            // Local variables
            var GnNonSecuredPacket v_gnNonSecuredPacket;
Compare 021805f1 to ace77678
Original line number Diff line number Diff line
Subproject commit 021805f17253f5b0baf80b13bca8151a05342655
Subproject commit ace776783be6ef49438d798d59e7346822df3b60
+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ sources := ItsPki_Pixits.ttcn \
modules :=  lib \
            lib_system \
            /titan-test-system-framework/ttcn/LibHelpers \
            /titan-test-system-framework/ttcn/LibSecurity \
            ../../titan-test-system-framework/ttcn/LibSecurity \
            ../../titan-test-system-framework/ttcn/LibXsd \
            ../../titan-test-system-framework/ttcn/LibHttp \
            ../LibCommon \
            ../LibIts  \