From a2d7faa6e30ee6ed63d3ed2c5b02cd7291d8ab1e Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Sun, 12 Jun 2022 19:44:08 +0200 Subject: [PATCH 1/3] Locally merged S5-223502 branch 28.541_Rel16_CR0730_Update_5QI_Set_Description because web rebase failed. --- yang-models/_3gpp-5gc-nrm-configurable5qiset.yang | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang index 2a402a96e..407f6f4f4 100755 --- a/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-configurable5qiset.yang @@ -10,11 +10,12 @@ module _3gpp-5gc-nrm-configurable5qiset { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the non-standardized 5QIs, including + description "This IOC represents the configurable 5QIs, including their QoS characteristics, that need to be pre-configured (and configurable) to the 5G NFs."; reference "3GPP TS 28.541"; + revision 2022-04-29 { reference "CR-0730"; } revision 2020-08-03 { reference "CR-0321"; } revision 2020-06-03 { reference "CR-0286"; } @@ -122,4 +123,4 @@ module _3gpp-5gc-nrm-configurable5qiset { augment "/me3gpp:ManagedElement" { uses Configurable5QISetSubtree; } -} \ No newline at end of file +} -- GitLab From 543e0820dbfbe76d18abe02d315dc33c84bd6435 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 24 Mar 2022 04:55:49 +0000 Subject: [PATCH 2/3] Incorrect path addressing has been corrected. Incorrect trace attribute names have been corrected. Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 99 +++++++++++++++-------------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index b559ab193..7423eaea9 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 2022-03-24 { reference "draftCR"; } revision 2021-10-18 { reference "CR-0139"; } revision 2021-07-22 { reference "CR-0137"; } revision 2021-01-25 { reference "CR-0122"; } @@ -396,7 +397,7 @@ module _3gpp-common-trace { } leaf tjStreamingTraceConsumerURI { - when './tjTraceReportingFormat = "STREAMING"'; + when '../tjTraceReportingFormat = "STREAMING"'; type inet:uri; mandatory true; description "URI of the Streaming Trace data reporting MnS consumer @@ -408,8 +409,8 @@ module _3gpp-common-trace { } leaf tjTraceCollectionEntityAddress { - when './tjTraceReportingFormat = "FILE_BASED" or ' - +'./tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"'; + when '../tjTraceReportingFormat = "FILE_BASED" or ' + +'../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"'; type union { type inet:uri; type inet:ip-address; @@ -422,8 +423,8 @@ module _3gpp-common-trace { } leaf tjTraceDepth { - when './tjJobType = "TRACE_ONLY"' - + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "TRACE_ONLY"' + + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { enum MINIMUM; enum MEDIUM; @@ -540,7 +541,7 @@ module _3gpp-common-trace { } leaf tjTriggeringEvent { - when './tjJobType = "TRACE" or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "TRACE_ONLY" or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type string ; mandatory true; description "Specifies the triggering event parameter of the trace session. @@ -550,7 +551,7 @@ module _3gpp-common-trace { } leaf tjMDTAnonymizationOfData { - when ./tjMDTAreaScope ; + when ../tjMDTAreaScope ; type enumeration { enum NO_IDENTITY; enum TAC_OF_IMEI; @@ -561,7 +562,7 @@ module _3gpp-common-trace { } list tjMDTAreaConfigurationForNeighCell { - when './tjJobType = "LOGGED_MDT_ONLY"'; + when '../tjJobType = "LOGGED_MDT_ONLY"'; key "idx"; min-elements 1; leaf idx { type uint32 ; } @@ -603,8 +604,8 @@ module _3gpp-common-trace { } leaf tjMDTCollectionPeriodRrmLte { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|" +"24000|28000|32000|64000"; @@ -618,8 +619,8 @@ module _3gpp-common-trace { } leaf tjMDTCollectionPeriodM6Lte { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|2048|5120|10240"; } @@ -632,8 +633,8 @@ module _3gpp-common-trace { } leaf tjMDTCollectionPeriodM7Lte { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { range 1..60 ; } @@ -645,8 +646,8 @@ module _3gpp-common-trace { } leaf tjMDTCollectionPeriodRrmUmts { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|1280|2048|2560|5120|" +"10240|60000"; @@ -660,8 +661,8 @@ module _3gpp-common-trace { } leaf tjMDTCollectionPeriodRrmNR { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|2048|5120|10240|60000"; } @@ -674,8 +675,8 @@ module _3gpp-common-trace { } leaf tjMDTCollectionPeriodM6NR { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { enum 120ms; enum 240ms; @@ -700,8 +701,8 @@ module _3gpp-common-trace { } leaf tjMDTCollectionPeriodM7NR { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1..60"; } @@ -713,7 +714,7 @@ module _3gpp-common-trace { } leaf tjMDTEventListForTriggeredMeasurement { - when './tjJobType = "LOGGED_MDT_ONLY"'; + when '../tjJobType = "LOGGED_MDT_ONLY"'; type enumeration { enum OUT_OF_COVERAGE ; enum A2_EVENT ; @@ -739,7 +740,7 @@ module _3gpp-common-trace { } leaf tjMDTListOfMeasurements { - when './tjJobType = "IMMEDIATE_MDT"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"'; type int64; mandatory true; description "It specifies the UE measurements that shall be collected in @@ -749,7 +750,7 @@ module _3gpp-common-trace { } leaf tjMDTLoggingDuration { - when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"'; + when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "600|1200|2400|3600|5400|7200"; } @@ -763,7 +764,7 @@ module _3gpp-common-trace { } leaf tjMDTLoggingInterval { - when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"'; + when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "1280|2560|5120|10240|20480|" +"30720|40960|61440"; @@ -777,7 +778,7 @@ module _3gpp-common-trace { } leaf tjMDTLoggingEventThreshold { - when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"'; + when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "0..127"; } @@ -791,7 +792,7 @@ module _3gpp-common-trace { } leaf tjMDTLoggedHysteresis { - when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"'; + when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"'; type uint32 { range "0..30"; } @@ -805,7 +806,7 @@ module _3gpp-common-trace { } leaf tjMDTLoggedTimeToTrigger { - when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"'; + when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "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. @@ -817,7 +818,7 @@ module _3gpp-common-trace { } leaf-list tjMDTMBSFNAreaList { - when './tjJobType = "LOGGED_MBSFN_MDT"'; + when '../tjJobType = "LOGGED_MBSFN_MDT"'; type string; min-elements 1; max-elements 8; @@ -828,8 +829,8 @@ module _3gpp-common-trace { } leaf tjMDTMeasurementPeriodLTE { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "1024|1280|2048|2560|5120|" +"10240|60000"; @@ -844,8 +845,8 @@ module _3gpp-common-trace { } leaf tjMDTMeasurementPeriodUMTS { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + 'or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + 'or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|" +"24000|28000|32000|64000"; @@ -860,8 +861,8 @@ module _3gpp-common-trace { } leaf tjMDTMeasurementQuantity { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint64 ; mandatory true; description "It specifies the measurements that are collected in an MDT @@ -870,8 +871,8 @@ module _3gpp-common-trace { } leaf tjMDTM4ThresholdUmts { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { range 0..31 ; } @@ -883,7 +884,7 @@ module _3gpp-common-trace { } list tjMDTPLMList { - when './tjJobType = "LOGGED_MDT_ONLY"'; + when '../tjJobType = "LOGGED_MDT_ONLY"'; key "mcc mnc"; uses types3gpp:PLMNId; min-elements 1; @@ -894,8 +895,8 @@ module _3gpp-common-trace { } leaf tjMDTPositioningMethod { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + ' or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { enum GNSS; enum E_CELL_ID; @@ -907,8 +908,8 @@ module _3gpp-common-trace { } leaf tjMDTReportAmount { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' and ./tjMDTReportingTrigger = "PERIODICAL"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + ' and ../tjMDTReportingTrigger = "PERIODICAL"'; type union { type uint32 { range "1|4|8|16|32|64" ; @@ -927,7 +928,7 @@ module _3gpp-common-trace { } leaf tjMDTReportingTrigger { - when './tjJobType = "IMMEDIATE_MDT_ONLY"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"'; type enumeration { enum PERIODICAL; enum A2_FOR_LTE; @@ -947,8 +948,8 @@ module _3gpp-common-trace { } leaf tjMDTReportInterval { - when './tjJobType = "IMMEDIATE_MDT_ONLY"' - + ' and ./tjMDTReportingTrigger = "PERIODICAL"'; + when '../tjJobType = "IMMEDIATE_MDT_ONLY"' + + ' and ../tjMDTReportingTrigger = "PERIODICAL"'; type uint32 { range "120|240|250|480|500|640|1000|1024|2000|2048|3000|4000|" +"5120|6000|8000|10240|12000|16000|20000|" @@ -966,7 +967,7 @@ module _3gpp-common-trace { } leaf tjMDTReportType { - when './tjJobType = "LOGGED_MDT_ONLY"'; + when '../tjJobType = "LOGGED_MDT_ONLY"'; type enumeration { enum PERIODICAL; enum EVENT_TRIGGERED; @@ -991,7 +992,7 @@ module _3gpp-common-trace { } leaf tjMDTTraceCollectionEntityID { - when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"'; + when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"'; type uint8; mandatory true; description "It specifies the TCE Id which is sent to the UE in @@ -1116,4 +1117,4 @@ module _3gpp-common-trace { } } } -} \ No newline at end of file +} -- GitLab From 5cc779c2c3373b6848dd855a2eff14fa10d3e733 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Tue, 26 Apr 2022 16:16:34 +0000 Subject: [PATCH 3/3] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 7423eaea9..71035fbda 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -22,7 +22,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; - revision 2022-03-24 { reference "draftCR"; } + revision 2022-04-27 { reference "CR-0158"; } revision 2021-10-18 { reference "CR-0139"; } revision 2021-07-22 { reference "CR-0137"; } revision 2021-01-25 { reference "CR-0122"; } -- GitLab