From d89028aec3df6246efe747ca553dce8fb739f088 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 17 Feb 2023 16:00:20 +0000 Subject: [PATCH 01/11] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 349 +++++++++++++++------------- 1 file changed, 183 insertions(+), 166 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index f112b8034..fe2f8de80 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -22,6 +22,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-02-15 { reference "CR-0236"; } revision 2022-04-27 { reference "CR-0159"; } revision 2021-10-18 { reference "CR-0139"; } revision 2021-07-22 { reference "CR-0137"; } @@ -29,8 +30,23 @@ module _3gpp-common-trace { revision 2020-11-16 { reference "CR-0117"; } revision 2020-08-06 { reference "CR-0102"; } + grouping TraceReference { + leaf mcc { + mandatory true; + type types3gpp:Mcc; + } + leaf mnc { + mandatory true; + type types3gpp:Mnc; + } + leaf traceId { + mandatory true; + type int64; + } + } + grouping TraceJobGrp { - leaf tjJobType { + leaf jobType { type enumeration { enum IMMEDIATE_MDT_ONLY; enum LOGGED_MDT_ONLY; @@ -49,7 +65,7 @@ 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)' @@ -362,7 +378,7 @@ module _3gpp-common-trace { } } - leaf-list tjListOfNeTypes { + leaf-list listOfNeTypes { type enumeration { enum MSC_SERVER; enum SGSN; @@ -387,7 +403,7 @@ module _3gpp-common-trace { allowed values"; } - leaf tjPLMNTarget { + leaf PLMNTarget { type string; mandatory true; description "Specifies which PLMN that the subscriber of the session to @@ -396,35 +412,35 @@ module _3gpp-common-trace { reference "Clause 5.9b of 3GPP TS 32.422"; } - leaf tjStreamingTraceConsumerURI { - when '../tjTraceReportingFormat = "STREAMING"'; + leaf streamingTraceConsumerURI { + 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 traceCollectionEntityAddress { + 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; @@ -443,9 +459,10 @@ module _3gpp-common-trace { reference "Clause 5.3 of 3GPP TS 32.422"; } - leaf tjTraceReference { - type uint64; - mandatory true; + list traceReference { + uses TraceReference; + key "mcc mnc traceId"; + 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 @@ -453,7 +470,7 @@ module _3gpp-common-trace { The attribute is applicable for both Trace and MDT."; } - leaf tjTraceRecordSessionReference { + leaf traceRecordSessionReference { type string; mandatory true; description "An identifier, which identifies the Trace Recording Session. @@ -462,7 +479,7 @@ module _3gpp-common-trace { allowed values."; } - leaf tjTraceReportingFormat { + leaf traceReportingFormat { type enumeration { enum FILE_BASED; enum STREAMING; @@ -472,7 +489,7 @@ 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; @@ -500,12 +517,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 @@ -516,33 +533,33 @@ 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 triggeringEvent { + when '../jobType = "TRACE_ONLY" or ' + + '../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type string ; mandatory true; description "Specifies the triggering event parameter of the trace session. @@ -551,8 +568,8 @@ module _3gpp-common-trace { reference "Clause 5.1 of 3GPP TS 32.422"; } - leaf tjMDTAnonymizationOfData { - when ../tjMDTAreaScope ; + leaf MDTAnonymizationOfData { + when ../MDTAreaScope ; type enumeration { enum NO_IDENTITY; enum TAC_OF_IMEI; @@ -562,8 +579,8 @@ module _3gpp-common-trace { reference "3GPP TS 32.422 clause 5.10.12."; } - list tjMDTAreaConfigurationForNeighCell { - when '../tjJobType = "LOGGED_MDT_ONLY"'; + list MDTAreaConfigurationForNeighCell { + when '../jobType = "LOGGED_MDT_ONLY"'; key "idx"; min-elements 1; leaf idx { type uint32 ; } @@ -585,7 +602,7 @@ module _3gpp-common-trace { } } - leaf-list tjMDTAreaScope { + leaf-list MDTAreaScope { type string; description "specifies MDT area scope when activates an MDT job. @@ -604,9 +621,9 @@ module _3gpp-common-trace { reference "Clause 5.10.2 of 3GPP TS 32.422"; } - leaf tjMDTCollectionPeriodRrmLte { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf MDTCollectionPeriodRrmLte { + 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"; @@ -619,9 +636,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 MDTCollectionPeriodM6Lte { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|2048|5120|10240"; } @@ -633,9 +650,9 @@ 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 MDTCollectionPeriodM7Lte { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { range 1..60 ; } @@ -646,9 +663,9 @@ module _3gpp-common-trace { reference "Clause 5.10.22 of TS 32.422 ."; } - leaf tjMDTCollectionPeriodRrmUmts { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf MDTCollectionPeriodRrmUmts { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|1280|2048|2560|5120|" +"10240|60000"; @@ -661,9 +678,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 MDTCollectionPeriodRrmNR { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|2048|5120|10240|60000"; } @@ -675,9 +692,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 MDTCollectionPeriodM6NR { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { enum 120ms; enum 240ms; @@ -701,9 +718,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 MDTCollectionPeriodM7NR { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1..60"; } @@ -714,8 +731,8 @@ module _3gpp-common-trace { reference "clause 5.10.35 of TS 32.422"; } - leaf tjMDTEventListForTriggeredMeasurement { - when '../tjJobType = "LOGGED_MDT_ONLY"'; + leaf MDTEventListForTriggeredMeasurement { + when '../jobType = "LOGGED_MDT_ONLY"'; type enumeration { enum OUT_OF_COVERAGE ; enum A2_EVENT ; @@ -730,7 +747,7 @@ module _3gpp-common-trace { reference "Clause 5.10.28 of 3GPP TS 32.422"; } - leaf tjMDTEventThreshold { + leaf MDTEventThreshold { 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 @@ -740,8 +757,8 @@ 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"'; + leaf MDTListOfMeasurements { + when '../jobType = "IMMEDIATE_MDT_ONLY"'; type int64; mandatory true; description "It specifies the UE measurements that shall be collected in @@ -750,9 +767,9 @@ module _3gpp-common-trace { reference "3GPP TS 32.422 clause 5.10.3"; } - leaf tjMDTLoggingDuration { - when '../tjJobType = "LOGGED_MDT_ONLY" or' - + ' ../tjJobType = "LOGGED_MBSFN_MDT"'; + leaf MDTLoggingDuration { + when '../jobType = "LOGGED_MDT_ONLY" or' + + ' ../jobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "600|1200|2400|3600|5400|7200"; } @@ -765,9 +782,9 @@ 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 MDTLoggingInterval { + when '../jobType = "LOGGED_MDT_ONLY" or' + + ' ../jobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "1280|2560|5120|10240|20480|" +"30720|40960|61440"; @@ -780,51 +797,51 @@ module _3gpp-common-trace { reference "5.10.8 of 3GPP TS 32.422"; } - leaf tjMDTLoggingEventThreshold { - when '../tjJobType = "LOGGED_MDT_ONLY" or' - + ' ../tjJobType = "LOGGED_MBSFN_MDT"'; + leaf MDTLoggingEventThreshold { + 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 MDTReportType is configured for event triggered reporting and when - tjMDTEventListForTriggeredMeasurement is configured for L1 event. + MDTEventListForTriggeredMeasurement 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 MDTLoggedHysteresis { + 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 MDTReportType is configured for event triggered reporting and when - tjMDTEventListForTriggeredMeasurement is configured for L1 event. + MDTEventListForTriggeredMeasurement 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"'; + leaf MDTLoggedTimeToTrigger { + when '../jobType = "LOGGED_MDT_ONLY" or ' + + '../jobType = "LOGGED_MBSFN_MDT"'; type int32 ; 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 MDTReportType is configured for event triggered reporting and when - tjMDTEventListForTriggeredMeasurement is configured for L1 event. + MDTEventListForTriggeredMeasurement 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"'; + leaf-list MDTMBSFNAreaList { + when '../jobType = "LOGGED_MBSFN_MDT"'; type string; min-elements 1; max-elements 8; @@ -834,9 +851,9 @@ module _3gpp-common-trace { reference "5.10.25 of 3GPP TS 32.422"; } - leaf tjMDTMeasurementPeriodLTE { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf MDTMeasurementPeriodLTE { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|1280|2048|2560|5120|" +"10240|60000"; @@ -850,9 +867,9 @@ 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 MDTMeasurementPeriodUMTS { + 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"; @@ -866,9 +883,9 @@ 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"'; + leaf MDTMeasurementQuantity { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint64 ; mandatory true; description "It specifies the measurements that are collected in an MDT @@ -876,9 +893,9 @@ module _3gpp-common-trace { reference "Clause 5.10.15 of 3GPP TS 32.422"; } - leaf tjMDTM4ThresholdUmts { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf MDTM4ThresholdUmts { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { range 0..31 ; } @@ -889,8 +906,8 @@ module _3gpp-common-trace { reference "3GPP TS 32.422 clause 5.10.A"; } - list tjMDTPLMList { - when '../tjJobType = "LOGGED_MDT_ONLY"'; + list MDTPLMList { + when '../jobType = "LOGGED_MDT_ONLY"'; key "mcc mnc"; uses types3gpp:PLMNId; min-elements 1; @@ -900,9 +917,9 @@ module _3gpp-common-trace { reference "Clause 5.10.24 of 3GPP TS 32.422"; } - leaf tjMDTPositioningMethod { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + leaf MDTPositioningMethod { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { enum GNSS; enum E_CELL_ID; @@ -913,9 +930,9 @@ module _3gpp-common-trace { reference "Clause 5.10.19 of 3GPP TS 32.422"; } - leaf tjMDTReportAmount { - when '../tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' and ../tjMDTReportingTrigger = "PERIODICAL"'; + leaf MDTReportAmount { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' and ../MDTReportingTrigger = "PERIODICAL"'; type union { type uint32 { range "1|4|8|16|32|64" ; @@ -928,13 +945,13 @@ module _3gpp-common-trace { 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 + MDTReportingTrigger 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 MDTReportingTrigger { + when '../jobType = "IMMEDIATE_MDT_ONLY"'; type enumeration { enum PERIODICAL; enum A2_FOR_LTE; @@ -947,15 +964,15 @@ 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) + MDTListOfMeasurements 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 MDTReportInterval { + when '../jobType = "IMMEDIATE_MDT_ONLY"' + + ' and ../MDTReportingTrigger = "PERIODICAL"'; type uint32 { range "120|240|250|480|500|640|1000|1024|2000|2048|3000|4000|" +"5120|6000|8000|10240|12000|16000|20000|" @@ -967,13 +984,13 @@ module _3gpp-common-trace { 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 + MDTReportingTrigger 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 MDTReportType { + when '../jobType = "LOGGED_MDT_ONLY"'; type enumeration { enum PERIODICAL; enum EVENT_TRIGGERED; @@ -983,7 +1000,7 @@ module _3gpp-common-trace { reference "Clause 5.10.27 of 3GPP TS 32.422"; } - leaf tjMDTSensorInformation { + leaf MDTSensorInformation { type bits { bit BAROMETRIC_PRESSURE; bit UE_SPEED; @@ -997,9 +1014,9 @@ 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"'; + leaf MDTTraceCollectionEntityID { + when '../jobType = "LOGGED_MDT_ONLY" or ' + + '../jobType = "LOGGED_MBSFN_MDT"'; type uint8; mandatory true; description "It specifies the TCE Id which is sent to the UE in @@ -1027,7 +1044,7 @@ module _3gpp-common-trace { 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 + traceCollectionEntityAddress or streamingTraceConsumerUri to be his own. When a MnS consumer wishes to deactivate a Trace Job, the MnS consumer @@ -1036,51 +1053,51 @@ module _3gpp-common-trace { 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 + 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 + attributes jobType, traceReference, traceRecordSessionReference, + traceCollectionEntityAddress and traceReportingFormat 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 + traceReportingFormat, streamingTraceConsumerURI 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, traceTarget and + triggeringEvent. - For this case the optional attribute tjListOfInterfaces allows to + 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 + - traceTarget + - MDTAnonymizationOfData, + - MDTListOfMeasurements, + - MDTCollectionPeriodRrmUmts (conditional for M3, M4 and M5 in UMTS), + - MDTMeasurementPeriodUMTS (conditional for M6 and M7 in UMTS), + - MDTCollectionPeriodRrmLte (conditional for M2 and M3 in LTE), + - MDTMeasurementPeriodLTE (conditional for M4 and M5 in LTE), + - MDTCollectionPeriodM6Lte (conditional for M6 in LTE), + - MDTCollectionPeriodM7Lte (conditional for M7 in LTE), + - MDTCollectionPeriodRrmNR (conditional for M4 and M5 in NR), + - MDTCollectionPeriodM6NR (conditional for M6 in NR), + - MDTCollectionPeriodM7NR (conditional for M7 in NR), + - MDTReportInterval (conditional for M1 in LTE or NR and M1/M2 in UMTS), - - tjMDTReportAmount (conditional for M1 in LTE or NR and M1/M2 in + - MDTReportAmount (conditional for M1 in LTE or NR and M1/M2 in UMTS), - - tjMDTReportingTrigger (conditional for M1 in LTE or NR and M1/M2 in + - MDTReportingTrigger (conditional for M1 in LTE or NR and M1/M2 in UMTS), - - tjMDTEventThreshold (conditional for A2 event reporting or A2 event + - MDTEventThreshold (conditional for A2 event reporting or A2 event triggered periodic reporting), - - tjMDTMeasurementQuantity (conditional for 1F event reporting). + - MDTMeasurementQuantity (conditional for 1F event reporting). - For this case the optional attribute tjMDTAreaScope allows to specify + For this case the optional attribute MDTAreaScope 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 + attributes MDTPositioningMethod, MDTSensorInformation allow to specify the positioning methods to use or the sensor information to include. @@ -1088,30 +1105,30 @@ module _3gpp-common-trace { TRACE_ONLY and IMMEDIATE_MDT_ONLY shall apply. - In case of LOGGED_MDT_ONLY additionally the following attributes - shall be available: tjTraceTarget, tjMDTAnonymizationOfData, - tjMDTTraceCollectionEntityID, tjMDTLoggingInterval, - tjMDTLoggingDuration, tjMDTReportType, - tjMDTEventListForTriggeredMeasurements. + shall be available: traceTarget, MDTAnonymizationOfData, + MDTTraceCollectionEntityID, MDTLoggingInterval, + MDTLoggingDuration, MDTReportType, + MDTEventListForTriggeredMeasurements. - For this case the optional attribute tjMDTAreaScope allows to specify + For this case the optional attribute MDTAreaScope 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, + MDTPLMNList 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 + MDTAreaConfigurationForNeighCell 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 + MDTSensorInformation 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 + attribute traceTarget shall be available, the optional attribute + MDTAreaScope 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. + shall be available: MDTAnonymizationOfData, MDTLoggingInterval, + MDTLoggingDuration, MDTMBSFNAreaList. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created and deleted by @@ -1124,4 +1141,4 @@ module _3gpp-common-trace { } } } -} \ No newline at end of file +} -- GitLab From 81e43ca259369f9facd7d7dc7dd0648496cf78ec Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 7 Mar 2023 16:22:52 +0100 Subject: [PATCH 02/11] Locally merged merge_requests/521 due to merge conflicts; CR0232 S5-233140 --- yang-models/_3gpp-common-trace.yang | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index fe2f8de80..8973508d2 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -22,6 +22,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-02-17 { reference "CR-0232"; } revision 2023-02-15 { reference "CR-0236"; } revision 2022-04-27 { reference "CR-0159"; } revision 2021-10-18 { reference "CR-0139"; } @@ -470,15 +471,6 @@ module _3gpp-common-trace { The attribute is applicable for both Trace and MDT."; } - leaf traceRecordSessionReference { - type string; - mandatory true; - 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 traceReportingFormat { type enumeration { enum FILE_BASED; @@ -1053,9 +1045,14 @@ module _3gpp-common-trace { For details of management Trace Job activation/deactivation see clause 4.1.1.1.2 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 traceReference is populated by the + consumer that makes the request for a Trace Session. + The attribute jobType specifies the kind of data to collect. Dependent on the selected type various parameters shall be available. The - attributes jobType, traceReference, traceRecordSessionReference, + attributes jobType, traceReference, traceCollectionEntityAddress and traceReportingFormat are mandatory for all job types. If streaming reporting is selected for traceReportingFormat, streamingTraceConsumerURI shall be present @@ -1141,4 +1138,4 @@ module _3gpp-common-trace { } } } -} +} \ No newline at end of file -- GitLab From 33d5a778495d67235641107338c2c494a4d8da1b Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 17 Feb 2023 17:32:39 +0000 Subject: [PATCH 03/11] Update _3gpp-common-measurements.yang --- yang-models/_3gpp-common-measurements.yang | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 793965106..5e2f8c332 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -54,6 +54,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-02-15 { reference "CR-0239"} revision 2022-11-03 { reference "CR-0193"; } revision 2022-10-31 { reference CR-0195; } revision 2021-07-22 { reference "CR-0137"; } @@ -193,6 +194,8 @@ module _3gpp-common-measurements { range 1..max ; } units seconds; + description "Reporting periods supported for the associated + measurement types. The period is defined in seconds."; } leaf-list reportingMethods { @@ -204,13 +207,13 @@ module _3gpp-common-measurements { min-elements 1; } - leaf-list monitorGranularityPeriods { + leaf-list reportingPeriods { type uint32 { range 1..max ; } units seconds; - description "Granularity periods supported for the monitoring of - associated measurement types for thresholds"; + description "Reporting periods supported for the associated + measurement types. The period is defined in seconds."; } } } @@ -446,6 +449,9 @@ module _3gpp-common-measurements { A threshold monitor checks for threshold crossings of performance metric values and generates a notification when that happens. + The ThresholdMonitor shall be used only when NRM based threshold + monitoring is supported. + To activate threshold monitoring, a MnS consumer needs to create a ThresholdMonitor instance on the MnS producer. For ultimate deactivation of threshold monitoring, the MnS consumer should delete the monitor to @@ -477,6 +483,8 @@ module _3gpp-common-measurements { Multiple thresholds can be defined for multiple performance metric sets in a single monitor using thresholdInfoList. The attribute monitorGranularityPeriod defines the granularity period to be applied. + The value is a supported GP for the measurements being monitored. + Threshold crossing behaviour is as defined in [54], Annex F. Each threshold is identified with a number (key) called thresholdLevel. A threshold is defined using the attributes thresholdValue , @@ -516,4 +524,4 @@ module _3gpp-common-measurements { } } } -} \ No newline at end of file +} -- GitLab From 15df6cc6b7a0ca1ed593ad1b3b361ea7713827f3 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 17 Feb 2023 17:33:10 +0000 Subject: [PATCH 04/11] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 6629b061a..1b2b76acf 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -151,7 +151,7 @@ components: - FILE_BASED_LOC_SET_BY_PRODUCER - FILE_BASED_LOC_SET_BY_CONSUMER - STREAM_BASED - monitorGranularityPeriods: + reportingPeriods: type: array items: type: integer -- GitLab From 1369b48e4b41c377ccf8c73c182a199ef34b8846 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 17 Feb 2023 17:40:59 +0000 Subject: [PATCH 05/11] Update _3gpp-common-measurements.yang --- yang-models/_3gpp-common-measurements.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 5e2f8c332..948635245 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -54,7 +54,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; - revision 2023-02-15 { reference "CR-0239"} + revision 2023-02-15 { reference "CR-0239";} revision 2022-11-03 { reference "CR-0193"; } revision 2022-10-31 { reference CR-0195; } revision 2021-07-22 { reference "CR-0137"; } -- GitLab From c18a4e3222f01d995cd38cf79442b56b5f30c985 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 17 Feb 2023 17:47:29 +0000 Subject: [PATCH 06/11] Update _3gpp-common-measurements.yang --- yang-models/_3gpp-common-measurements.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 948635245..e98c6321b 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -313,6 +313,7 @@ module _3gpp-common-measurements { min-elements 1; leaf idx { type uint32 ; } uses ThresholdInfoGrp; + description "List of threshold info."; } leaf monitorGranularityPeriod { -- GitLab From 9d7cc1c174752679620decc4e12f54489832d438 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 17 Feb 2023 18:22:30 +0000 Subject: [PATCH 07/11] Update _3gpp-common-measurements.yang --- yang-models/_3gpp-common-measurements.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index e98c6321b..a7c2ca975 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -194,7 +194,7 @@ module _3gpp-common-measurements { range 1..max ; } units seconds; - description "Reporting periods supported for the associated + description "Granularity periods supported for the associated measurement types. The period is defined in seconds."; } -- GitLab From 39a437cf69fbf597078e30ca62402471a4fb11f7 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 2 Mar 2023 23:43:53 +0000 Subject: [PATCH 08/11] Update _3gpp-common-measurements.yang --- yang-models/_3gpp-common-measurements.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index a7c2ca975..d0f016856 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -450,7 +450,7 @@ module _3gpp-common-measurements { A threshold monitor checks for threshold crossings of performance metric values and generates a notification when that happens. - The ThresholdMonitor shall be used only when NRM based threshold + The ThresholdMonitor is used only when NRM based threshold monitoring is supported. To activate threshold monitoring, a MnS consumer needs to create a @@ -484,8 +484,8 @@ module _3gpp-common-measurements { Multiple thresholds can be defined for multiple performance metric sets in a single monitor using thresholdInfoList. The attribute monitorGranularityPeriod defines the granularity period to be applied. - The value is a supported GP for the measurements being monitored. - Threshold crossing behaviour is as defined in [54], Annex F. + The value is a multiple of a supported GP for the measurements being + monitored. Each threshold is identified with a number (key) called thresholdLevel. A threshold is defined using the attributes thresholdValue , -- GitLab From a456971f1476c105a78f315e34816bda485b692f Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 2 Mar 2023 23:55:10 +0000 Subject: [PATCH 09/11] Update _3gpp-common-measurements.yang --- yang-models/_3gpp-common-measurements.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index d0f016856..a77751a94 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -484,8 +484,8 @@ module _3gpp-common-measurements { Multiple thresholds can be defined for multiple performance metric sets in a single monitor using thresholdInfoList. The attribute monitorGranularityPeriod defines the granularity period to be applied. - The value is a multiple of a supported GP for the measurements being - monitored. + The value is a multiple of a supported granularity period for the + measurements being monitored. Each threshold is identified with a number (key) called thresholdLevel. A threshold is defined using the attributes thresholdValue , -- GitLab From e937b6a12421970315012b4ecd58f8acbc18c7cb Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 11 Apr 2023 14:03:56 +0200 Subject: [PATCH 10/11] Updated TS28623_GenericNrm.yaml as it did not match the release branch. As this is a YANG integration branch no YAML changes allowed. --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 1b2b76acf..6629b061a 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -151,7 +151,7 @@ components: - FILE_BASED_LOC_SET_BY_PRODUCER - FILE_BASED_LOC_SET_BY_CONSUMER - STREAM_BASED - reportingPeriods: + monitorGranularityPeriods: type: array items: type: integer -- GitLab From 3d26cadc397d331f08b021dad6637d8abe813ca2 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 11 Apr 2023 14:13:51 +0200 Subject: [PATCH 11/11] Small corrections, to follow the Word document. No functional effect. --- yang-models/_3gpp-5gc-nrm-externalseppfunction.yang | 2 +- yang-models/_3gpp-5gc-nrm-scpfunction.yang | 2 +- yang-models/_3gpp-common-managementdatacollection.yang | 2 +- yang-models/_3gpp-common-measurements.yang | 2 +- yang-models/_3gpp-common-mnsregistry.yang | 4 ++-- yang-models/_3gpp-nr-nrm-rrmpolicy.yang | 1 - yang-models/_3gpp-ns-nrm-networkslice.yang | 3 +-- yang-models/_3gpp-ns-nrm-networkslicesubnet.yang | 2 +- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang index 38496aaaa..ac3559949 100755 --- a/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-externalseppfunction.yang @@ -18,7 +18,7 @@ module _3gpp-5gc-nrm-externalseppfunction { revision 2019-11-17 { description "initial revision"; reference "Based on - 3GPP TS 28.541 V16.X.XX"; + 3GPP TS 28.541 "; } grouping ExternalSEPPFunctionGrp { diff --git a/yang-models/_3gpp-5gc-nrm-scpfunction.yang b/yang-models/_3gpp-5gc-nrm-scpfunction.yang index aa1f98072..2c66300b3 100755 --- a/yang-models/_3gpp-5gc-nrm-scpfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-scpfunction.yang @@ -17,7 +17,7 @@ module _3gpp-5gc-nrm-scpfunction { revision 2019-10-20 { description "initial revision"; reference "Based on - 3GPP TS 28.541 V16.X.XX"; + 3GPP TS 28.541 "; } grouping SCPFunctionGrp { diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 1d779c639..0704facf5 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -262,4 +262,4 @@ module _3gpp-common-managementdatacollection { } } -} +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index a77751a94..9162c103d 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -525,4 +525,4 @@ module _3gpp-common-measurements { } } } -} +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index e4336a99e..e673110cb 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -87,7 +87,7 @@ module _3gpp-common-mnsregistry { uses top3gpp:Top_Grp; key "mnsType mnsVersion mnsAddress"; uses MnsInfoGrp; + } } - } -} + } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang index e968dc14e..65a7ac1a4 100755 --- a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang +++ b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang @@ -195,5 +195,4 @@ module _3gpp-nr-nrm-rrmpolicy { augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { uses RrmPolicySubtree; } - } \ No newline at end of file diff --git a/yang-models/_3gpp-ns-nrm-networkslice.yang b/yang-models/_3gpp-ns-nrm-networkslice.yang index a606c96e1..e61b3dd6d 100755 --- a/yang-models/_3gpp-ns-nrm-networkslice.yang +++ b/yang-models/_3gpp-ns-nrm-networkslice.yang @@ -19,7 +19,7 @@ module _3gpp-ns-nrm-networkslice { Information model definitions for network slice NRM (chapter 6) "; - revision 2022-07-26 { reference CR-balazs145-r17-541-yang-corrections ; } + revision 2022-07-26 { reference CR-0769; } revision 2020-06-02 { reference "CR-0485, CR-0508"; } @@ -31,7 +31,6 @@ module _3gpp-ns-nrm-networkslice { grouping NetworkSliceGrp { description "Represents the NetworkSlice IOC"; - leaf operationalState { description "The operational state of the network slice instance. It describes whether or not the resource is installed diff --git a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang index 42584f70d..400c14a8a 100755 --- a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang +++ b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang @@ -21,7 +21,7 @@ module _3gpp-ns-nrm-networkslicesubnet { Information model definitions for network slice NRM (chapter 6) "; - revision 2022-07-26 { reference CR-balazs145-r17-541-yang-corrections ; } + revision 2022-07-26 { reference CR-0769; } revision 2021-05-05 { description "replace perfReq with 3 new datatypes xxxSliceSubnetProfile"; reference "CR-0485"; -- GitLab