From a3e83237c4411d02075997b75f02ad3322ae2f93 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 3 Apr 2024 11:23:29 +0000 Subject: [PATCH 1/2] add mdtUserConsentList --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 19 +++++++++++++++++ yang-models/_3gpp-5gc-nrm-udmfunction.yang | 20 ++++++++++++++++++ yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 21 +++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index eb3a3e1ef..6a9fd05d6 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -17,6 +17,7 @@ module _3gpp-5gc-nrm-amffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } @@ -224,6 +225,24 @@ module _3gpp-5gc-nrm-amffunction { uses satelliteBackhaulInfo; } + leaf-list mdtUserConsentReqList { + type enumeration { + enum M1; + enum M2; + enum M3; + enum M4; + enum M5; + enum M6; + enum M7; + enum M8; + enum M9; + enum MDT_UE_LOCATION; + } + description "represents a list of MDT measurement names that are that are + subject to user consent at MDT activation. + Any MDT measurement, whose name is not specified in this list, is not + subject to user consent at MDT activation.."; + } } augment "/me3gpp:ManagedElement" { diff --git a/yang-models/_3gpp-5gc-nrm-udmfunction.yang b/yang-models/_3gpp-5gc-nrm-udmfunction.yang index b799b2cbb..64ceed9a1 100755 --- a/yang-models/_3gpp-5gc-nrm-udmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udmfunction.yang @@ -19,6 +19,7 @@ module _3gpp-5gc-nrm-udmfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -74,6 +75,25 @@ module _3gpp-5gc-nrm-udmfunction { reference "3GPP TS 23.501"; uses types5g3gpp:CommModel; } + + leaf-list mdtUserConsentReqList { + type enumeration { + enum M1; + enum M2; + enum M3; + enum M4; + enum M5; + enum M6; + enum M7; + enum M8; + enum M9; + enum MDT_UE_LOCATION; + } + description "represents a list of MDT measurement names that are that are + subject to user consent at MDT activation. + Any MDT measurement, whose name is not specified in this list, is not + subject to user consent at MDT activation.."; + } } augment "/me3gpp:ManagedElement" { diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index d7e206c64..c0300a5b3 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -19,6 +19,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + + revision 2024-04-04 { reference CR-1139; } revision 2024-01-12 { reference CR-1138 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -153,6 +155,25 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses QceIdMappingInfoGrp; leaf idx { type string; } } + + leaf-list mdtUserConsentReqList { + type enumeration { + enum M1; + enum M2; + enum M3; + enum M4; + enum M5; + enum M6; + enum M7; + enum M8; + enum M9; + enum MDT_UE_LOCATION; + } + description "represents a list of MDT measurement names that are that are + subject to user consent at MDT activation. + Any MDT measurement, whose name is not specified in this list, is not + subject to user consent at MDT activation.."; + } } grouping QceIdMappingInfoGrp { -- GitLab From cc398a9777fdf8346f486614dd472290250043d7 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Thu, 4 Apr 2024 19:54:37 +0000 Subject: [PATCH 2/2] Update 3 files - /yang-models/_3gpp-5gc-nrm-udmfunction.yang - /yang-models/_3gpp-5gc-nrm-amffunction.yang - /yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 4 ++-- yang-models/_3gpp-5gc-nrm-udmfunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 6a9fd05d6..2d5420520 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -238,10 +238,10 @@ module _3gpp-5gc-nrm-amffunction { enum M9; enum MDT_UE_LOCATION; } - description "represents a list of MDT measurement names that are that are + description "represents a list of MDT measurement names that are subject to user consent at MDT activation. Any MDT measurement, whose name is not specified in this list, is not - subject to user consent at MDT activation.."; + subject to user consent at MDT activation."; } } diff --git a/yang-models/_3gpp-5gc-nrm-udmfunction.yang b/yang-models/_3gpp-5gc-nrm-udmfunction.yang index 64ceed9a1..7e23d0df0 100755 --- a/yang-models/_3gpp-5gc-nrm-udmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udmfunction.yang @@ -89,10 +89,10 @@ module _3gpp-5gc-nrm-udmfunction { enum M9; enum MDT_UE_LOCATION; } - description "represents a list of MDT measurement names that are that are + description "represents a list of MDT measurement names that are subject to user consent at MDT activation. Any MDT measurement, whose name is not specified in this list, is not - subject to user consent at MDT activation.."; + subject to user consent at MDT activation."; } } diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index c0300a5b3..94c12c2f9 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -169,10 +169,10 @@ module _3gpp-nr-nrm-gnbcucpfunction { enum M9; enum MDT_UE_LOCATION; } - description "represents a list of MDT measurement names that are that are + description "represents a list of MDT measurement names that are subject to user consent at MDT activation. Any MDT measurement, whose name is not specified in this list, is not - subject to user consent at MDT activation.."; + subject to user consent at MDT activation."; } } -- GitLab