Commit e7cec1b9 authored by YannGarcia's avatar YannGarcia
Browse files

Build AtsDENM Release.2

parent 0de1a125
Loading
Loading
Loading
Loading
+10 −10
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ module ItsDenm_TestCases {
          } // end TC_DEN_EVGN_BV_01
          } // end TC_DEN_EVGN_BV_01
          
          
          /**
          /**
           * @desc    Check that a new ActionID value is assigned for each newly generated DENM
           * @desc    Check that a new ActionId value is assigned for each newly generated DENM
           * <pre>        
           * <pre>        
           * PICS Selection: PICS_DENM_GENERATION
           * PICS Selection: PICS_DENM_GENERATION
           * Initial conditions:
           * Initial conditions:
@@ -153,7 +153,7 @@ module ItsDenm_TestCases {
          } // end TC_DEN_EVGN_BV_02
          } // end TC_DEN_EVGN_BV_02
          
          
          /**
          /**
           * @desc    Check that a newly created ActionID contains the StationID of the originating ITS-S that detected the event
           * @desc    Check that a newly created ActionId contains the StationID of the originating ITS-S that detected the event
           * <pre>        
           * <pre>        
           * PICS Selection: PICS_DENM_GENERATION
           * PICS Selection: PICS_DENM_GENERATION
           * Initial conditions:
           * Initial conditions:
@@ -1388,7 +1388,7 @@ module ItsDenm_TestCases {
    group denMessageReception {
    group denMessageReception {
        
        
        /**
        /**
         * @desc    Check that receiving ITS-S transmits DENM to application if it concerns an unknown ActionID and if it is not a termination DENM
         * @desc    Check that receiving ITS-S transmits DENM to application if it concerns an unknown ActionId and if it is not a termination DENM
         *         
         *         
         * <pre>
         * <pre>
         * PICS Selection: PICS_DENM_RECEPTION
         * PICS Selection: PICS_DENM_RECEPTION
@@ -1424,8 +1424,8 @@ module ItsDenm_TestCases {
        } // end TC_DEN_MSRV_BV_01
        } // end TC_DEN_MSRV_BV_01
        
        
        /**
        /**
         * @desc    Check that receiving ITS-S transmits DENM to application if it concerns a known ActionID 
         * @desc    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
         *          and referenceTime is greater than highest value received for this ActionId
         * <pre>
         * <pre>
         * PICS Selection: PICS_DENM_RECEPTION
         * PICS Selection: PICS_DENM_RECEPTION
         * Initial conditions:
         * Initial conditions:
@@ -1465,7 +1465,7 @@ module ItsDenm_TestCases {
        } // end TC_DEN_MSRV_BV_02
        } // end TC_DEN_MSRV_BV_02
                
                
        /**
        /**
         * @desc    Check that receiving ITS-S discards termination DENM if it concerns an unknown ActionID (own actionID)
         * @desc    Check that receiving ITS-S discards termination DENM if it concerns an unknown ActionId (own actionID)
         * <pre>
         * <pre>
         * PICS Selection: PICS_DENM_RECEPTION 
         * PICS Selection: PICS_DENM_RECEPTION 
         * Initial conditions:
         * Initial conditions:
@@ -1500,7 +1500,7 @@ module ItsDenm_TestCases {
        } // end TC_DEN_MSRV_BO_03
        } // end TC_DEN_MSRV_BO_03
            
            
        /**
        /**
         * @desc    Check that receiving ITS-S discards termination DENM if it concerns an unknown ActionID (other actionID)
         * @desc    Check that receiving ITS-S discards termination DENM if it concerns an unknown ActionId (other actionID)
         * <pre>
         * <pre>
         * PICS Selection: PICS_DENM_RECEPTION 
         * PICS Selection: PICS_DENM_RECEPTION 
         * Initial conditions:
         * Initial conditions:
@@ -1534,7 +1534,7 @@ module ItsDenm_TestCases {
        } // end TC_DEN_MSRV_BO_04
        } // end TC_DEN_MSRV_BO_04
            
            
        /**
        /**
         * @desc    Check that receiving ITS-S discards DENM if referenceTime is lower than highest value received for this ActionID
         * @desc    Check that receiving ITS-S discards DENM if referenceTime is lower than highest value received for this ActionId
         * <pre>
         * <pre>
         * PICS Selection: PICS_DENM_RECEPTION
         * PICS Selection: PICS_DENM_RECEPTION
         * Initial conditions:
         * Initial conditions:
@@ -1574,7 +1574,7 @@ module ItsDenm_TestCases {
        } // end TC_DEN_MSRV_BO_05
        } // end TC_DEN_MSRV_BO_05
            
            
        /**
        /**
         * @desc    Check that receiving ITS-S discards DENM if detectionTime is smaller than highest value received for this ActionID
         * @desc    Check that receiving ITS-S discards DENM if detectionTime is smaller than highest value received for this ActionId
         *          
         *          
         * <pre>
         * <pre>
         * PICS Selection: PICS_DENM_RECEPTION
         * PICS Selection: PICS_DENM_RECEPTION
@@ -1619,7 +1619,7 @@ module ItsDenm_TestCases {
        } // end TC_DEN_MSRV_BO_06
        } // end TC_DEN_MSRV_BO_06
            
            
        /**
        /**
         * @desc    Check that receiving ITS-S transmits DENM to application if it concerns a known ActionID and referenceTime 
         * @desc    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
         *          is equal to highest received value and detectionTime is more recent
         * <pre>
         * <pre>
         * PICS Selection: PICS_DENM_RECEPTION
         * PICS Selection: PICS_DENM_RECEPTION
+69 −69

File changed.

Preview size limit exceeded, changes collapsed.

+43 −43
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ module LibItsDenm_Templates {
    import from LibHelpers_Functions all;
    import from LibHelpers_Functions all;


    // LibIts
    // LibIts
    import from ITS_Container language "ASN.1:1997" all;
    import from ETSI_ITS_CDD language "ASN.1:1997" all;
    import from DENM_PDU_Descriptions language "ASN.1:1997" all;
    import from DENM_PDU_Descriptions language "ASN.1:1997" all;
    
    
    // LibItsCommon
    // LibItsCommon
@@ -190,7 +190,7 @@ module LibItsDenm_Templates {
             * @param p_alacarte                    The Alacarte Container (Default: omit)
             * @param p_alacarte                    The Alacarte Container (Default: omit)
             */
             */
            template (value) UtDenmUpdate m_utUpdateEvent(
            template (value) UtDenmUpdate m_utUpdateEvent(
                template (value) ActionID p_actionId,
                template (value) ActionId p_actionId,
                template (omit) SituationContainer p_situation := omit,
                template (omit) SituationContainer p_situation := omit,
                template (omit) LocationContainer p_location := omit,
                template (omit) LocationContainer p_location := omit,
                template (omit) ValidityDuration p_validityDuration := omit,
                template (omit) ValidityDuration p_validityDuration := omit,
@@ -218,7 +218,7 @@ module LibItsDenm_Templates {
             * @param   p_actionId  The action id
             * @param   p_actionId  The action id
             */
             */
            template (value) UtDenmTermination m_utEventCancellation(
            template (value) UtDenmTermination m_utEventCancellation(
                template (value) ActionID p_actionId
                template (value) ActionId p_actionId
            ) := {
            ) := {
                actionId := p_actionId
                actionId := p_actionId
            }
            }
@@ -272,17 +272,17 @@ module LibItsDenm_Templates {
        /**
        /**
         * @desc    Receive template for DENM PDU
         * @desc    Receive template for DENM PDU
         * @param   p_denm              The expected DEN Message 
         * @param   p_denm              The expected DEN Message 
         * @param   p_stationID         The expected station id (Default: any)
         * @param   p_stationId         The expected station id (Default: any)
         * @param   p_protocolVersion   The expected protocol version (Default: current DEN protocol version)
         * @param   p_protocolVersion   The expected protocol version (Default: current DEN protocol version)
         * @param   p_messageID         The expected message id (Default: DEN message id)
         * @param   p_messageId         The expected message id (Default: DEN message id)
         */
         */
        template (present) DENM mw_denmPdu(
        template (present) DENM mw_denmPdu(
            template (present) DecentralizedEnvironmentalNotificationMessage p_denm,
            template (present) DecentralizedEnvironmentalNotificationMessage p_denm,
            template (present) StationID p_stationID := ?,
            template (present) StationId p_stationId := ?,
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
            template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_denm_
            template (present) ItsPduHeader.messageId p_messageId := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageId_denm_
        ) := {
        ) := {
            header := mw_itsPduHeader(p_stationID, p_protocolVersion, p_messageID),
            header := mw_itsPduHeader(p_stationId, p_protocolVersion, p_messageId),
            denm := p_denm
            denm := p_denm
        }
        }
        
        
@@ -292,40 +292,40 @@ module LibItsDenm_Templates {
        
        
        /**
        /**
         * @desc    Default send template for ITS PDU header
         * @desc    Default send template for ITS PDU header
         * @param   p_stationID         The source station ID (Default: test system station id)
         * @param   p_stationId         The source station ID (Default: test system station id)
         * @param   p_protocolVersion   The protocol version (Default: current DEN protocol version)
         * @param   p_protocolVersion   The protocol version (Default: current DEN protocol version)
         * @param   p_messageID         The message Id (Default: DEN message id)
         * @param   p_messageId         The message Id (Default: DEN message id)
         */
         */
        template (value) ItsPduHeader m_itsPduHeader(
        template (value) ItsPduHeader m_itsPduHeader(
            template (value) StationID p_stationID := f_getTsStationId(),
            template (value) StationId p_stationId := f_getTsStationId(),
            template (value) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
            template (value) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
            template (value) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_denm_
            template (value) ItsPduHeader.messageId p_messageId := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageId_denm_
        ) := {
        ) := {
            protocolVersion := p_protocolVersion,
            protocolVersion := p_protocolVersion,
            messageID := p_messageID,
            messageId := p_messageId,
            stationID := p_stationID
            stationId := p_stationId
        }
        }
        
        
        /**
        /**
         * @desc    Default receive template for ITS PDU header
         * @desc    Default receive template for ITS PDU header
         * @param   p_stationID         The expected station id (Default: any)
         * @param   p_stationId         The expected station id (Default: any)
         * @param   p_protocolVersion   The expected protocol version (Default: current DEN protocol version)
         * @param   p_protocolVersion   The expected protocol version (Default: current DEN protocol version)
         * @param   p_messageID         The expected message id (Default: DEN message id)
         * @param   p_messageId         The expected message id (Default: DEN message id)
         */
         */
        template (present) ItsPduHeader mw_itsPduHeader(
        template (present) ItsPduHeader mw_itsPduHeader(
            template (present) StationID p_stationID := ?,
            template (present) StationId p_stationId := ?,
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
            template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,
            template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_denm_
            template (present) ItsPduHeader.messageId p_messageId := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageId_denm_
        ) := {
        ) := {
            protocolVersion := p_protocolVersion,
            protocolVersion := p_protocolVersion,
            messageID := p_messageID,
            messageId := p_messageId,
            stationID := p_stationID
            stationId := p_stationId
        }
        }
        
        
        /**
        /**
         * @desc    Default receive template for the station id
         * @desc    Default receive template for the station id
         */
         */
        template (present) StationID mw_anyStationId := ?;
        template (present) StationId mw_anyStationId := ?;
        
        
    } // end headerTemplates
    } // end headerTemplates
    
    
@@ -446,7 +446,7 @@ module LibItsDenm_Templates {
         * @param   p_actionID  The action id
         * @param   p_actionID  The action id
         */
         */
        template (value) DecentralizedEnvironmentalNotificationMessage m_denmCancellation(
        template (value) DecentralizedEnvironmentalNotificationMessage m_denmCancellation(
            template (value) ActionID p_actionID,
            template (value) ActionId p_actionID,
            template (value) StationType p_stationType
            template (value) StationType p_stationType
        ) := {
        ) := {
            management := m_denmMgmtConTermination(p_actionID, p_stationType, 1, -, -, -, isCancellation), 
            management := m_denmMgmtConTermination(p_actionID, p_stationType, 1, -, -, -, isCancellation), 
@@ -469,7 +469,7 @@ module LibItsDenm_Templates {
         * @param   p_referenceTime         The reference time (Default: current time)
         * @param   p_referenceTime         The reference time (Default: current time)
         */
         */
        template (value) ManagementContainer m_denmMgmtCon(
        template (value) ManagementContainer m_denmMgmtCon(
            template (value) ActionID p_actionID,
            template (value) ActionId p_actionID,
            template (value) StationType p_stationType := f_getTsStationType(),
            template (value) StationType p_stationType := f_getTsStationType(),
            template (value) ValidityDuration p_validityDuration := defaultValidity,
            template (value) ValidityDuration p_validityDuration := defaultValidity,
            template (omit) TransmissionInterval p_transmissionInterval := omit,
            template (omit) TransmissionInterval p_transmissionInterval := omit,
@@ -499,7 +499,7 @@ module LibItsDenm_Templates {
         * @param   p_referenceTime         The reference time (Default: current time)
         * @param   p_referenceTime         The reference time (Default: current time)
         */
         */
        template (omit) ManagementContainer m_denmMgmtConTermination (
        template (omit) ManagementContainer m_denmMgmtConTermination (
            template (value) ActionID p_actionID,
            template (value) ActionId p_actionID,
            template (value) StationType p_stationType := f_getTsStationType(),
            template (value) StationType p_stationType := f_getTsStationType(),
            template (value) ValidityDuration p_validityDuration := defaultValidity,
            template (value) ValidityDuration p_validityDuration := defaultValidity,
            template (omit) TransmissionInterval p_transmissionInterval := omit,            
            template (omit) TransmissionInterval p_transmissionInterval := omit,            
@@ -521,7 +521,7 @@ module LibItsDenm_Templates {
         * @param   p_referenceTime         The reference time (Default: current time)
         * @param   p_referenceTime         The reference time (Default: current time)
         */
         */
        template ManagementContainer mw_denmMgmtConTermination (
        template ManagementContainer mw_denmMgmtConTermination (
            template (present) ActionID p_actionID,
            template (present) ActionId p_actionID,
            template (present) StationType p_stationType := f_getIutStationType(),
            template (present) StationType p_stationType := f_getIutStationType(),
            template (present) TimestampIts p_referenceTime := ?,
            template (present) TimestampIts p_referenceTime := ?,
            template ValidityDuration p_validityDuration := *, // In ASN.1, a DEFAULT value constraint could be replaced by an omit
            template ValidityDuration p_validityDuration := *, // In ASN.1, a DEFAULT value constraint could be replaced by an omit
@@ -540,7 +540,7 @@ module LibItsDenm_Templates {
         * @param   p_transmissionInterval  The expected transmission interval (Default: any or omit)
         * @param   p_transmissionInterval  The expected transmission interval (Default: any or omit)
         */
         */
        template ManagementContainer mw_denmMgmtCon(
        template ManagementContainer mw_denmMgmtCon(
            template (present) ActionID p_actionID,
            template (present) ActionId p_actionID,
            template (present) StationType p_stationType := f_getIutStationType(),
            template (present) StationType p_stationType := f_getIutStationType(),
            template (present) TimestampIts p_referenceTime := ?,
            template (present) TimestampIts p_referenceTime := ?,
            template ValidityDuration p_validityDuration := *, // In ASN.1, a DEFAULT value constraint could be replaced by an omit
            template ValidityDuration p_validityDuration := *, // In ASN.1, a DEFAULT value constraint could be replaced by an omit
@@ -560,13 +560,13 @@ module LibItsDenm_Templates {
        }
        }
        
        
        /**
        /**
         * @desc    Send template for Test system ActionID
         * @desc    Send template for Test system ActionId
         * @param   p_sequenceNumber    The sequence number (Default: 0)
         * @param   p_sequenceNumber    The sequence number (Default: 0)
         */
         */
        template (value) ActionID m_tsActionId(
        template (value) ActionId m_tsActionId(
            template (value) SequenceNumber p_sequenceNumber := 0
            template (value) SequenceNumber p_sequenceNumber := 0
        ) := {
        ) := {
            originatingStationID := f_getTsStationId(),
            originatingStationId := f_getTsStationId(),
            sequenceNumber := p_sequenceNumber
            sequenceNumber := p_sequenceNumber
        }
        }
        
        
@@ -590,8 +590,8 @@ module LibItsDenm_Templates {
         * @desc    Receive template for Management Container with the given action id
         * @desc    Receive template for Management Container with the given action id
         * @param   p_actionId  The expected action id (Default: any)
         * @param   p_actionId  The expected action id (Default: any)
         */
         */
        template (present) ManagementContainer mw_denmMgmtConWithActionID(
        template (present) ManagementContainer mw_denmMgmtConWithActionId(
            template (present) ActionID p_actionId := ?
            template (present) ActionId p_actionId := ?
        ) modifies mw_anyDenmMgmtCon := {
        ) modifies mw_anyDenmMgmtCon := {
            actionID := p_actionId
            actionID := p_actionId
        }
        }
@@ -607,35 +607,35 @@ module LibItsDenm_Templates {
        }
        }
        
        
        /**
        /**
         * @desc    Send template for ActionID
         * @desc    Send template for ActionId
         * @param   p_sequenceNumber        The sequence number
         * @param   p_sequenceNumber        The sequence number
         * @param   p_originatorStationID   The originator station id (Default: IUT's station id)
         * @param   p_originatorStationId   The originator station id (Default: IUT's station id)
         */
         */
        template (value) ActionID m_actionId(
        template (value) ActionId m_actionId(
            template (value) SequenceNumber p_sequenceNumber,
            template (value) SequenceNumber p_sequenceNumber,
            template (value) ITS_Container.StationID p_originatorStationID := f_getIutStationId()
            template (value) ETSI_ITS_CDD.StationId p_originatorStationId := f_getIutStationId()
        ) := {
        ) := {
            originatingStationID := p_originatorStationID,
            originatingStationId := p_originatorStationId,
            sequenceNumber := p_sequenceNumber
            sequenceNumber := p_sequenceNumber
        }
        }
        
        
        /**
        /**
         * @desc    Receive template for ActionID
         * @desc    Receive template for ActionId
         * @param   p_originatorStationID   The expected originator station id (Default: any)
         * @param   p_originatorStationId   The expected originator station id (Default: any)
         * @param   p_sequenceNumber        The expected sequence number (Default: any)
         * @param   p_sequenceNumber        The expected sequence number (Default: any)
         */
         */
        template (present) ActionID mw_actionId(
        template (present) ActionId mw_actionId(
            template (present) ITS_Container.StationID p_originatorStationID := ?,
            template (present) ETSI_ITS_CDD.StationId p_originatorStationId := ?,
            template (present) SequenceNumber p_sequenceNumber := ?
            template (present) SequenceNumber p_sequenceNumber := ?
        ) := {
        ) := {
            originatingStationID := p_originatorStationID,
            originatingStationId := p_originatorStationId,
            sequenceNumber := p_sequenceNumber
            sequenceNumber := p_sequenceNumber
        }
        }
        
        
        /**
        /**
         * @desc    Default receive template for any ActionID
         * @desc    Default receive template for any ActionId
         */
         */
        template (present) ActionID mw_anyActionId := ?;
        template (present) ActionId mw_anyActionId := ?;
        
        
    } // end group decentralizedManagementTemplates
    } // end group decentralizedManagementTemplates
    
    
+7 −12
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ module LibItsDenm_TypesAndValues {


  // LibIts
  // LibIts
  import from DENM_PDU_Descriptions language "ASN.1:1997" all;
  import from DENM_PDU_Descriptions language "ASN.1:1997" all;
  import from ITS_Container language "ASN.1:1997" all;
  import from ETSI_ITS_CDD language "ASN.1:1997" all;
    
    
  group actionTypes {
  group actionTypes {
        
        
@@ -34,11 +34,6 @@ module LibItsDenm_TypesAndValues {
     */
     */
    type record of SituationContainer SituationContainerList;
    type record of SituationContainer SituationContainerList;
        
        
    /**
     * @desc List of ActionIDs used in behaviours 
     */
    type record of ActionID ActionIDList;
        
  }
  }
    
    
  group denmConstants {
  group denmConstants {
@@ -115,7 +110,7 @@ module LibItsDenm_TypesAndValues {
     */
     */
    type record UtDenmTriggerResult {
    type record UtDenmTriggerResult {
      boolean result,
      boolean result,
      ActionID actionId
      ActionId actionId
    } with {
    } with {
      variant "FIELDORDER(msb)"
      variant "FIELDORDER(msb)"
    }
    }
@@ -124,7 +119,7 @@ module LibItsDenm_TypesAndValues {
     * @desc Upper Tester message to update an event at IUT 
     * @desc Upper Tester message to update an event at IUT 
     */
     */
    type record UtDenmUpdate {
    type record UtDenmUpdate {
      ActionID actionId,
      ActionId actionId,
      TimestampIts detectionTime,
      TimestampIts detectionTime,
      ValidityDuration validityDuration optional,
      ValidityDuration validityDuration optional,
      SituationContainer situation optional,
      SituationContainer situation optional,
@@ -143,7 +138,7 @@ module LibItsDenm_TypesAndValues {
     */
     */
    type record UtDenmUpdateResult { 
    type record UtDenmUpdateResult { 
      boolean result,
      boolean result,
      ActionID actionId
      ActionId actionId
    } with {
    } with {
      variant "FIELDORDER(msb)"
      variant "FIELDORDER(msb)"
    }
    }
@@ -152,7 +147,7 @@ module LibItsDenm_TypesAndValues {
     * @desc Upper Tester message to request the termination of an event at IUT 
     * @desc Upper Tester message to request the termination of an event at IUT 
     */
     */
    type record UtDenmTermination {
    type record UtDenmTermination {
      ActionID actionId
      ActionId actionId
    } with {
    } with {
      variant "FIELDORDER(msb)"
      variant "FIELDORDER(msb)"
    }
    }
@@ -192,9 +187,9 @@ module LibItsDenm_TypesAndValues {
    type record of UtDenmEventInd UtDenmEventIndList;
    type record of UtDenmEventInd UtDenmEventIndList;
        
        
    /**
    /**
     * @desc List of ActionID received in response to the Upper Tester triggered messages
     * @desc List of ActionId received in response to the Upper Tester triggered messages
     */
     */
    type record of ActionID UtDenmActionIDList;
    type record of ActionId UtDenmActionIdList;
        
        
  }
  }
  with {
  with {
Compare 5b946972 to 88054887
Original line number Original line Diff line number Diff line
Subproject commit 5b946972208836fde697755c91aa76400875c147
Subproject commit 880548876351e51535d7d9b3ff3eb12de61387a2
Loading