Merge branch 'release2' into TTF_T05x

    file: '/gitlab-ci/base.yml'

variables:

  ASN1_SRC: 'SAEM-PDU-Descriptions.asn cdd/ETSI-ITS-CDD.asn'

  ASN1_SRC: '*.asn cdd/ETSI-ITS-CDD.asn'

validate:

  extends: .validate

@@ -6,9 +6,13 @@

 IMPORTS

+ServicesAndUseCasesInfoContainer FROM SAEM-InfoContainer {

+    itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts104091 (104091) infoContainer (1) major-version-2 (2) minor-version-1 (1)

+}

+/*

 -- ISO 21218

 I-Param FROM ITSllsap {iso(1) standard(0) calm-ll-sap(21218) asnm-1 (1) version2 (2)}

-

+*/

 -- ISO 17419

 VarLengthNumber FROM CITSdataDictionary1 {iso(1) standard(0) cits-applMgmt (17419) dataDictionary (1) version1 (1)}

@@ -84,11 +88,11 @@

 	hundredPercent	(200),

 	unknown	(201)

 	}(0..255) -- values larger than 201 are prohibited

-

+/*

 RXcip::=SEQUENCE OF I-Param

 TXcip::=SEQUENCE OF I-Param -- may optionally be forwarded to peer ITS station

-

+*/

 -- SAM header extension elements

@@ -131,7 +135,7 @@

 WsaCountThresholdInterval ::= INTEGER (0..255) -- value 0 is not used

-SAMapplicationData ::= OCTET STRING 

+SAMapplicationData ::= OCTET STRING (CONTAINING ServicesAndUseCasesInfoContainer) 

 --ChannelInfo extension elements

 EdcaParameterSet ::= SEQUENCE{

# ASN.1 module for Services Announcement specification (SA) Rel.2 [ETSI EN 104 091]

These modules is a part of delivery **[ETSI TS 104 091 v2.1.1](https://www.etsi.org/deliver/etsi_ts/104000_104099/104091//02.01.01_60/ts_104091v020101p.pdf) (2024-XX)**

These modules is a part of delivery **[ETSI TS 104 091 v2.1.1](https://www.etsi.org/deliver/etsi_ts/104000_104099/104091//02.01.01_60/ts_104091v020101p.pdf) (2026-XX)**

This module is a successor of _SAEM-PDU-Descriptions_ module from **[ETSI TS 302 890-1 v1.2.1](https://forge.etsi.org/rep/ITS/asn1/saem_en302890_1)**

SAEM-ExternalModule

DEFINITIONS AUTOMATIC TAGS ::= BEGIN

IMPORTS INFO,Id FROM 

SAEM-InfoContainer {

    itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts104091 (104091) infoContainer (1) major-version-2 (2) minor-version-1 (1)

} WITH SUCCESSORS;

/**

 * This value assignement represent the identification of the organization that defines the services and use cases

*/

basedOid OBJECT IDENTIFIER ::= {iso (1) identified-organization(3)}

/**

 * These value assignements represent specific values of the information object identifier. 

*/

-- no assignements 

/**

 * This information object set represents the set of information objects each composed of the association between the information identifier and the optional information content.

*/

UseCaseInfoSet INFO ::= {

   ...

   }

END

SAEM-InfoContainer {itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts104091 (104091) infoContainer (1) major-version-2 (2) minor-version-1 (1)}

DEFINITIONS AUTOMATIC TAGS ::= BEGIN

IMPORTS

UseCaseInfoSet, basedOid 

FROM SAEM-ExternalModule;

/**

 * This type represents the identifier of the information object relative to the component @ref ServicesAndUseCasesInfoContainer .baseOid. 

 *

*/

Id::= RELATIVE-OID

/**

 * This information object class is an abstract template to instantiate types that carry information.

 *

 * It shall include the following components: 

 *

 * @field &id: the identifier of the information.

 *

 * @field &Info: the information content.

 *

*/

INFO ::= CLASS {

   &id   Id,

   &Info

} WITH SYNTAX {&Info IDENTIFIED BY &id}

/**

 * This type represents a single information about an ITS service and one of its use cases, including mandatorily its identifier, based on the UseCaseInfoSet set.

 *

 * It shall include the following components: 

 *

 * @field suId: the identifier of the service and use case

 *

 * @field suContent: the optional announcement information content for the service and use case identified by @suId.

 *

*/

ServiceAndUseCaseInfo ::= SEQUENCE {

   suId        INFO.&id({UseCaseInfoSet}),

   suContent   INFO.&Info({UseCaseInfoSet}{@.suId}) OPTIONAL

}

/**

 * This DF represents a list of ServiceAndUseCaseInfo types, each including their identifier. 

*/

ServicesAndUseCasesInfo::= SEQUENCE (SIZE(1..32,...)) OF ServiceAndUseCaseInfo

/** 

 * This type represents a container that provides information about the provided ITS services and their use cases.

 *

 * It shall include the following components: 

 *

 * @field baseOid: the OID that serves as base Oid for the type @ref Id .

 *

 * @field suList: the information about ITS services and their use cases.

*/

ServicesAndUseCasesInfoContainer::= SEQUENCE{

   baseOid   OBJECT IDENTIFIER (basedOid),

   suList    ServicesAndUseCasesInfo,

   ...

}

END