diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index a81af586c6405b4e32866ca8fde05a867d9a97a6..884b0332e12ff57a3ef06f72da4cdfeca6ba77f6 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -5,7 +5,7 @@ module _3gpp-common-filemanagement { import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-common-yang-types { prefix yang3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } @@ -15,12 +15,13 @@ module _3gpp-common-filemanagement { Class (IOC) that is part of the Generic Network Resource Model (NRM)."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + revision 2023-02-14 { reference CR-0234; } revision 2022-10-24 { reference CR-0196; } revision 2022-02-10 { reference "Initial revision, S5-221757"; } grouping FileDownloadProcessMonitor { description "Provides specialisations of the ProcessMonitor datatype."; - uses yang3gpp:ProcessMonitor { + uses types3gpp:ProcessMonitorGrp { refine resultStateInfo { description "If status is FAILED resultStateInfo will be one of the following or empty."; diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index c0b2d99aa9220dad887250f7f6e7b71795322ee2..b9cb823c27f1b15c683671ff13f82dec9de153db 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -29,6 +29,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2023-02-14 { reference "CR-0234"; } revision 2022-09-30 { reference "CR-0191"; } revision 2021-01-16 { reference "CR-0120"; } revision 2020-08-06 { reference "CR-0102"; } @@ -162,7 +163,6 @@ module _3gpp-common-managed-element { and/or service to the subscriber."; uses ManagedElement_Grp; - uses meas3gpp:SupportedPerfMetricGroupGrp; leaf vendorName { config false; @@ -183,6 +183,22 @@ module _3gpp-common-managed-element { type uint32; mandatory true; } + + uses meas3gpp:SupportedPerfMetricGroupGrp; + + leaf-list supportedTraceMetrics { + type string; + config false; + description "List of trace metrics. When this attribute is contained in + a managed object it defines the trace metrics supported for this + object and all descendant objects. + + Trace metrics include trace messages, MDT measurements + (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, + see TS 32.422. Trace metrics are identified with their metric + identifier. The metric identifier is constructed as defined + in clause 10 of TS 32.422."; + } } list ManagedElement { diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index 639325de43ad7f1c36c9226222ff463402d06192..6d22a70500d71cd79efe409e070c273ea732d6f3 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -22,6 +22,8 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + + revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-02 { reference "CR-0753"; } revision 2022-10-24 { reference CR-0196; } revision 2022-01-07 { reference "CR-0146"; } @@ -48,8 +50,8 @@ module _3gpp-common-managed-function { description "The TraceSubtree shall be contained under ManagedFunction"; } - grouping Operation { - description "This data type represents an Operation."; + grouping OperationGrp { + description "This data type represents an operation."; reference "3gpp TS 28.622"; leaf name { @@ -101,13 +103,13 @@ module _3gpp-common-managed-function { min-elements 1; max-elements 1; description "The service access point of the managed NF service instance"; - uses types3gpp:SAP; + uses types3gpp:SAPGrp; } list operations { key name; min-elements 1; - uses Operation ; + uses OperationGrp ; description "Set of operations supported by the managed NF service instance"; } @@ -309,7 +311,22 @@ module _3gpp-common-managed-function { mandatory true; type uint32; } + uses meas3gpp:SupportedPerfMetricGroupGrp; + + leaf-list supportedTraceMetrics { + type string; + config false; + description "List of trace metrics. When this attribute is contained in + a managed object it defines the trace metrics supported for this + object and all descendant objects. + + Trace metrics include trace messages, MDT measurements + (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, + see TS 32.422. Trace metrics are identified with their metric + identifier. The metric identifier is constructed as defined + in clause 10 of TS 32.422."; + } } grouping ManagedFunctionContainedClasses { diff --git a/yang-models/_3gpp-common-management-node.yang b/yang-models/_3gpp-common-management-node.yang new file mode 100644 index 0000000000000000000000000000000000000000..7cfcdd5775d4a3f2c8f80a98f8ea85127551dbe8 --- /dev/null +++ b/yang-models/_3gpp-common-management-node.yang @@ -0,0 +1,90 @@ +module _3gpp-common-management-node { + yang-version 1.1; + namespace urn:3gpp:sa5:_3gpp-common-management-node; + prefix "mmgmtnode3gpp"; + + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-yang-types { prefix types3gpp ; } + import _3gpp-common-subnetwork { prefix subnet3gpp ; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + + description "Defines ManagementNode IOCs"; + reference "3GPP TS 28.623 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Solution Set (SS) definitions + + 3GPP TS 28.622 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Information Service (IS) + + 3GPP TS 28.620 + Umbrella Information Model (UIM)"; + + revision 2023-02-14 { reference "CR-0234"; } + + grouping ManagementSystem_Grp { + description "Represents the ManagementSystem_ IOC."; + + leaf userLabel { + type string; + description "A user-friendly (and user assignable) name of this object."; + } + + leaf-list managedElements { + type types3gpp:DistinguishedName; + config false; + description "Contains a list of the DN(s) of the related subclasses of + ManagedElement_ instance(s)."; + } + } + + grouping ManagementNodeGrp { + uses ManagementSystem_Grp; + + leaf vendorName { + type string; + config false; + } + + leaf userDefinedState { + type string; + description "An operator defined state for operator specific usage"; + } + + leaf locationName { + type string; + config false; + description "The physical location of this entity (e.g. an address)."; + } + + leaf swVersion { + type string; + config false; + } + } + + augment /subnet3gpp:SubNetwork { + list ManagementNode { + description "Represents a telecommunications management system (EM) within + the TMN that contains functionality for managing a number of + ManagedElements (MEs). The management system communicates with the MEs + directly or indirectly over one or more interfaces for the purpose + of monitoring and/or controlling these MEs. + + This class has similar characteristics as the ManagedElement. The + main difference between these two classes is that the ManagementNode + has a special association to the managed elements that it is + responsible for managing."; + + key id; + uses top3gpp:Top_Grp; + container attributes { + uses ManagementNodeGrp; + } + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index cc5647cf059d926f53453644ca93ec5c792c9afc..bb624b9e2bdc0703f6e7917211174649b40ae9e1 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -5,6 +5,7 @@ module _3gpp-common-managementdatacollection { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types {prefix types3gpp; } + import _3gpp-common-yang-extensions {prefix yext3gpp; } //import ietf-inet-types { prefix inet; } import ietf-yang-types { prefix yang; } import _3gpp-common-subnetwork { prefix subnet3gpp; } @@ -24,21 +25,133 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-04 { reference "CR-0194"; } - - - grouping Tai { - list plmnId { - description "PLMN Identity."; - min-elements 1; + + grouping GeoCoordinateGrp { + description "Geographical location on earth"; + + leaf latitude { + type decimal64 { + fraction-digits 4; + range -90..90 ; + } + mandatory true; + description "Latitude based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to the + northern hemisphere."; + } + + leaf longitude { + type decimal64 { + fraction-digits 4; + range -180..180 ; + } + mandatory true; + description "Longitude based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to + degrees east of 0 degrees longitude."; + } + } + + grouping GeoAreaGrp { + description "This data type defines a geographical area. + The geo-area is defined using a convex polygon in the attribute + 'convexGeoPolygon'."; + + list convexGeoPolygon { + description "Specifies the geographical area with a convex polygon. + The convex polygon is specified by its corners."; + key "latitude longitude"; + min-elements 3; + ordered-by user; + + uses GeoCoordinateGrp; + } + } + + grouping GeoAreaToCellMappingGrp { + description "Represents the GeoAreaToCellMapping data type. + + The mapping of the geographical area to cells is performed at + instantiation of the IOC."; + + list geoArea { + description "It specifies the geographical area using the cordinates of + the corners of a convex polygon."; + key idx; max-elements 1; - key "mcc mnc"; - uses types3gpp:PLMNId; + leaf idx { + type string; + } + uses GeoAreaGrp; } + + leaf associationThreshold { + type uint8 { + range 1..100; + } + yext3gpp:inVariant; + description "It specifies the threshold of coverage area in + percentage whether a cell belongs to the geographical area or not. - leaf tac { type types3gpp:Tac; } + If this attribute is absent, the location of the base station + antenna determines whether a cell belongs to the geographical + area or not."; + } } + grouping AreaOfInterestGrp { + description "It specifies a location(s) from where the management data + shall be collected."; + + list geoAreaToCellMapping { + description "Contains a geographical area and an association threshold. + The geo-area is defined as a convex polygon using the attribute + 'geoArea'. + + The MnS producer shall map the geographical area to cells. There are + two evaluation criteria whether a cell belongs to a geographical area + or not. If attribute 'associationThreshold' is absent, the location + of the base station antenna determines the belonging. If attribute + 'associationThreshold' is configured, the coverage area is considered. + The attribute 'associationThreshold' determines the lower boundary of + the coverage ratio. For example, if the 'associationThreshold' is + configured to 60%, a cell shall be considered as included in the + geographical area if at least 60% of the coverage area of that + cell overlaps with the specified geographical area. + + The mapping of the geographical area to cells is performed at + instantiation of the IOC."; + key idx; + leaf idx { type string; } + uses GeoAreaToCellMappingGrp; + } + + list taiList { + description "Tracking Area Identity list"; + key idx; + min-elements 1; + max-elements 8; + leaf idx { type string; } + uses types3gpp:TaiGrp; + } + + leaf-list nrCellIdList { + type string; + description "List of NR cells identified by NG-RAN CGI"; + } + + leaf-list eutraCellIdList { + type string; + description "List of E-UTRAN cells identified by E-UTRAN-CGI"; + } + + leaf-list utraCellIdList { + type string; + description "List of UTRAN cells identified by UTRAN CGI"; + } + } grouping NodeFilterGrp { @@ -47,9 +160,7 @@ module _3gpp-common-managementdatacollection { leaf idx { type string; } - uses Tai; // (Maybe type: types3gpp:Tai,if we define Tai there.) - // mandatory false - min-elements 1; + uses AreaOfInterestGrp; description "It specifies a location(s) from where the management data shall be collected. It is defined in terms of TAI(s)."; } @@ -78,7 +189,6 @@ module _3gpp-common-managementdatacollection { leaf sst { type uint8; // TS 28.003 clause 28.4. - //mandatory false; description "It specifies the slice service type (SST) of which the slice subnet should be targeted. Please refer to 3GPP TS 23.501: 'System Architecture for the 5G System'"; diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 72c892906a0a6e7425aa709b631d1778e02161f9..6acb2ae0ba562f8ac22ad725d6832a7da48e336a 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -55,6 +55,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-04 { reference "CR-0212 CR-0194"; } revision 2022-10-24 { reference CR-0196; } revision 2022-09-30 { reference CR-0191; } @@ -158,7 +159,7 @@ module _3gpp-common-measurements { } grouping SupportedPerfMetricGroupGrp { - list SupportedPerfMetricGroup { + list SupportedPerfMetricGroups { config false; description "Captures a group of supported performance metrics and associated parameters related to their production and reporting. diff --git a/yang-models/_3gpp-common-mnsagent.yang b/yang-models/_3gpp-common-mnsagent.yang new file mode 100644 index 0000000000000000000000000000000000000000..e1e779d2ba609982a67061229991a322d1584066 --- /dev/null +++ b/yang-models/_3gpp-common-mnsagent.yang @@ -0,0 +1,91 @@ +module _3gpp-common-mnsagent { + yang-version 1.1; + namespace urn:3gpp:sa5:_3gpp-common-mnsagent; + prefix "magent3gpp"; + + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-yang-types { prefix types3gpp ; } + import _3gpp-common-managed-element { prefix me3gpp ; } + import _3gpp-common-subnetwork { prefix subnet3gpp ; } + import _3gpp-common-management-node { prefix mmgmtnode3gpp ; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + + description "Defines MnsAgent IOCs"; + reference "3GPP TS 28.623 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Solution Set (SS) definitions + + 3GPP TS 28.622 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Information Service (IS) + + 3GPP TS 28.620 + Umbrella Information Model (UIM)"; + + revision 2023-02-14 { reference "CR-0234"; } + + feature MnsAgentUnderManagedElement { + description "MnsAgent shall be contained under ManagedElement."; + } + + feature MnsAgentUnderSubNetwork { + description "MnsAgent shall be contained under SubNetwork."; + } + + feature MnsAgentUnderManagementNode { + description "MnsAgent shall be contained under ManagementNode."; + } + + grouping MnsAgentGrp { + description "Represents the MnsAgentGrp IOC."; + + leaf systemDN { + type types3gpp:DistinguishedName; + config false; + description "Distinguished Name (DN) of a IRPAgent or a MnSAgent."; + } + } + + grouping MnsAgentSubtree { + list MnsAgent { + description "The MnsAgent represents the MnS producers, incl. the + supporting hardware and software, available for a certain management + scope that is related to the object name-containing the MnS Agent. + The MnSAgent can be name-contained under an IOC as follows: + 1) ManagementNode; + 2) SubNetwork, if the SubNetwork does not contain a ManagementNode; + 3) ManagedElement, if it is the root element. + In case the MnsAgent is name-contained under a ManagementNode, the + management scope is the complete management scope of the + ManagementNode or a subset thereof. + In case the MnsAgent is name-contained under a SubNetwork, the + management scope is the complete SubNetwork or a subset thereof. + In case the MnsAgent is name-contained under a ManagedElement, the + management scope is the complete ManagedElement or a subset thereof."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MnsAgentGrp; + } + } + } + + augment /me3gpp:ManagedElement { + if-feature MnsAgentUnderManagedElement; + uses MnsAgentSubtree; + } + augment /subnet3gpp:SubNetwork { + if-feature MnsAgentUnderSubNetwork; + uses MnsAgentSubtree; + } + augment /subnet3gpp:SubNetwork/mmgmtnode3gpp:ManagementNode { + if-feature MnsAgentUnderManagementNode; + uses MnsAgentSubtree; + } +} + + \ No newline at end of file diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index e4336a99e438d860543a22b97a0beb0bc370a187..09be94e87111944d9fbaac458b8874090cc6eca7 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -13,6 +13,7 @@ module _3gpp-common-mnsregistry { Class (IOC) that is part of the Generic Network Resource Model (NRM)."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + revision 2023-02-14 { reference CR-0234; } revision 2021-11-23 { reference "S5-216090"; } revision 2021-10-18 { reference "S5-215263"; } revision 2021-08-29 { reference "Initial revision, S5-214388"; } @@ -56,15 +57,24 @@ module _3gpp-common-mnsregistry { } } + grouping MnsRegistryGrp { + description "Currently no own attributes defined."; + } + augment "/subnet3gpp:SubNetwork" { - list MNSRegistry { - description "Represents the MNSRegistry IOC. + list MnsRegistry { + description "This IOC is a container for MnsInfo IOC-s. It can be + contained only by SubNetwork IOC. A SubNetwork IOC can contain + only one instance of MnsRegistry. The IOC is instantiated by the system."; - uses top3gpp:Top_Grp; key id; max-elements 1; - - list MNSInfo { + uses top3gpp:Top_Grp; + container attributes { + uses MnsRegistryGrp; + } + + list MnsInfo { description "This IOC represents an available Management Service (MnS) and provides the data required to support its discovery. It is name-contained by MnsRegistry. @@ -84,10 +94,12 @@ module _3gpp-common-mnsregistry { defined as the set of managed object instances that can be accessed using the Management Service."; + key id; uses top3gpp:Top_Grp; - key "mnsType mnsVersion mnsAddress"; - uses MnsInfoGrp; + container attributes { + uses MnsInfoGrp; + } + } } } -} } \ No newline at end of file diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index 46663337a6a413db93d91ae3c56ebf382d4d3254..cab2127d0d000906458ffa918da6d1e58f79e080 100644 --- a/yang-models/_3gpp-common-qmcjob.yang +++ b/yang-models/_3gpp-common-qmcjob.yang @@ -8,6 +8,7 @@ module _3gpp-common-qmcjob { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-trace { prefix trace3gpp; } import ietf-inet-types { prefix inet; } organization "3GPP SA5"; @@ -25,6 +26,7 @@ module _3gpp-common-qmcjob { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-04 { reference "CR-0215"; } revision 2022-08-17 { reference "CR-0185"; } revision 2022-04-29 { reference "CR-0171"; } @@ -42,10 +44,16 @@ module _3gpp-common-qmcjob { } } - leaf areaScope { - type string; - description "Defines the area in terms of NR cells or Tracking Area - where the QMC shall take place."; + list areaScope { + key "idx"; + leaf idx { type uint32 ; } + description "It specifies the area where data shall be collected. + List of eNB/list of gNB/eNB/gNB for RLF or RCEF. + List of cells or Tracking Area for QMC. + Cell, TA, LA, RA are mutually exclusive."; + reference "Clause 5.10.2 of 3GPP TS 32.422"; + + uses trace3gpp:AreaScopeGrp; } leaf qoECollectionEntityAddress { @@ -88,6 +96,16 @@ module _3gpp-common-qmcjob { The QMC ID is generated by the management system or the operator."; } + leaf jobId { + type string; + description "The jobId attribute presents the job identifier of a + QMCJob instance. The jobId can be used to associate multiple QMCJob + instances. For example, it is possible to configure the same jobId + for multiple QMCJob instances required to produce the data + (e.g. Streaming services and MTSI reports) for a specific network + analysis."; + } + list sliceScope { description "Contains a list of S-NSSAIs (Single Network Slice Selection Assistance Information). A Network Slice end to end is identified by @@ -104,19 +122,26 @@ module _3gpp-common-qmcjob { mandatory true; } - leaf mDTAlignmentInformation { - type uint64; + list mDTAlignmentInformation { + key "idx"; + min-elements 1; + max-elements 1; description "This parameter indicates the MDT measurements with which alignment of QoE measurement is required. This parameter is optional and is valid for NR only."; + + leaf idx { type uint32 ; } + uses trace3gpp:TraceReferenceGrp ; } - leaf availableRANqoEMetrics { + + leaf-list availableRANqoEMetrics { type enumeration { enum appLayerBufferLevelList; enum playoutDelayForMedia; enum Startup; } + max-elements 2; description "This parameter indicates available RAN visible QoE metrics to the gNB. This parameter is optional and is valid for NR only."; } @@ -126,7 +151,78 @@ module _3gpp-common-qmcjob { grouping QMCJobSubTree { description "Helps with augmenting QMCJob into multple places."; list QMCJob { - description "Represents the QMCJob IOC."; + description "The QoE Measurement Collection provides capability for + collecting QoE information from: + - UEs which are in the specified area in case of Management Based + Activation or + - an individual UE in case of Signalling Based Activation. + The QoE Measurement Collection enables collection of application layer + measurements from the UE for specified end user service type. + The supported service types are: + - Streaming services, see TS 26.247 + - MTSI services, see TS 26.114 + - VR services, see TS 26.118 + A QMCJob instance represents the job for collecting QoE measurements + according to the job parameters. For details of the QoE measurement + collection configuration parameters see clause 5 of TS 28.405. + QMCJob instance can be name-contained by SubNetwork or ManagedElement. + A QMC Job is activated by creating a QMCJob object instance in the + producer. For details of Management Based Activation of QoE Measurement + Collection see clause 4.5 and for details of Signalling Based + Activation of QoE Measurement Collection see clause 4.6 of TS 28.405. + The attributes areaScope and pLMNTarget are only relevant when + Management Based Activation is used and the attribute qoETarget is + only relevant when Signalling Based Activation is used. All other + attributes are common for both Management Based Activation and + Signalling Based Activation. + + When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer + shall delete the corresponding QMCJob instance. + NOTE: If the reporting is ongoing, when a request to delete a QMCJob + is received, the reporting does not end. The QMCJob instance is deleted, + when the last reporting for the QMC Job expires. + + The jobId attribute presents the job identifier of a QMCJob instance. + jobId can be used to associate multiple QMCJob instances. For example, + it is possible to configure the same jobId value for multiple QMCJob + instances required to produce the data (e.g. Streaming services and + MTSI reports) for a specific network analysis. + The QoE Measurement Collection provides capability for collecting QoE + information from: + - UEs which are in the specified area in case of Management Based + Activation or + - an individual UE in case of Signalling Based Activation. + The QoE Measurement Collection enables collection of application layer + from the UE for specified end user service type. The supported service + types are: + - Streaming services, see TS 26.247. + - MTSI services, see TS 26.114. + - VR services, see TS 26.118. + A QMCJob instance represents the job for collecting QoE measurements + according to the job parameters. For details of the QoE measurement + collection configuration parameters see clause 5 of TS 28.405. A QMCJob + instance can be name-contained by SubNetwork or ManagedElement. + A QMC Job is activated by creating a QMCJob object instance in the + MnS producer. For details of Management Based Activation of QoE + Measurement Collection see clause 4.5 and for details of Signalling + Based Activation of QoE Measurement Collection see + clause 4.6 of TS 28.405. The attributes areaScope and pLMNTarget are + only relevant when Management Based Activation is used and the + attribute qoETarget is only relevant when Signalling Based Activation + is used. All other attributes are common for both Management Based + Activation and Signalling Based Activation. + + When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer + shall delete the corresponding QMCJob instance. + NOTE: If the reporting is ongoing, when a request to delete a QMCJob + instance is received, the reporting does not end. The QMCJob instance + is deleted, when the last reporting for the QMC Job expires. + + The jobId attribute presents the job identifier of a QMCJob instance. + The jobId can be used to associate multiple QMCJob instances. + example, it is possible to configure the same jobId value for multiple + QMCJob instances required to produce the data (e.g. Streaming services + and MTSI reports) for a specific network analysis."; key id; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 183e886e640dd5582185cb20941d5c12fca703ed..0476bb7fde5d24cfd7e5d704f0b63181c961b784 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -29,6 +29,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2023-02-14 { reference CR-0234; } revision 2022-09-30 { reference CR-0191 ; } revision 2021-01-16 { reference "CR-0120"; } revision 2020-08-06 { reference "CR-0102"; } @@ -133,8 +134,6 @@ module _3gpp-common-subnetwork { grouping SubNetworkGrp { uses Domain_Grp; - uses meas3gpp:SupportedPerfMetricGroupGrp; - leaf-list setOfMcc { description "Set of Mobile Country Code (MCC). @@ -156,6 +155,21 @@ module _3gpp-common-subnetwork { type uint32; } + uses meas3gpp:SupportedPerfMetricGroupGrp; + + leaf-list supportedTraceMetrics { + type string; + config false; + description "List of trace metrics. When this attribute is contained in + a managed object it defines the trace metrics supported for this + object and all descendant objects. + + Trace metrics include trace messages, MDT measurements + (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, + see TS 32.422. Trace metrics are identified with their metric + identifier. The metric identifier is constructed as defined + in clause 10 of TS 32.422."; + } } list SubNetwork { diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 8a47d3bdce1f0131884e26e383506b24ea909934..14732cde8f56c7fa12eb9e05f8d3e889faebb2b2 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -5,6 +5,7 @@ module _3gpp-common-trace { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types {prefix types3gpp; } + import _3gpp-common-yang-extensions {prefix yext3gpp; } import ietf-inet-types { prefix inet; } import _3gpp-common-files { prefix files3gpp; } @@ -21,8 +22,10 @@ module _3gpp-common-trace { 3GPP TS 28.622 Generic Network Resource Model (NRM) Integration Reference Point (IRP); - Information Service (IS)"; + Information Service (IS)" ; + revision 2023-02-18 { reference "CR-0234"; } + revision 2023-02-16 { reference "CR-0233"; } revision 2022-09-30 { reference CR-0191 ; } revision 2022-04-27 { reference "CR-0159"; } revision 2021-10-18 { reference "CR-0139"; } @@ -31,8 +34,173 @@ module _3gpp-common-trace { revision 2020-11-16 { reference "CR-0117"; } revision 2020-08-06 { reference "CR-0102"; } + grouping FreqInfoGrp { + description "Represents the FreqInfo dataType. + This <> defines the RF reference frequency and the frequency + operating bands used in a cell for a given direction (UL or DL) in FDD + or for both UL and DL directions in TDD"; + + leaf arfcn { + type uint32 { + range 0..3279165; + } + mandatory true; + description "RF Reference Frequency as defined in TS 38.104, + clause 5.4.2.1. The frequency provided identifies the absolute + frequency position of the reference resource block (Common RB 0) + of the carrier. Its lowest subcarrier is also known as Point A."; + } + + leaf-list freqBands { + type uint32 { + range 1..1024; + } + min-elements 1; + description "List of NR frequency operating bands. Primary NR + Operating Band as defined in TS 38.104, clause 5.4.2.3. + The value 1 corresponds to n1, value 2 corresponds to NR operating + band n2, etc."; + } + } + + grouping AreaConfigGrp { + description "Represents the AreaConfig dataType. + This <> defines the area for which measurement logging should + be performed. It is described by a list of cells and a list of + frequencies."; + + list freqInfo { + key arfcn; + min-elements 1; + max-elements 32; + description "It specifies the carrier frequency and bands used in + a cell."; + + uses FreqInfoGrp ; + } + + leaf-list pciList { + type uint32 { + range 0..1007; + } + min-elements 1; + max-elements 32; + description "List of neighbour cells subject for MDT scope."; + } + } + + grouping AreaScopeGrp { + description "Represents the AreaScope dataType. + This <> defines the area scope of MDT. + The Area Scope parameter in LTE and NR is either: + - list of Cells, identified by E-UTRAN-CGI or NG-RAN CGI. + Maximum 32 CGI can be defined. + - list of Tracking Area, identified by TAC. + Maximum of 8 TAC can be defined. + - list of Tracking Area Identity, identified by TAC with + associated plmn-Identity perTAC-List containing the + PLMN identity for each TAC. Maximum of 8 TAI can be defined."; + + choice AreaScopeChoice { + leaf-list eutraCellIdList { + type string; + min-elements 1; + max-elements 32; + description "List of E-UTRAN cells identified by E-UTRAN-CGI"; + } + + leaf-list utraCellIdList { + type string; + min-elements 1; + max-elements 32; + description "List of UTRAN cells identified by UTRAN CGI"; + } + + leaf-list tacList { + type types3gpp:Tac; + min-elements 1; + max-elements 8; + description "Tracking Area Code list"; + } + + list taiList { + description "Tracking Area Identity list"; + key idx; + min-elements 1; + max-elements 8; + leaf idx { type string; } + uses types3gpp:TaiGrp; + } + } + } + + grouping ExcessPacketDelayThresholdsGrp { + description "Represents the ExcessPacketDelayThresholds dataType. + This <> defines a excess packet delay threshold information + to enable the calculation of the PDCP Excess Packet Delay in the + uplink in case of M6 uplink measurements are requested. The excess + packet delay threshold information is specified with the 5QI value + and excess packet delay threshold value."; + + leaf fiveQIValue { + type uint8; + mandatory true; + description "It indicates 5QI value."; + } + + leaf excessPacketDelayThresholdValue { + type decimal64 { + fraction-digits 2; + range 0.25|0.5|1|2|4|5|10|20|30|40|50|60|70|80|90|100|150|300|500 ; + } + mandatory true; + units milliseconds; + description "Value of excess packet delay threshold + for M6 UL measurement in milliseconds."; + } + } + + grouping TraceReferenceGrp { + description "Represents the TraceReference dataType. + This <> defines a globally unique identifier, which uniquely + identifies the Trace Session that is created by the TraceJob. It is + composed of the MCC, MNC (resulting in PLMN identifier) and the + trace identifier."; + + uses types3gpp:PLMNId; // mcc+mnc + + leaf traceId { + type string; + mandatory true; + description "An identifier, which identifies the Trace + (together with MCC and MNC). This is a 3 byte Octet String."; + } + } + + grouping MbsfnAreaGrp { + description "Represents the MbsfnArea dataType. + This <> defines a MBSFN area. It is composed of the MBSFN Area + identifier and the carrier frequency (EARFCN)."; + + leaf mbsfnAreaId { + type uint32 { + range 1..max; + } + mandatory true; + description "MBSFN Area Identifier"; + } + + leaf earfcn{ + type uint32 { + range 1..max; + } + mandatory true; + description "Carrier Frequency"; + } + } + grouping TraceJobGrp { - leaf tjJobType { + leaf jobType { type enumeration { enum IMMEDIATE_MDT_ONLY; enum LOGGED_MDT_ONLY; @@ -51,21 +219,8 @@ module _3gpp-common-trace { allowed values."; } - list tjListOfInterfaces { + list listOfInterfaces { key idx; - must 'count(MSCServerInterfaces)+count(MGWInterfaces)+count(RNCInterfaces)' - +'+count(SGSNInterfaces)+count(GGSNInterfaces)+count(S-CSCFInterfaces)' - +'+count(P-CSCFInterfaces)+count(I-CSCFInterfaces)+count(MRFCInterfaces)' - +'+count(MGCFInterfaces)+count(IBCFInterfaces)+count(E-CSCFInterfaces)' - +'+count(BGCFInterfaces)+count(ASInterfaces)+count(HSSInterfaces)' - +'+count(EIRInterfaces)+count(BM-SCInterfaces)+count(MMEInterfaces)' - +'+count(SGWInterfaces)+count(PDN_GWInterfaces)+count(eNBInterfaces)' - +'+count(en-gNBInterfaces)+count(AMFInterfaces)+count(AUSFInterfaces)' - +'+count(NEFInterfaces)+count(NRFInterfaces)+count(NSSFInterfaces)' - +'+count(PCFInterfaces)+count(SMFInterfaces)+count(SMSFInterfaces)' - +'+count(UDMInterfaces)+count(UPFInterfaces)+count(ng-eNBInterfaces)' - +'+count(gNB-CU-CPInterfaces)+count(gNB-CU-UPInterfaces)' - +'+count(gNB-DUInterfaces)'; description "Specifies the interfaces that need to be traced in the given ManagedEntityFunction.The attribute is applicable only for Trace. In @@ -364,7 +519,7 @@ module _3gpp-common-trace { } } - leaf-list tjListOfNeTypes { + leaf-list listOfNETypes { type enumeration { enum MSC_SERVER; enum SGSN; @@ -389,44 +544,43 @@ module _3gpp-common-trace { allowed values"; } - leaf tjPLMNTarget { - type string; - mandatory true; + list pLMNTarget { + key "mcc mnc"; description "Specifies which PLMN that the subscriber of the session to be recorded uses as selected PLMN. PLMN Target might differ from the PLMN specified in the Trace Reference"; reference "Clause 5.9b of 3GPP TS 32.422"; + + uses types3gpp:PLMNId; } - leaf tjStreamingTraceConsumerURI { - when '../tjTraceReportingFormat = "STREAMING"'; + leaf traceReportingConsumerUri { + when '../traceReportingFormat = "STREAMING"'; type inet:uri; - mandatory true; description "URI of the Streaming Trace data reporting MnS consumer (a.k.a. streaming target). This attribute shall be present if file based trace data reporting is - supported and tjTraceReportingFormat set to 'file based' or when - tjJobType is set to Logged MDT or Logged MBSFN MDT."; + supported and traceReportingFormat set to 'file based' or when + jobType is set to Logged MDT or Logged MBSFN MDT."; reference "Clause 5.9 of 3GPP TS 32.422"; } - leaf tjTraceCollectionEntityAddress { - when '../tjTraceReportingFormat = "FILE_BASED" or ' - +'../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"'; + leaf traceCollectionEntityIPAddress { + when '../traceReportingFormat = "FILE_BASED" or ' + +'../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"'; type union { type inet:uri; type inet:ip-address; } - mandatory true; description "Specifies the address of the Trace Collection Entity when - the attribute tjTraceReportingFormat is configured for the file-based + the attribute traceReportingFormat is configured for the file-based reporting. The attribute is applicable for both Trace and MDT."; reference "Clause 5.9 of 3GPP TS 32.422"; } - leaf tjTraceDepth { - when '../tjJobType = "TRACE_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf traceDepth { + when '../jobType = "TRACE_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { enum MINIMUM; enum MEDIUM; @@ -445,26 +599,38 @@ module _3gpp-common-trace { reference "Clause 5.3 of 3GPP TS 32.422"; } - leaf tjTraceReference { - type uint64; - mandatory true; + list traceReference { + key "idx"; + min-elements 1; + max-elements 1; description "A globally unique identifier, which uniquely identifies the Trace Session that is created by the TraceJob. In case of shared network, it is the MCC and MNC of the Participating Operator that request the trace session that shall be provided. The attribute is applicable for both Trace and MDT."; + reference "Clause 5.6 of 3GPP TS 32.422"; + + leaf idx { type uint32 ; } + uses trace3gpp:TraceReferenceGrp ; } - leaf tjTraceRecordSessionReference { + leaf traceRecordingSessionReference { type string; mandatory true; + config false; description "An identifier, which identifies the Trace Recording Session. The attribute is applicable for both Trace and MDT. See the clause 5.7 of 3GPP TS 32.422 for additional details on the allowed values."; } - leaf tjTraceReportingFormat { + leaf jobId { + type string; + yext3gpp:inVariant; + description "Identifier of a TraceJob"; + } + + leaf traceReportingFormat { type enumeration { enum FILE_BASED; enum STREAMING; @@ -474,7 +640,8 @@ module _3gpp-common-trace { reporting or file-based trace reporting"; reference "3GPP TS 32.422 clause 5.11"; } - list tjTraceTarget { + + list traceTarget { key "targetIdType targetIdValue"; max-elements 1; @@ -502,12 +669,12 @@ module _3gpp-common-trace { attribute is applicable for both Trace and MDT. This attribute includes the ID type of the target as an enumeration and the ID value. - The tjTraceTarget shall be public ID in case of a Management Based - Activation is done to an ScscfFunction. The tjTraceTarget shall be + The traceTarget shall be public ID in case of a Management Based + Activation is done to an ScscfFunction. The traceTarget shall be cell only in case of the UTRAN cell traffic trace function. - The tjTraceTarget shall be E-UtranCell only in case of E-UTRAN cell - traffic trace function.The tjTraceTarget shall be either IMSI or + The traceTarget shall be E-UtranCell only in case of E-UTRAN cell + traffic trace function.The traceTarget shall be either IMSI or IMEI(SV) if the Trace Session is activated to any of the following ManagedEntity(ies): - HssFunction @@ -518,43 +685,42 @@ module _3gpp-common-trace { - RncFunction - MmeFunction - The tjTraceTarget shall be IMSI if the Trace Session is activated to a + The traceTarget shall be IMSI if the Trace Session is activated to a ManagedEntity playing a role of ServinGWFunction. - In case of signaling based Trace/MDT, the tjTraceTarget attribute shall - be able to carry (IMSI or IMEI(SV)or SUPI), the tjMDTAreaScope attribute + In case of signaling based Trace/MDT, the traceTarget attribute shall + be able to carry (IMSI or IMEI(SV)or SUPI), the mDTAreaScope attribute shall be able to carry a list of (cell or E-UtranCell or NRCellDU or TA/LA/RA). - In case of management based Immediate MDT, the tjTraceTarget attribute - shall be null value, the tjMDTAreaScope attribute shall carry a list of + In case of management based Immediate MDT, the traceTarget attribute + shall be null value, the mDTAreaScope attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU). - In case of management based Logged MDT, the tjTraceTarget attribute + In case of management based Logged MDT, the traceTarget attribute shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated - on the specified eNB or RNC or gNB in tjTraceTarget. The tjMDTAreaScope + on the specified eNB or RNC or gNB in traceTarget. The mDTAreaScope attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU or TA/LA/RA). - In case of RLF reporting, or RCEF reporting, the tjTraceTarget - attribute shall be null value, the tjMDTAreaScope attribute shall carry + In case of RLF reporting, or RCEF reporting, the traceTarget + attribute shall be null value, the mDTAreaScope attribute shall carry one or list of eNBs/gNBs"; reference "3GPP TS 32.422"; } - leaf tjTriggeringEvent { - when '../tjJobType = "TRACE_ONLY" or ' + - '../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf triggeringEvents { + when '../jobType = "TRACE_ONLY" or ' + + '../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type string ; - mandatory true; description "Specifies the triggering event parameter of the trace session. The attribute is applicable only for Trace. In case this attribute is not used, it carries a null semantic."; reference "Clause 5.1 of 3GPP TS 32.422"; } - leaf tjMDTAnonymizationOfData { - when ../tjMDTAreaScope ; + leaf anonymizationOfMDTData { + when ../areaScope ; type enumeration { enum NO_IDENTITY; enum TAC_OF_IMEI; @@ -564,12 +730,10 @@ module _3gpp-common-trace { reference "3GPP TS 32.422 clause 5.10.12."; } - list tjMDTAreaConfigurationForNeighCell { - when '../tjJobType = "LOGGED_MDT_ONLY"'; + list areaConfigurationForNeighCell { + when '../jobType = "LOGGED_MDT_ONLY"'; key "idx"; - min-elements 1; leaf idx { type uint32 ; } - description "It specifies the area for which UE is requested to perform measurement logging for neighbour cells which have list of frequencies. If it is not configured, the UE shall perform measurement logging for @@ -578,37 +742,31 @@ module _3gpp-common-trace { Applicable only to NR Logged MDT."; reference "3GPP TS 32.422 clause 5.10.26."; - leaf frequency { - type string; - } - - leaf cell { - type string; - } + uses AreaConfigGrp; } - leaf-list tjMDTAreaScope { - type string; - description "specifies MDT area scope when activates an MDT job. - - For RLF and RCEF reporting it specifies the eNB or list of eNBs where the - RLF or RCEF reports should be collected. - - - List of cells/TA/LA/RA for signaling based MDT or management based Logged - MDT. - - List of cells for management based Immediate MDT. - - Cell, TA, LA, RA are mutually exclusive. - - One or list of eNBs for RLF and RCEFreporting"; - reference "Clause 5.10.2 of 3GPP TS 32.422"; + list areaScope { + key "idx"; + leaf idx { type uint32 ; } + description "It specifies the area where data shall be collected. + List of eNB/list of gNB/eNB/gNB for RLF or RCEF. + + List of cells/TA/LA/RA for signaling based MDT or management + based Logged MDT. + + List of cells for management based Immediate MDT. + + Cell, TA, LA, RA are mutually exclusive. + + This attribute shall be present if MDT is supported."; + reference "Clause 5.10.2 of 3GPP TS 32.422"; + + uses AreaScopeGrp; } - leaf tjMDTCollectionPeriodRrmLte { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf collectionPeriodRRMLTE { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|" +"24000|28000|32000|64000"; @@ -621,9 +779,9 @@ module _3gpp-common-trace { reference "Clause 5.10.20 of 3GPP TS 32.422"; } - leaf tjMDTCollectionPeriodM6Lte { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf collectionPeriodM6LTE { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|2048|5120|10240"; } @@ -635,22 +793,22 @@ module _3gpp-common-trace { reference "Clause 5.10.32 of TS 32.422 "; } - leaf tjMDTCollectionPeriodM7Lte { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf collectionPeriodM7LTE { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { range 1..60 ; } - description "It specifies the collection period for the Data Volume (M6) - and Throughput measurements (M7) for UMTS MDT taken by RNC. The - attribute is applicable only for Immediate MDT. In case this attribute + description "It specifies the collection period for the Packet Loss Rate + measurement (M7) for LTE MDT taken by the eNB. The attribute is + applicable only for Immediate MDT. In case this attribute is not used, it carries a null semantic."; - reference "Clause 5.10.22 of TS 32.422 ."; + reference "Clause 5.10.33 of TS 32.422 ."; } - leaf tjMDTCollectionPeriodRrmUmts { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf collectionPeriodRRMUMTS { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|1280|2048|2560|5120|" +"10240|60000"; @@ -663,9 +821,9 @@ module _3gpp-common-trace { reference "Clause 5.10.21 of 3GPP TS 32.422"; } - leaf tjMDTCollectionPeriodRrmNR { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf collectionPeriodRRMNR { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|2048|5120|10240|60000"; } @@ -677,9 +835,9 @@ module _3gpp-common-trace { reference "Clause 5.10.30 of 3GPP TS 32.422"; } - leaf tjMDTCollectionPeriodM6NR { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf collectionPeriodM6NR { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { enum 120ms; enum 240ms; @@ -703,9 +861,9 @@ module _3gpp-common-trace { reference "clause 5.10.34 of TS 32.422"; } - leaf tjMDTCollectionPeriodM7NR { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf collectionPeriodM7NR { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1..60"; } @@ -716,13 +874,22 @@ module _3gpp-common-trace { reference "clause 5.10.35 of TS 32.422"; } - leaf tjMDTEventListForTriggeredMeasurement { - when '../tjJobType = "LOGGED_MDT_ONLY"'; + leaf beamLevelMeasurement { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; + type boolean; + default false; + description "Indicates whether the NR M1 beam level measurements shall + be included or not."; + reference "Clause 5.10.40 of TS 32.422"; + } + + leaf eventListForEventTriggeredMeasurement { + when '../jobType = "LOGGED_MDT_ONLY"'; type enumeration { enum OUT_OF_COVERAGE ; enum A2_EVENT ; } - mandatory true; description "Specifies event types for event triggered measurement in the case of logged NR MDT. Each trace session may configure at most one event. The UE shall perform logging of measurements only upon certain @@ -732,7 +899,8 @@ module _3gpp-common-trace { reference "Clause 5.10.28 of 3GPP TS 32.422"; } - leaf tjMDTEventThreshold { + leaf eventThreshold { + when '../jobType = "IMMEDIATE_MDT_ONLY"'; type int64; description "Specifies the threshold which should trigger the reporting in case A2 event reporting in LTE or 1F/1l event in UMTS. The attribute @@ -742,24 +910,37 @@ module _3gpp-common-trace { reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422"; } - leaf tjMDTListOfMeasurements { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"'; - type int64; - mandatory true; + leaf listOfMeasurements { + when '../jobType = "IMMEDIATE_MDT_ONLY"'; + type enumeration { + enum M1; + enum M2; + enum M3; + enum M4; + enum M5; + enum M6_DL; + enum M6_UL; + enum M7_DL; + enum M7_UL; + enum M1_EVENT_TRIGGERED; + enum M6; + enum M7; + enum M8; + enum M9; + } description "It specifies the UE measurements that shall be collected in an Immediate MDT job. The attribute is applicable only for Immediate MDT. In case this attribute is not used, it carries a null semantic."; reference "3GPP TS 32.422 clause 5.10.3"; } - leaf tjMDTLoggingDuration { - when '../tjJobType = "LOGGED_MDT_ONLY" or' - + ' ../tjJobType = "LOGGED_MBSFN_MDT"'; + leaf loggingDuration { + when '../jobType = "LOGGED_MDT_ONLY" or' + + ' ../jobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "600|1200|2400|3600|5400|7200"; } units seconds; - mandatory true; description "Specifies how long the MDT configuration is valid at the UE in case of Logged MDT. The attribute is applicable only for Logged MDT and Logged MBSFN MDT. In case this attribute is not used, it @@ -767,84 +948,87 @@ module _3gpp-common-trace { reference "5.10.9 of 3GPP TS 32.422"; } - leaf tjMDTLoggingInterval { - when '../tjJobType = "LOGGED_MDT_ONLY" or' - + ' ../tjJobType = "LOGGED_MBSFN_MDT"'; + leaf loggingInterval { + when '../jobType = "LOGGED_MDT_ONLY" or' + + ' ../jobType = "LOGGED_MBSFN_MDT"'; type uint32 { - range "1280|2560|5120|10240|20480|" + range "0|320|640|1280|2560|5120|10240|20480|" +"30720|40960|61440"; } units milliseconds; - mandatory true; description "Specifies the periodicty for Logged MDT. The attribute is applicable only for Logged MDT and Logged MBSFN MDT. In case this - attribute is not used, it carries a null semantic"; + attribute is not used, it carries a null semantic. + The value 0 indicates Infinity for NR."; reference "5.10.8 of 3GPP TS 32.422"; } - leaf tjMDTLoggingEventThreshold { - when '../tjJobType = "LOGGED_MDT_ONLY" or' - + ' ../tjJobType = "LOGGED_MBSFN_MDT"'; + leaf eventThresholdL1 { + when '../jobType = "LOGGED_MDT_ONLY" or' + + ' ../jobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "0..127"; } description "It specifies the threshold which should trigger the reporting in case of event based reporting of logged NR MDT. - The attribute is applicable only for Logged MDT and when tjMDTReportType + The attribute is applicable only for Logged MDT and when reportType is configured for event triggered reporting and when - tjMDTEventListForTriggeredMeasurement is configured for L1 event. + eventListForEventTriggeredMeasurement is configured for L1 event. In case this attribute is not used, it carries a null semantic."; reference "clause 5.10.36 of TS 32.422"; } - leaf tjMDTLoggedHysteresis { - when '../tjJobType = "LOGGED_MDT_ONLY" or ' - + '../tjJobType = "LOGGED_MBSFN_MDT"'; + leaf hysteresisL1 { + when '../jobType = "LOGGED_MDT_ONLY" or ' + + '../jobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "0..30"; } description "It specifies the hysteresis used within the entry and leave condition of the L1 event based reporting of logged NR MDT. - The attribute is applicable only for Logged MDT, when tjMDTReportType + The attribute is applicable only for Logged MDT, when reportType is configured for event triggered reporting and when - tjMDTEventListForTriggeredMeasurement is configured for L1 event. + eventListForEventTriggeredMeasurement is configured for L1 event. In case this attribute is not used, it carries a null semantic."; reference "clause 5.10.37 of TS 32.422"; } - leaf tjMDTLoggedTimeToTrigger { - when '../tjJobType = "LOGGED_MDT_ONLY" or ' - + '../tjJobType = "LOGGED_MBSFN_MDT"'; - type int32 ; + leaf timeToTriggerL1 { + when '../jobType = "LOGGED_MDT_ONLY" or ' + + '../jobType = "LOGGED_MBSFN_MDT"'; + type int32 { + range 0|40|64|80|100|128|160|256|320|480|512|640|1024|1280|2560|5120; + } + units milliseconds; description "It specifies the threshold which should trigger the reporting in case of event based reporting of logged NR MDT. - The attribute is applicable only for Logged MDT, when tjMDTReportType + The attribute is applicable only for Logged MDT, when reportType is configured for event triggered reporting and when - tjMDTEventListForTriggeredMeasurement is configured for L1 event. + eventListForEventTriggeredMeasurement is configured for L1 event. In case this attribute is not used, it carries a null semantic."; reference "clauses 5.10.38 of TS 32.422"; } - leaf-list tjMDTMBSFNAreaList { - when '../tjJobType = "LOGGED_MBSFN_MDT"'; - type string; - min-elements 1; + list mBSFNAreaList { + when '../jobType = "LOGGED_MBSFN_MDT"'; + key "mbsfnAreaId earfcn"; max-elements 8; description "The MBSFN Area consists of a MBSFN Area ID and Carrier Frequency (EARFCN). The target MBSFN area List can have up to 8 entries. This parameter is applicable only if the job type is Logged MBSFN MDT."; reference "5.10.25 of 3GPP TS 32.422"; + + uses MbsfnAreaGrp; } - leaf tjMDTMeasurementPeriodLTE { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf measurementPeriodLTE { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|1280|2048|2560|5120|" +"10240|60000"; } units milliseconds; - mandatory true; description "It specifies the measurement period for the Data Volume and Scheduled IP throughput measurements for MDT taken by the eNB. The attribute is applicable only for Immediate MDT. In case this @@ -852,15 +1036,14 @@ module _3gpp-common-trace { reference "Clause 5.10.23 of 3GPP TS 32.422"; } - leaf tjMDTMeasurementPeriodUMTS { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + 'or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf measurementPeriodUMTS { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + 'or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|" +"24000|28000|32000|64000"; } units milliseconds; - mandatory true; description "It specifies the measurement period for the Data Volume and Throughput measurements for MDT taken by RNC. The attribute is applicable only for Immediate MDT. In case this @@ -868,19 +1051,22 @@ module _3gpp-common-trace { reference "Clause 5.10.22 of 3GPP TS 32.422"; } - leaf tjMDTMeasurementQuantity { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; - type uint64 ; - mandatory true; + leaf measurementQuantity { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; + type enumeration { + enum CPICH_ECNO; + enum CPICH_RSCP; + enum PATHLOSS; + } description "It specifies the measurements that are collected in an MDT job for a UMTS MDT configured for event triggered reporting."; reference "Clause 5.10.15 of 3GPP TS 32.422"; } - leaf tjMDTM4ThresholdUmts { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf eventThresholdUphUMTS { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { range 0..31 ; } @@ -888,36 +1074,34 @@ module _3gpp-common-trace { the reporting in case of event-triggered periodic reporting for M4 (UE power headroom measurement) in UMTS. In case this attribute is not used, it carries a null semantic."; - reference "3GPP TS 32.422 clause 5.10.A"; + reference "5.10.39 of TS 32.422"; } - list tjMDTPLMList { - when '../tjJobType = "LOGGED_MDT_ONLY"'; + list pLMNList { + when '../jobType = "LOGGED_MDT_ONLY"'; key "mcc mnc"; uses types3gpp:PLMNId; - min-elements 1; max-elements 16; description "It indicates the PLMNs where measurement collection, status indication and log reporting is allowed."; reference "Clause 5.10.24 of 3GPP TS 32.422"; } - leaf tjMDTPositioningMethod { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf positioningMethod { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { enum GNSS; enum E_CELL_ID; } - mandatory true; description "It specifies what positioning method should be used in the MDT job."; reference "Clause 5.10.19 of 3GPP TS 32.422"; } - leaf tjMDTReportAmount { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' and ../tjMDTReportingTrigger = "PERIODICAL"'; + leaf reportAmount { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' and ../reportingTrigger = "PERIODICAL"'; type union { type uint32 { range "1|4|8|16|32|64" ; @@ -926,17 +1110,16 @@ module _3gpp-common-trace { enum INFINITY; } } - mandatory true; description "It specifies the number of measurement reports that shall be taken for periodic reporting while the UE is in connected. The attribute is applicable only for Immediate MDT and when - tjMDTReportingTrigger is configured for periodical measurements. In + reportingTrigger is configured for periodical measurements. In case this attribute is not used, it carries a null semantic."; reference "Clause 5.10.6 of 3GPP TS 32.422"; } - leaf tjMDTReportingTrigger { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"'; + leaf reportingTrigger { + when '../jobType = "IMMEDIATE_MDT_ONLY"'; type enumeration { enum PERIODICAL; enum A2_FOR_LTE; @@ -949,49 +1132,46 @@ module _3gpp-common-trace { description "It specifies whether periodic or event based measurements should be collected. The attribute is applicable only for Immediate MDT and when the - tjMDTListOfMeasurements is configured for M1 (for both UMTS and LTE) + listOfMeasurements is configured for M1 (for both UMTS and LTE) or M2 (only for UMTS). In case this attribute is not used, it carries a null semantic."; reference "Clause 5.10.4 of 3GPP TS 32.422"; } - leaf tjMDTReportInterval { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' and ../tjMDTReportingTrigger = "PERIODICAL"'; + leaf reportInterval { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' and ../reportingTrigger = "PERIODICAL"'; type uint32 { range "120|240|250|480|500|640|1000|1024|2000|2048|3000|4000|" +"5120|6000|8000|10240|12000|16000|20000|" - +"24000|28000|32000|60000|64000|" + +"20480|24000|28000|32000|40960|60000|64000|" +"360000|720000|1800000|3600000"; } units milliseconds; - mandatory true; description "It specifies the interval between the periodical measurements that shall be taken when the UE is in connected mode. The attribute is applicable only for Immediate MDT and when - tjMDTReportingTrigger is configured for periodical measurements. In case + reportingTrigger is configured for periodical measurements. In case this attribute is not used, it carries a null semantic."; reference "5.10.5 of 3GPP TS 32.422"; } - leaf tjMDTReportType { - when '../tjJobType = "LOGGED_MDT_ONLY"'; + leaf reportType { + when '../jobType = "IMMEDIATE_MDT_ONLY"'; type enumeration { enum PERIODICAL; enum EVENT_TRIGGERED; } - mandatory true; description "It specifies report type for logged NR MDT"; reference "Clause 5.10.27 of 3GPP TS 32.422"; } - leaf tjMDTSensorInformation { - type bits { - bit BAROMETRIC_PRESSURE; - bit UE_SPEED; - bit UE_ORIENTATION; + leaf-list sensorInformation { + type enumeration { + enum BAROMETRIC_PRESSURE; + enum UE_SPEED; + enum UE_ORIENTATION; } - default ""; description "It specifies which sensor information shall be included in logged NR MDT and immediate NR MDT measurement if they are available. The following sensor measurement can be included or excluded for @@ -999,15 +1179,22 @@ module _3gpp-common-trace { reference "Clause 5.10.29 of 3GPP TS 32.422"; } - leaf tjMDTTraceCollectionEntityID { - when '../tjJobType = "LOGGED_MDT_ONLY" or ' - + '../tjJobType = "LOGGED_MBSFN_MDT"'; - type uint8; - mandatory true; + leaf traceCollectionEntityId { + when '../jobType = "LOGGED_MDT_ONLY" or ' + + '../jobType = "LOGGED_MBSFN_MDT"'; + type uint32; description "It specifies the TCE Id which is sent to the UE in Logged MDT."; reference "Clause 5.10.11 of 3GPP TS 32.422"; } + + list excessPacketDelayThresholds { + description "Excess packet delay thresholds info for M6 UL measurement."; + min-elements 1; + key idx; + leaf idx { type string; } + uses ExcessPacketDelayThresholdsGrp; + } } grouping TraceSubtree { @@ -1021,103 +1208,197 @@ module _3gpp-common-trace { augment all user classes!"; list TraceJob { - description "Represents the Trace Control and Configuration parameters of a - particular Trace Job (see TS 32.421 and TS 32.422 for details). - It can be name-contained by SubNetwork, ManagedElement, ManagedFunction - or NetworkSliceSubnet. - - To activate Trace Jobs, a MnS consumer has to create TraceJob object - instances on the MnS producer. A MnS consumer can activate a Trace Job - for another MnS consumer since it is not required the value of - tjTraceCollectionEntityAddress or tjStreamingTraceConsumerUri to be his - own. - - When a MnS consumer wishes to deactivate a Trace Job, the MnS consumer - shall delete the corresponding TraceJob instance. - - For details of management Trace Job activation/deactivation see clause - 4.1.1.1.2 of TS 32.422. - - The attribute tjJobType specifies the kind of data to collect. Dependent + description "A TraceJob instance represents the Trace Control and + Configuration parameters of a particular Trace Job (see TS 32.421 and + TS 32.422 for details). It can be name-contained by SubNetwork, + ManagedElement, ManagedFunction. + + To activate Trace Jobs, a MnS consumer has to create TraceJob object + instances on the MnS producer. A MnS consumer can activate a Trace Job + for another MnS consumer since it is not required the value of + traceCollectionEntityIPAddress or traceReportingConsumerUri to be + his own. + + For the details of Trace Job activation see clauses 4.1.1.1.2 and + 4.1.2.1.2 of TS 32.422. + + When a MnS consumer wishes to deactivate a Trace Job, the MnS consumer + shall delete the corresponding TraceJob instance. For details of + management Trace Job deactivation see clauses 4.1.3.8 to 4.1.3.11 and + 4.1.4.10 to 4.1.4.13 of TS 32.422. + + The attribute traceReference specifies a globally unique ID and + identifies a Trace session. One Trace Session may be activated to + multiple Network Elements. + + The attribute traceRecordingSessionReference identifies a Trace + Recording Session within a Trace Session. Two different trace sessions + could e.g. be caused by two different trigger events. + + The jobId attribute presents the job identifier of a TraceJob instance. + The jobId can be used to associate multiple TraceJob instances. + For example, it is possible to configure the same jobId value for + multiple TraceJob instances required to produce the data (e.g. RSRP + values of M1 and RLF reports) for a specific network analysis. + + The attribute traceReportingFormat defines the method for reporting + the produced measurements. The selectable options are file-based or + stream-based reporting. In case of file-based reporting the attribute + traceCollectionEntityIPAddress is used to specify the IP address to + which the trace records shall be transferred, while in case of + stream-based reporting the attribute traceReportingConsumerUri + specifies the streaming target. + + The mandatory attribute traceTarget determines the target object of + the TraceJob. Dependent on the network element to which the Trace + Session is activated different types of the target object are possible. + The attribute pLMNTarget defines the PLMN for which sessions shall be + selected in the Trace Session in case of management based activation + when several PLMNs are supported in the RAN. + + The attribute jobType specifies the kind of data to collect. Dependent on the selected type various parameters shall be available. The - attributes tjJobType, tjTraceReference, tjTraceRecordSessionReference, - tjTraceCollectionEntityAddress and tjTraceReportingFormat are mandatory - for all job types. If streaming reporting is selected for - tjTraceReportingFormat, tjStreamingTraceConsumerURI shall be present - additionally. The attribute tjPLMNTarget shall be present if trace + attributes jobType, traceReference, traceRecordingSessionReference, + traceCollectionEntityIPAddress, traceTarget and traceReportingFormat + are mandatory for all job types. If streaming reporting is selected + for traceReportingFormat, traceReportingConsumerUri shall be present + additionally. The attribute pLMNTarget shall be present if trace activation method is management based. For the different job types the attributes are differentiated as follows: + - In case of TRACE_ONLY additionally the following attributes shall be - available: tjListOfNeTypes, tjTraceDepth, tjTraceTarget and - tjTriggeringEvent. + available: listOfNETypes, traceDepth, and triggeringEvents. - For this case the optional attribute tjListOfInterfaces allows to - specify the interfaces to be recorded. + For this case the optional attribute listOfInterfaces allows to specify + the interfaces to be recorded. - In case of IMMEDIATE_MDT_ONLY additionally the following attributes shall be available: - - tjTraceTarget - - tjMDTAnonymizationOfData, - - tjMDTListOfMeasurements, - - tjMDTCollectionPeriodRrmUmts (conditional for M3, M4 and M5 in UMTS), - - tjMDTMeasurementPeriodUMTS (conditional for M6 and M7 in UMTS), - - tjMDTCollectionPeriodRrmLte (conditional for M2 and M3 in LTE), - - tjMDTMeasurementPeriodLTE (conditional for M4 and M5 in LTE), - - tjMDTCollectionPeriodM6Lte (conditional for M6 in LTE), - - tjMDTCollectionPeriodM7Lte (conditional for M7 in LTE), - - tjMDTCollectionPeriodRrmNR (conditional for M4 and M5 in NR), - - tjMDTCollectionPeriodM6NR (conditional for M6 in NR), - - tjMDTCollectionPeriodM7NR (conditional for M7 in NR), - - tjMDTReportInterval (conditional for M1 in LTE or NR and M1/M2 in - UMTS), - - tjMDTReportAmount (conditional for M1 in LTE or NR and M1/M2 in - UMTS), - - tjMDTReportingTrigger (conditional for M1 in LTE or NR and M1/M2 in - UMTS), - - tjMDTEventThreshold (conditional for A2 event reporting or A2 event - triggered periodic reporting), - - tjMDTMeasurementQuantity (conditional for 1F event reporting). - - For this case the optional attribute tjMDTAreaScope allows to specify - the area in terms of cells or Tracking Area/Routing Area/Location area - where the MDT data collection shall take place and the optional - attributes tjMDTPositioningMethod, tjMDTSensorInformation allow to - specify the positioning methods to use or the sensor information to - include. - + - anonymizationOfMDTData, + - listOfMeasurements, + - collectionPeriodRRMUMTS (conditional for M4 and M5 in UMTS), + - measurementPeriodUMTS (conditional for M6 and M7 in UMTS), + - collectionPeriodRRMLTE (conditional for M3 in LTE), + - measurementPeriodLTE (conditional for M4 and M5 in LTE), + - collectionPeriodM6LTE (conditional for M6 in LTE), + - collectionPeriodM7LTE (conditional for M7 in LTE), + - collectionPeriodRRMNR (conditional for M4 and M5 in NR), + - collectionPeriodM6NR (conditional for M6 in NR), + - collectionPeriodM7NR (conditional for M7 in NR), + - beamLevelMeasurement (conditional for M1 in NR), + - reportInterval (conditional for M1 in LTE or NR and M1/M2 in UMTS), + - reportAmount (conditional for M1 in LTE or NR and M1/M2 in UMTS), + - reportingTrigger (conditional for M1 in LTE or NR and M1/M2 in UMTS), + - eventThreshold (conditional for A2 event reporting or A2 event + triggered periodic reporting), + - measurementQuantity (conditional for 1F event reporting). + - excessPacketDelayThresholds (conditional for M6 UL measurement in NR). + + For this case the optional attribute areaScope allows to specify the + area in terms of cells or Tracking Area/Routing Area/Location area where + the MDT data collection shall take place and the optional attributes + positioningMethod, sensorInformation allow to specify the positioning + methods to use or the sensor information to include. - In case of IMMEDIATE_MDT_AND_TRACE both additional attributes of TRACE_ONLY and IMMEDIATE_MDT_ONLY shall apply. + - In case of LOGGED_MDT_ONLY additionally the following attributes shall + be available: anonymizationOfMDTData, traceCollectionEntityId, + loggingInterval, loggingDuration, reportType, + eventListForEventTriggeredMeasurements. - - In case of LOGGED_MDT_ONLY additionally the following attributes - shall be available: tjTraceTarget, tjMDTAnonymizationOfData, - tjMDTTraceCollectionEntityID, tjMDTLoggingInterval, - tjMDTLoggingDuration, tjMDTReportType, - tjMDTEventListForTriggeredMeasurements. - - For this case the optional attribute tjMDTAreaScope allows to specify - the area in terms of cells or Tracking Area/Routing Area/Location area + For this case the optional attribute areaScope allows to specify the + area in terms of cells or Tracking Area/Routing Area/Location area where the MDT data collection shall take place, the optional attribute - tjMDTPLMNList allows to specify the PLMNs where measurement collection, + pLMNList allows to specify the PLMNs where measurement collection, status indication and log reporting is allowed, the optional attribute - tjMDTAreaConfigurationForNeighCell allows to specify the area for - which UE is requested to perform measurements logging for neighbour - cells which have list of frequencies and the optional attribute - tjMDTSensorInformation allows to specify the sensor information to - include. - - - In case of RLF_REPORT_ONLY and RCEF_REPORT_ONLY additionally the - attribute tjTraceTarget shall be available, the optional attribute - tjMDTAreaScope allows to specify the eNB or list of eNBs or gNB or - list of gNBs where the reports should be collected. - + areaConfigurationForNeighCell allows to specify the area for which UE + is requested to perform measurements logging for neighbour cells which + have list of frequencies and the optional attribute sensorInformation + allows to specify the sensor information to include. + - In case of RLF_REPORT_ONLY and RCEF_REPORT_ONLY the optional attribute + areaScope allows to specify the eNB or list of eNBs or gNB or list of + gNBs where the reports should be collected. - In case of LOGGED_MBSFN_MDT additionally the following attributes - shall be available: tjMDTAnonymizationOfData, tjMDTLoggingInterval, - tjMDTLoggingDuration, tjMDTMBSFNAreaList. - - Creation and deletion of TraceJob instances by MnS consumers is optional; - when not supported, the TraceJob instances may be created and deleted by - the system or be pre-installed."; + shall be available: anonymizationOfMDTData, loggingInterval, + loggingDuration, mBSFNAreaList. + + Reporting of measurements and messages can be periodical, event + triggered or event triggered periodic depending on the selected + job type. + - For trace the reporting is event based, where the triggering event + is configured with attribute triggeringEvents. For each triggering + event the first and last message (start/stop triggering event) to + record are specified. + - For immediate MDT, the reporting is dependent on the configured + measurements: + - For measurement M1 in LTE or NR, it is possible to select between + periodical, event triggered, event triggered periodic reporting or + reporting according to all configured RRM event triggers. For M1 and + M2 measurement in UMTS, it is possible to select between periodical, + event triggered reporting or reporting according to all configured RRM + event triggers. Parameter reportingTrigger determines which of the + reporting methods is selected and in case of event triggered or + event-triggered periodic, which is the decisive event type. For + periodical reporting, parameters reportInterval and reportAmount + determine the interval between two successive reports and the number + of reports. This means the periodical reporting terminates after + reportAmount reports have been sent as long as reportAmount is + configured with a value different from infinity. For event-triggered + periodic reporting, these two parameters apply in addition to parameter + eventThreshold which determines the threshold of the event. In this + case up to reportAmount reports are sent with a periodicity of + reportInterval after the entering condition is fulfilled. The + reporting is stopped, if the leaving condition is fulfulled and is + restarted if the configured event reoccurs. For event based reporting, + there is only one report sent after the event occurs. The parameters + to configure are reportingTrigger and eventThreshold. In case of UMTS + and 1f event reporting, additionally parameter measurementQuantity is + necessary in order to determine for which measurement(s) the event + threshold is applicable. + + Parameter beamLevelMeasurement determines whether beam level + measurements shall be included in case of NR. + - For measurement M2 in LTE or NR, reporting is according to + RRM configuration, see TS 38.321, TS 36.321 and TS 38.331, TS 36.331. + For measurement M4 in UMTS, reporting is either according to RRM + configuration, see TS 25.321 and TS 25.331 or periodic or event + triggered periodic using parameter collectionPeriodRRMUMTS and + eventThresholdUphUMTS. + - For measurement M3 in UMTS, the reporting is done upon availability, + see TS 37.320. + - For measurements M4, M5, M6 and M7 in NR, for measurements + M3, M4, M5, M6 and M7 in LTE and for measurements M5, M6 and M7 in + UMTS periodical reporting is applied. The configurable parameter is + the interval between two measurements (collectionPeriodRRMNR, + collectionPeriodM6NR, collectionPeriodM7NR, collectionPeriodRRMLTE, + measurementPeriodLTE, collectionPeriodM6LTE, collectionPeriodM7LTE, + collectionPeriodRRMUMTS, measurementPeriodUMTS). If no collection + period is configured for M5 in UMTS, all available measurements are + logged according to RRM configuration. + - For logged MDT in UMTS and LTE, the reporting is periodical. + Parameter loggingInterval determines the interval between the reports + and parameter loggingDuration determines how long the configuration is + valid meaning after this duration has passed no further reports are + sent. In NR, the reporting can be periodical or event based, + determined by parameter reportType. For periodical reporting the same + parameters as in LTE and UMTS apply. For event based reporting, + parameter eventListForEventTriggeredMeasurement configures the event + type, namely 'out of coverage' or 'L1 event'. In case 'L1 event' is + selected as event type, the logging is performed according to + parameter loggingInterval at regular intervals only when the + conditions indicated by eventThresholdL1, hysteresisL1, timeToTriggerL1 + (defining the thresholds, hysteresis and time to trigger) are met and + if UE is 'camped normally' state (TS 38.331, TS 38.304). In case + 'out of coverage' is selected as event type, the logging is performed + according to parameter loggingInterval at regular intervals only when + the UE is in 'any cell selection' state. Furthermore, logging is + performed immediately upon transition from the 'any cell selection' + state to the 'camped normally' state ( TS 38.331, TS 38.304 ). + + Creation and deletion of TraceJob instances by MnS consumers is + optional; when not supported, the TraceJob instances may be created + and deleted by the system or be pre-installed."; key id; uses top3gpp:Top_Grp ; @@ -1127,4 +1408,4 @@ module _3gpp-common-trace { uses files3gpp:FilesSubtree; } } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index b396251dcb01d0ee7f7aa873d823d8329bccaeb2..f7708b9ba747f7ef7b70aa92f26daf4a5a90803b 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -14,6 +14,7 @@ module _3gpp-common-yang-types { network slicing."; reference "3GPP TS 28.623"; + revision 2023-02-14 { reference CR-0234; } revision 2022-11-04 { reference "CR-0194"; } revision 2022-10-24 { reference CR-0196; } revision 2022-07-26 { reference "CR-0180" ; } @@ -56,7 +57,7 @@ module _3gpp-common-yang-types { } } - grouping ProcessMonitor { + grouping ProcessMonitorGrp { description "Provides attributes to monitor the progress of processes with specific purpose and limited lifetime running on MnS producers. It may be used as data type for dedicated progress monitor attributes @@ -357,7 +358,7 @@ module _3gpp-common-yang-types { reference "ITU T Recommendation X.731"; } - grouping SAP { + grouping SAPGrp { leaf host { type inet:host; mandatory true; @@ -515,6 +516,23 @@ module _3gpp-common-yang-types { reference "TS 23.003 clause 19.4.2.3"; } + grouping TaiGrp { + description "This <> defines a Tracking Area Identity (TAI) + as specified in clause 28.6 of TS 23.003, clause 8.2 of TS 38.300 + and clause 9.3.3.11 of TS 38.413. It is composed of the PLMN + identifier (PLMN-Id, which is composed of the MCC and MNC) and + the Tracking Area Code (TAC). "; + list plmnId { + description "PLMN Identity."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + + leaf tac { type Tac; } + } + typedef AmfRegionId { type union { type uint8 ;