From 34a418890c179f36826c841ff70709f6357c93d9 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:20:36 +0000 Subject: [PATCH 01/15] Adding MCE ID --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 7ddb27b0b..bc7a4addb 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -141,8 +141,33 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "This attribute determines whether the DAPS handover function is enabled or disabled."; } + + leaf-list mceIdMappingInfoList { + type MceIdMappingInfoGrp; + description "List of the mapping relationship between MCE identity, + PLMN where MCE resides and the IP address of the MCE."; + key idx; + min-elements 1; + uses MceIdMappingInfoGrp; + leaf idx { type string; } + } } + grouping MceIdMappingInfoGrp { + leaf qoECollectionEntityAddress { + type inet:ip-address; + mandatory true; + description "Specifies the address to which the QMC records shall be + transferred. Ipv4 or Ipv6 address(es) may be used."; + } + + leaf qoECollectionEntityIdentity { + type string; + description "Specifies the unique identity to which the QMC records + shall be transferred."; + } + } + augment "/me3gpp:ManagedElement" { list GNBCUCPFunction { -- GitLab From 92303fad5b9355018e990ea69ac5b71644d240ed Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:23:20 +0000 Subject: [PATCH 02/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index bc7a4addb..fa2ad1207 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -143,7 +143,6 @@ module _3gpp-nr-nrm-gnbcucpfunction { } leaf-list mceIdMappingInfoList { - type MceIdMappingInfoGrp; description "List of the mapping relationship between MCE identity, PLMN where MCE resides and the IP address of the MCE."; key idx; -- GitLab From 862e6431516700da05dde804ee0b612cc70d0790 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:25:45 +0000 Subject: [PATCH 03/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index fa2ad1207..5110d5956 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -142,7 +142,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { is enabled or disabled."; } - leaf-list mceIdMappingInfoList { + list mceIdMappingInfoList { description "List of the mapping relationship between MCE identity, PLMN where MCE resides and the IP address of the MCE."; key idx; -- GitLab From 0ee62487eaf16252807168f557831e00044a303e Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:29:38 +0000 Subject: [PATCH 04/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 5110d5956..a49252843 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -9,6 +9,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } + import ietf-inet-types { prefix inet; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -18,6 +19,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-01-10 { reference CR-1138 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2022-07-28 { reference "CR-0770"; } -- GitLab From 15f7417bd5e9ae7ef1eb6ccbfcc2cd6e0071cf45 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:53:10 +0000 Subject: [PATCH 05/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index a49252843..767f7508d 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -167,6 +167,15 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "Specifies the unique identity to which the QMC records shall be transferred."; } + + leaf pLMNTarget { + description "The PLMN identifier where MCE resides. "; + key "mcc mnc"; + min-elements 1; + max-elements 1; + yext3gpp:inVariant; + uses types3gpp:PLMNId; + } } augment "/me3gpp:ManagedElement" { -- GitLab From 5bd6d64061721f7de035a1412a1131772e0fb937 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:56:24 +0000 Subject: [PATCH 06/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 -- 1 file changed, 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 767f7508d..ce07b4a2b 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -171,8 +171,6 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf pLMNTarget { description "The PLMN identifier where MCE resides. "; key "mcc mnc"; - min-elements 1; - max-elements 1; yext3gpp:inVariant; uses types3gpp:PLMNId; } -- GitLab From b2c4ff48ee8913ccd9d427d6a846b24c3e699f4a Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:57:16 +0000 Subject: [PATCH 07/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 -- 1 file changed, 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index ce07b4a2b..8efdb4f27 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -170,8 +170,6 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf pLMNTarget { description "The PLMN identifier where MCE resides. "; - key "mcc mnc"; - yext3gpp:inVariant; uses types3gpp:PLMNId; } } -- GitLab From 2192a7d4640e89fb403037dc0df47455d9cc69a6 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 13:00:33 +0000 Subject: [PATCH 08/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 8efdb4f27..b4c8a02ce 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -170,7 +170,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf pLMNTarget { description "The PLMN identifier where MCE resides. "; - uses types3gpp:PLMNId; + type types3gpp:PLMNId; } } -- GitLab From a43252a7aef4ee2c9fd28b183279563ebb2379a9 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 13:04:47 +0000 Subject: [PATCH 09/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index b4c8a02ce..439cbb130 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -168,9 +168,13 @@ module _3gpp-nr-nrm-gnbcucpfunction { shall be transferred."; } - leaf pLMNTarget { + list pLMNTarget { description "The PLMN identifier where MCE resides. "; - type types3gpp:PLMNId; + key "mcc mnc"; + min-elements 1; + max-elements 1; + yext3gpp:inVariant; + uses types3gpp:PLMNId; } } -- GitLab From 8c2eea506e1d74b5c09659724e02f30b6382ec86 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 15:50:57 +0000 Subject: [PATCH 10/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 439cbb130..ab4d43946 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -144,32 +144,34 @@ module _3gpp-nr-nrm-gnbcucpfunction { is enabled or disabled."; } - list mceIdMappingInfoList { - description "List of the mapping relationship between MCE identity, - PLMN where MCE resides and the IP address of the MCE."; + list qceIdMappingInfoList { + description "List of the mapping relationship between QoE collection entity + identity, PLMN where QoE collection entity resides, and the IP address of + the QoE collection entity."; key idx; min-elements 1; - uses MceIdMappingInfoGrp; + uses QceIdMappingInfoGrp; leaf idx { type string; } } } - grouping MceIdMappingInfoGrp { + grouping QceIdMappingInfoGrp { leaf qoECollectionEntityAddress { type inet:ip-address; mandatory true; - description "Specifies the address to which the QMC records shall be + description "Specifies the address to which the QMC reports shall be transferred. Ipv4 or Ipv6 address(es) may be used."; } leaf qoECollectionEntityIdentity { type string; - description "Specifies the unique identity to which the QMC records + description "Specifies the unique identity to which the QMC reports shall be transferred."; } list pLMNTarget { - description "The PLMN identifier where MCE resides. "; + description "The PLMN identifier where QoE collection entity + resides. "; key "mcc mnc"; min-elements 1; max-elements 1; -- GitLab From 5dce24930f793121a022e16d5d367f8743a26298 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 21:20:55 +0000 Subject: [PATCH 11/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index ab4d43946..6572c0556 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -163,11 +163,21 @@ module _3gpp-nr-nrm-gnbcucpfunction { transferred. Ipv4 or Ipv6 address(es) may be used."; } - leaf qoECollectionEntityIdentity { - type string; + list qoECollectionEntityIdentity { + key idx; + min-elements 1; + uses qoECollectionEntityIdGrp; + leaf idx { type string; } description "Specifies the unique identity to which the QMC reports shall be transferred."; } + } + + grouping qoECollectionEntityIdGrp { + leaf qoECollectionEntityId { + type string; + description "Specifies the unique identity within a PLMN."; + } list pLMNTarget { description "The PLMN identifier where QoE collection entity @@ -179,7 +189,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses types3gpp:PLMNId; } } - + augment "/me3gpp:ManagedElement" { list GNBCUCPFunction { -- GitLab From 83e7980f4d26733f24ecc125c54089754c6045b1 Mon Sep 17 00:00:00 2001 From: zu Date: Wed, 17 Jan 2024 16:16:23 +0000 Subject: [PATCH 12/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 6572c0556..90e92e2ff 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -15,11 +15,11 @@ module _3gpp-nr-nrm-gnbcucpfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBCUCPFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-01-10 { reference CR-1138 ; } + revision 2024-01-12 { reference CR-1138 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2022-07-28 { reference "CR-0770"; } @@ -171,14 +171,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "Specifies the unique identity to which the QMC reports shall be transferred."; } - } - - grouping qoECollectionEntityIdGrp { - leaf qoECollectionEntityId { - type string; - description "Specifies the unique identity within a PLMN."; - } - + list pLMNTarget { description "The PLMN identifier where QoE collection entity resides. "; -- GitLab From a77e7d78233335fef83249c6cbaadf4cb592fbf1 Mon Sep 17 00:00:00 2001 From: zu Date: Wed, 17 Jan 2024 16:20:53 +0000 Subject: [PATCH 13/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 90e92e2ff..613cecf1c 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -163,11 +163,9 @@ module _3gpp-nr-nrm-gnbcucpfunction { transferred. Ipv4 or Ipv6 address(es) may be used."; } - list qoECollectionEntityIdentity { - key idx; - min-elements 1; - uses qoECollectionEntityIdGrp; - leaf idx { type string; } + leaf qoECollectionEntityIdentity { + type string; + mandatory true; description "Specifies the unique identity to which the QMC reports shall be transferred."; } @@ -180,6 +178,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { max-elements 1; yext3gpp:inVariant; uses types3gpp:PLMNId; + mandatory true; } } -- GitLab From 03620862703c087adf87fac501d33ddc268b9d88 Mon Sep 17 00:00:00 2001 From: zu Date: Wed, 17 Jan 2024 16:23:23 +0000 Subject: [PATCH 14/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 3 --- 1 file changed, 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 613cecf1c..b73b0bca1 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -158,14 +158,12 @@ module _3gpp-nr-nrm-gnbcucpfunction { grouping QceIdMappingInfoGrp { leaf qoECollectionEntityAddress { type inet:ip-address; - mandatory true; description "Specifies the address to which the QMC reports shall be transferred. Ipv4 or Ipv6 address(es) may be used."; } leaf qoECollectionEntityIdentity { type string; - mandatory true; description "Specifies the unique identity to which the QMC reports shall be transferred."; } @@ -178,7 +176,6 @@ module _3gpp-nr-nrm-gnbcucpfunction { max-elements 1; yext3gpp:inVariant; uses types3gpp:PLMNId; - mandatory true; } } -- GitLab From ee2f5995f963f319d4b6190fc3611c22712815f2 Mon Sep 17 00:00:00 2001 From: zu Date: Fri, 2 Feb 2024 09:17:47 +0000 Subject: [PATCH 15/15] Update file _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index b73b0bca1..d7e206c64 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -159,7 +159,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf qoECollectionEntityAddress { type inet:ip-address; description "Specifies the address to which the QMC reports shall be - transferred. Ipv4 or Ipv6 address(es) may be used."; + transferred. Ipv4 or Ipv6 address may be used."; } leaf qoECollectionEntityIdentity { -- GitLab