From f0a9724871d16eef8601540b1d7370822b7c4a08 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 18 Jan 2024 23:35:35 +0100 Subject: [PATCH 01/57] The specification of the file is moved from 28.623 to 28.532 --- yang-models/_3gpp-common-fm.yang | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 2fa8fa914..219bb3c0c 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -14,16 +14,12 @@ module _3gpp-common-fm { description "Defines a Fault Management model Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; - 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)"; + reference "3GPP TS 28.111"; + revision 2024-01-18 { + description "The specification of the file is moved from 28.623 to 28.532"; + reference "28.623 CR-0315"; + } revision 2023-09-18 { reference CR-0271 ; } revision 2023-05-10 { reference CR-0250; } revision 2022-10-24 { reference CR-0196; } -- GitLab From 09c64cfbe8153e3561737cd0f300a0623d03586f Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 22 Jan 2024 16:24:55 +0000 Subject: [PATCH 02/57] Add dataNodeSelector Update _3gpp-common-subscription-control.yang --- .../_3gpp-common-subscription-control.yang | 74 ++++++++++--------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index e037ff83c..d426cb05e 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -18,6 +18,7 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2024-01-18 { reference CR-0329 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-10 { reference "CR0257 CR0260"; } revision 2022-10-20 { reference CR-0196; } @@ -42,45 +43,52 @@ module _3gpp-common-subscription-control { discriminated by notificationFilter attribute."; } - list scope { - key "scopeType"; - min-elements 1; - max-elements 1; + choice scope { description "Describes which object instances are selected with respect to a base object instance."; - leaf scopeType { - type enumeration { - enum BASE_ONLY; - enum BASE_ALL; - enum BASE_NTH_LEVEL; - enum BASE_SUBTREE; - } - description "If the optional scopeLevel parameter is not supported - or absent, allowed values of scopeType are BASE_ONLY and BASE_ALL. + + case type-level { + leaf scopeType { + type enumeration { + enum BASE_ONLY; + enum BASE_ALL; + enum BASE_NTH_LEVEL; + enum BASE_SUBTREE; + } + description "If the optional scopeLevel parameter is not supported + or absent, allowed values of scopeType are BASE_ONLY and BASE_ALL. - The value BASE_ONLY indicates only the base object is selected. - The value BASE_ALL indicates the base object and all of its - subordinate objects (incl. the leaf objects) are selected. + The value BASE_ONLY indicates only the base object is selected. + The value BASE_ALL indicates the base object and all of its + subordinate objects (incl. the leaf objects) are selected. - If the scopeLevel parameter is supported and present, allowed - values of scopeType are BASE_ALL, BASE_ONLY, BASE_NTH_LEVEL - and BASE_SUBTREE. + If the scopeLevel parameter is supported and present, allowed + values of scopeType are BASE_ALL, BASE_ONLY, BASE_NTH_LEVEL + and BASE_SUBTREE. - The value BASE_NTH_LEVEL indicates all objects on the level, - which is specified by the scopeLevel parameter, below the base - object are selected. The base object is at scopeLevel zero. - The value BASE_SUBTREE indicates the base object and all of its - subordinate objects down to and including the objects on the level, - which is specified by the scopeLevel parameter, are selected. - The base object is at scopeLevel zero."; - } + The value BASE_NTH_LEVEL indicates all objects on the level, + which is specified by the scopeLevel parameter, below the base + object are selected. The base object is at scopeLevel zero. + The value BASE_SUBTREE indicates the base object and all of its + subordinate objects down to and including the objects on the level, + which is specified by the scopeLevel parameter, are selected. + The base object is at scopeLevel zero."; + } - leaf scopeLevel { - when '../scopeType = "BASE_NTH_LEVEL" or ../scopeType = "BASE_SUBTREE"'; - type uint16; - mandatory true; - description "See description of scopeType."; + leaf scopeLevel { + when '../scopeType = "BASE_NTH_LEVEL" or ../scopeType = "BASE_SUBTREE"'; + type uint16; + mandatory true; + description "See description of scopeType."; + } + } + case dataNodeSelector { + leaf dataNodeSelector { + type string; + description "The value shall follow the rules of RFC 8641 + filter-spec"; + reference "RFC 8641 section 5."; + } } } @@ -288,4 +296,4 @@ module _3gpp-common-subscription-control { } } } -} \ No newline at end of file +} -- GitLab From 619a6c7de55ca9cfdb0077a006428d63c1a77e15 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 22 Jan 2024 16:29:38 +0000 Subject: [PATCH 03/57] Correct _3gpp-common-subscription-control.yang --- yang-models/_3gpp-common-subscription-control.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index d426cb05e..eaa22229d 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -47,7 +47,7 @@ module _3gpp-common-subscription-control { description "Describes which object instances are selected with respect to a base object instance."; - + case type-level { + case type-level { leaf scopeType { type enumeration { enum BASE_ONLY; -- GitLab From c794c85ef87202a0a0e7454d7b40127351948383 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 22 Jan 2024 16:40:11 +0000 Subject: [PATCH 04/57] Added mandatory _3gpp-common-subscription-control.yang --- yang-models/_3gpp-common-subscription-control.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index eaa22229d..a6a1ab477 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -55,6 +55,7 @@ module _3gpp-common-subscription-control { enum BASE_NTH_LEVEL; enum BASE_SUBTREE; } + mandatory true; description "If the optional scopeLevel parameter is not supported or absent, allowed values of scopeType are BASE_ONLY and BASE_ALL. -- GitLab From 819f05af6ae5c8fe4ab13026da78d29e5630bf78 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 1 Feb 2024 01:26:07 +0100 Subject: [PATCH 05/57] renamed _3gpp-5gc-ecmconnectioninfo.yang --- ...fo.yang => _3gpp-5gc-nrm-ecmconnectioninfo.yang} | 13 +++++++------ yang-models/_3gpp-common-managed-element.yang | 5 +++-- yang-models/_3gpp-common-subnetwork.yang | 5 +++-- 3 files changed, 13 insertions(+), 10 deletions(-) rename yang-models/{_3gpp-5gc-ecmconnectioninfo.yang => _3gpp-5gc-nrm-ecmconnectioninfo.yang} (95%) diff --git a/yang-models/_3gpp-5gc-ecmconnectioninfo.yang b/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang similarity index 95% rename from yang-models/_3gpp-5gc-ecmconnectioninfo.yang rename to yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang index a5f590d5a..143fa4920 100644 --- a/yang-models/_3gpp-5gc-ecmconnectioninfo.yang +++ b/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang @@ -1,6 +1,6 @@ -module _3gpp-5gc-ecmconnectioninfo { +module _3gpp-5gc-nrm-ecmconnectioninfo { yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-5gc-ecmconnectioninfo"; + namespace "urn:3gpp:sa5:_3gpp-5gc-nrm-ecmconnectioninfo"; prefix "econn3gpp"; import ietf-inet-types { prefix inet; } @@ -11,11 +11,12 @@ module _3gpp-5gc-ecmconnectioninfo { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EcmConnectionInfo 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 2023-11-14 { reference CR-1136 ; } + revision 2024-01-29 { reference CR-1166 ; } + revision 2023-11-05 { reference CR-1131 ; } grouping GeoLocGrp { description "This datatype represent the geographical location."; @@ -23,7 +24,7 @@ module _3gpp-5gc-ecmconnectioninfo { list geographicalCoordinates { description "This refers to the Topological Service Area, - (see clause 7.3.3.2 in TS 23.558) that is defined as a datatype + (see clause 7.3.3.2 in TS 23.538) that is defined as a datatype (see clause 6.3.8)."; key latitude; max-elements 1; @@ -250,4 +251,4 @@ module _3gpp-5gc-ecmconnectioninfo { } } } -} +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 153510be9..233aa6f4a 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -11,14 +11,14 @@ module _3gpp-common-managed-element { import _3gpp-common-trace { prefix trace3gpp; } import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } - import _3gpp-5gc-ecmconnectioninfo { prefix econn3gpp ; } + import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines ManagedElement which will be augmented by other IOCs - 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.623 Generic Network Resource Model (NRM) @@ -33,6 +33,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-10 { reference CR-0257; } diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 7bca2e5de..d6d5f7010 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -12,13 +12,13 @@ module _3gpp-common-subnetwork { import ietf-yang-schema-mount { prefix yangmnt; } import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } - import _3gpp-5gc-ecmconnectioninfo { prefix econn3gpp ; } + import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines basic SubNetwork which will be augmented by other IOCs - 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.623 Generic Network Resource Model (NRM) @@ -33,6 +33,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-10 { reference CR-0257; } -- GitLab From aa3da5fa8bd213148e1ab8ee646472ce55603c64 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 1 Feb 2024 01:48:57 +0100 Subject: [PATCH 06/57] corrected reference --- yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang b/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang index 143fa4920..b8b795ab4 100644 --- a/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang +++ b/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang @@ -24,7 +24,7 @@ module _3gpp-5gc-nrm-ecmconnectioninfo { list geographicalCoordinates { description "This refers to the Topological Service Area, - (see clause 7.3.3.2 in TS 23.538) that is defined as a datatype + (see clause 7.3.3.2 in TS 23.558) that is defined as a datatype (see clause 6.3.8)."; key latitude; max-elements 1; -- GitLab From 68f8d9b62736465e3ccf60cef6ea8e4390149328 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:20:36 +0000 Subject: [PATCH 07/57] 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 6af0bb3ab037e40a9f102d5b55b0fd14e3abadc0 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:23:20 +0000 Subject: [PATCH 08/57] 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 2661188f2f25d84bb26ac1d5d52cf7c9ea32d858 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:25:45 +0000 Subject: [PATCH 09/57] 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 0738802bfc8a84c825618d451493c5b8130d1eb2 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:29:38 +0000 Subject: [PATCH 10/57] 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 925cee803d52b2c166e450282feab2d4e3b24cae Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:53:10 +0000 Subject: [PATCH 11/57] 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 41639ae51184469670312e7e2b5028736c862b58 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:56:24 +0000 Subject: [PATCH 12/57] 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 85474119e8bbe7ec7a6dbc47ab225a0114c037a0 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 12:57:16 +0000 Subject: [PATCH 13/57] 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 9403742b495e7302a8959274eb78473f987c2325 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 13:00:33 +0000 Subject: [PATCH 14/57] 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 c0ebf21eb1b93a04bba7a89909164cb2e0fb76f0 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 13:04:47 +0000 Subject: [PATCH 15/57] 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 7faf5ccfdae8e7dc6d3f16fb02b1d5b7259066c3 Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 15:50:57 +0000 Subject: [PATCH 16/57] 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 0fc6695fb406c5fab407b3e467590e7014375aba Mon Sep 17 00:00:00 2001 From: zu Date: Tue, 16 Jan 2024 21:20:55 +0000 Subject: [PATCH 17/57] 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 d255ff06a6c49648e6fb53a12bdcc2e59ef14bbc Mon Sep 17 00:00:00 2001 From: zu Date: Wed, 17 Jan 2024 16:16:23 +0000 Subject: [PATCH 18/57] 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 8845da898df876b926ac8cdb84db34feeb36b3ad Mon Sep 17 00:00:00 2001 From: zu Date: Wed, 17 Jan 2024 16:20:53 +0000 Subject: [PATCH 19/57] 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 45e87405c6d42e0a24742c0984a076597b87e704 Mon Sep 17 00:00:00 2001 From: zu Date: Wed, 17 Jan 2024 16:23:23 +0000 Subject: [PATCH 20/57] 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 7ca1d1500b578c4128d9d24516f121f488172453 Mon Sep 17 00:00:00 2001 From: zu Date: Fri, 2 Feb 2024 09:17:47 +0000 Subject: [PATCH 21/57] 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 From e3be3c1e524e938685de459020d465fbb77ccc5a Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 06:50:46 +0000 Subject: [PATCH 22/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 7db030b64..b54e29b9f 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -25,6 +25,44 @@ module _3gpp-5gc-nrm-amffunction { revision 2019-05-31 { reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision"; } + grouping satelliteBackhaulInfo{ + description "Defines information related to satellite backhaul category + and corresponding information of gNB."; + reference "3GPP TS 23.501"; + + leaf globalgNBID{ + description "Unique identifier of a gNB."; + reference "3GPP TS 38.413"; + type int64; + mandatory true; + } + + leaf satelliteBackhaulCategory{ + description "Satellite backhaul category refers to the type of the satellite + used in the backhaul. Only a single backhaul category can be indicated."; + reference "3GPP TS 29.571"; + type enumeration{ + enum GEO; + enum MEO; + enum LEO; + enum OTHER_SAT; + enum DYNAMIC_GEO; + enum DYNAMIC_MEO; + enum DYNAMIC_LEO; + enum DYNAMIC_OTHER_SAT; + enum NON_SATELLITE; + } + mandatory true; + } + + leaf geoSatelliteId{ + description "Unique identifier of a GEO satellite."; + reference "3GPP TS 29.571"; + type string; + //condition present only if the UPF is deployed on the satellite. + } + } + grouping AMFFunctionGrp { description "Represents the AMFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; @@ -77,6 +115,25 @@ module _3gpp-5gc-nrm-amffunction { uses types5g3gpp:CommModel; } + leaf satelliteBackhaulSupported{ + description "It indicates whether AMF supports the reporting of satellite + backhaul information and indicating the satellite backhaul category + change to SMF."; + reference "3GPP TS 23.501"; + type boolean; + mandatory true; + } + + leaf-list satelliteBackhaulInfoList{ + description "Specifies a list of satellite backhaul information. It can be + used by NF and NF services."; + min-element 1; + uses satelliteBackhaulInfo; + } + + must "if (../satelliteBackhaulSupported = 1 ) then + exists (../satelliteBackhaulInfoList) else true()"; + } augment "/me3gpp:ManagedElement" { -- GitLab From 7007b918b9c050254aed0f0b16b2fd1cf8c4dfb9 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 06:58:59 +0000 Subject: [PATCH 23/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index b54e29b9f..af02b1a42 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -124,16 +124,13 @@ module _3gpp-5gc-nrm-amffunction { mandatory true; } - leaf-list satelliteBackhaulInfoList{ + list satelliteBackhaulInfoList{ description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; - min-element 1; + min-elements 1; uses satelliteBackhaulInfo; } - must "if (../satelliteBackhaulSupported = 1 ) then - exists (../satelliteBackhaulInfoList) else true()"; - } augment "/me3gpp:ManagedElement" { -- GitLab From 5c4ae9b952d886e0122ce955872a8a8166a475c5 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 07:12:25 +0000 Subject: [PATCH 24/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index af02b1a42..e0839f895 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -127,6 +127,7 @@ module _3gpp-5gc-nrm-amffunction { list satelliteBackhaulInfoList{ description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; + key "globalgNBID"; min-elements 1; uses satelliteBackhaulInfo; } -- GitLab From d2b53441606f10f5cd9a80add8195832c9a45197 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 07:17:41 +0000 Subject: [PATCH 25/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index e0839f895..b508d1774 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -38,8 +38,9 @@ module _3gpp-5gc-nrm-amffunction { } leaf satelliteBackhaulCategory{ - description "Satellite backhaul category refers to the type of the satellite - used in the backhaul. Only a single backhaul category can be indicated."; + description "Satellite backhaul category refers to the type of the + satellite used in the backhaul. Only a single backhaul category + can be indicated."; reference "3GPP TS 29.571"; type enumeration{ enum GEO; @@ -127,7 +128,7 @@ module _3gpp-5gc-nrm-amffunction { list satelliteBackhaulInfoList{ description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; - key "globalgNBID"; + key globalgNBID; min-elements 1; uses satelliteBackhaulInfo; } -- GitLab From 6d4b86efe4bc42b066d201b072ffefc6ce8d4e0b Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 08:54:57 +0000 Subject: [PATCH 26/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index b508d1774..6decbb43c 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -60,7 +60,7 @@ module _3gpp-5gc-nrm-amffunction { description "Unique identifier of a GEO satellite."; reference "3GPP TS 29.571"; type string; - //condition present only if the UPF is deployed on the satellite. + //condition present only if the UPF is deployed on the satellite. } } -- GitLab From 7145a4788885e14b8b12f103da013692aacde533 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 08:56:59 +0000 Subject: [PATCH 27/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 6decbb43c..a8d4ed598 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -105,6 +105,7 @@ module _3gpp-5gc-nrm-amffunction { min-elements 1; max-elements 1; uses types3gpp:ManagedNFProfile; + description ""; } list commModelList { -- GitLab From 4a75186fe42da7210dad05fbb2a87cb1211c44f3 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 08:58:33 +0000 Subject: [PATCH 28/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index a8d4ed598..3940cdbd8 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -77,7 +77,7 @@ module _3gpp-5gc-nrm-amffunction { } container aMFIdentifier { - presence true; + //presence true; description "An AMF identifier, comprising an AMF Region ID, an AMF Set ID and an AMF Pointer."; uses types3gpp:AmfIdentifier; -- GitLab From 6a4df2ef9db44ed558bc5979e4a989228621ef1d Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 00:40:28 +0000 Subject: [PATCH 29/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 96 ++++++++++++++++++---- 1 file changed, 82 insertions(+), 14 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 3940cdbd8..2f7eb1a1a 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -30,11 +30,88 @@ module _3gpp-5gc-nrm-amffunction { and corresponding information of gNB."; reference "3GPP TS 23.501"; - leaf globalgNBID{ - description "Unique identifier of a gNB."; + choice GlobalRanNodeID{ + description "Unique identifier of an NG-RAN node."; reference "3GPP TS 38.413"; - type int64; - mandatory true; + + case gNB { + leaf Global gNB ID{ + description "Unique identifier of a gNB."; + reference "3GPP TS 38.413"; + type int64; + mandatory true; + } + } + + case ng-eNB{ + leaf Global ng-eNB ID{ + type string{ + pattern '^(MacroNGeNB-[A-Fa-f0-9]{5}|LMacroNGeNB-[A-Fa-f0-9]{6}|SMacroNGeNB-[A-Fa-f0-9]{5})$'; + } + description "This represents the identifier of the ng-eNB ID as specified in clause 9.3.1.8 of + 3GPP TS 38.413. The value of the ng-eNB ID shall be encoded in hexadecimal representation. + Each character in the string shall take a value of "0" to "9", "a" to "f" or "A" to "F" and + shall represent 4 bits. The padding 0 shall be added to make multiple nibbles, so the most + significant character representing the padding 0 if required together with the 4 most + significant bits of the ng-eNB ID shall appear first in the string, and the character + representing the 4 least significant bit of the ng-eNB ID (to form a nibble) shall appear + last in the string."; + mandatory true; + } + } + + case N3IWF{ + leaf N3IWF ID{ + type string{ + pattern '^[A-Fa-f0-9]+$'; + } + description "This IE shall contain the N3IWF identifier received over NGAP and shall be encoded as a + string of hexadecimal characters. Each character in the string shall take a value of "0" + to "9", "a" to "f" or "A" to "F" and shall represent 4 bits. The most significant + character representing the 4 most significant bits of the N3IWF ID shall appear first in + the string, and the character representing the 4 least significant bit of the N3IWF ID + shall appear last in the string."; + mandatory true; + } + } + + case TNGF{ + leaf TNGF ID{ + type string{ + pattern '^[A-Fa-f0-9]+$'; + } + description "This represents the identifier of the TNGF ID as specified in clause 9.3.1.161 of + 3GPP TS 38.413 in hexadecimal representation. Each character in the string shall take a value + of "0" to "9", "a" to "f" or "A" to "F" and shall represent 4 bits. The most significant + character representing the 4 most significant bits of the TNGF ID shall appear first in + the string, and the character representing the 4 least significant bit of the TNGF ID + shall appear last in the string."; + mandatory true; + } + } + + case TWIF{ + leaf TWIF ID{ + type string; + description "This represents the TWIF identification as specified in clause 9.3.1.163 of TS 38.413"; + mandatory true; + } + } + + case W-AGF{ + leaf W-AGF ID{ + type string{ + pattern '^[A-Fa-f0-9]+$'; + } + description "This represents the identifier of the W-AGF ID as specified in clause 9.3.1.162 of + 3GPP TS 38.413 in hexadecimal representation. Each character in the string shall take a + value of "0" to "9", "a" to "f" or "A" to "F" and shall represent 4 bits. The most + significant character representing the 4 most significant bits of the W-AGF ID shall + appear first in the string, and the character representing the 4 least significant bit + of the W-AGF ID shall appear last in the string."; + mandatory true; + } + } } leaf satelliteBackhaulCategory{ @@ -117,19 +194,10 @@ module _3gpp-5gc-nrm-amffunction { uses types5g3gpp:CommModel; } - leaf satelliteBackhaulSupported{ - description "It indicates whether AMF supports the reporting of satellite - backhaul information and indicating the satellite backhaul category - change to SMF."; - reference "3GPP TS 23.501"; - type boolean; - mandatory true; - } - list satelliteBackhaulInfoList{ description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; - key globalgNBID; + key GlobalRanNodeID; min-elements 1; uses satelliteBackhaulInfo; } -- GitLab From 9739cfd61ffedbcd29be05dc64b97b4fee1f7710 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 00:45:07 +0000 Subject: [PATCH 30/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 2f7eb1a1a..704a1996d 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -33,7 +33,7 @@ module _3gpp-5gc-nrm-amffunction { choice GlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; reference "3GPP TS 38.413"; - + mandatory true; case gNB { leaf Global gNB ID{ description "Unique identifier of a gNB."; -- GitLab From 49cedbdb6847b2a160b2ca5b0219e8fcc9bc05ed Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 00:51:14 +0000 Subject: [PATCH 31/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 704a1996d..6092cdba3 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -35,7 +35,7 @@ module _3gpp-5gc-nrm-amffunction { reference "3GPP TS 38.413"; mandatory true; case gNB { - leaf Global gNB ID{ + leaf GlobalgNBID{ description "Unique identifier of a gNB."; reference "3GPP TS 38.413"; type int64; @@ -44,7 +44,7 @@ module _3gpp-5gc-nrm-amffunction { } case ng-eNB{ - leaf Global ng-eNB ID{ + leaf Globalng-eNBID{ type string{ pattern '^(MacroNGeNB-[A-Fa-f0-9]{5}|LMacroNGeNB-[A-Fa-f0-9]{6}|SMacroNGeNB-[A-Fa-f0-9]{5})$'; } @@ -61,7 +61,7 @@ module _3gpp-5gc-nrm-amffunction { } case N3IWF{ - leaf N3IWF ID{ + leaf N3IWFID{ type string{ pattern '^[A-Fa-f0-9]+$'; } @@ -76,7 +76,7 @@ module _3gpp-5gc-nrm-amffunction { } case TNGF{ - leaf TNGF ID{ + leaf TNGFID{ type string{ pattern '^[A-Fa-f0-9]+$'; } @@ -91,7 +91,7 @@ module _3gpp-5gc-nrm-amffunction { } case TWIF{ - leaf TWIF ID{ + leaf TWIFID{ type string; description "This represents the TWIF identification as specified in clause 9.3.1.163 of TS 38.413"; mandatory true; @@ -99,7 +99,7 @@ module _3gpp-5gc-nrm-amffunction { } case W-AGF{ - leaf W-AGF ID{ + leaf W-AGFID{ type string{ pattern '^[A-Fa-f0-9]+$'; } -- GitLab From 027a03e626fb7fdff439e8f6fb6451b468a2ce45 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 00:56:31 +0000 Subject: [PATCH 32/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 6092cdba3..35c49e03b 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -48,14 +48,7 @@ module _3gpp-5gc-nrm-amffunction { type string{ pattern '^(MacroNGeNB-[A-Fa-f0-9]{5}|LMacroNGeNB-[A-Fa-f0-9]{6}|SMacroNGeNB-[A-Fa-f0-9]{5})$'; } - description "This represents the identifier of the ng-eNB ID as specified in clause 9.3.1.8 of - 3GPP TS 38.413. The value of the ng-eNB ID shall be encoded in hexadecimal representation. - Each character in the string shall take a value of "0" to "9", "a" to "f" or "A" to "F" and - shall represent 4 bits. The padding 0 shall be added to make multiple nibbles, so the most - significant character representing the padding 0 if required together with the 4 most - significant bits of the ng-eNB ID shall appear first in the string, and the character - representing the 4 least significant bit of the ng-eNB ID (to form a nibble) shall appear - last in the string."; + description "This represents the identifier of the ng-eNB ID as specified in clause 9.3.1.8 of 3GPP TS 38.413."; mandatory true; } } -- GitLab From 2e00e7b587f4f2f8fbf595cedecff39d66d011e3 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 00:57:46 +0000 Subject: [PATCH 33/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 35c49e03b..2e2b3b5f1 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -58,12 +58,7 @@ module _3gpp-5gc-nrm-amffunction { type string{ pattern '^[A-Fa-f0-9]+$'; } - description "This IE shall contain the N3IWF identifier received over NGAP and shall be encoded as a - string of hexadecimal characters. Each character in the string shall take a value of "0" - to "9", "a" to "f" or "A" to "F" and shall represent 4 bits. The most significant - character representing the 4 most significant bits of the N3IWF ID shall appear first in - the string, and the character representing the 4 least significant bit of the N3IWF ID - shall appear last in the string."; + description "This IE shall contain the N3IWF identifier received over NGAP and shall be encoded as a string of hexadecimal characters."; mandatory true; } } @@ -73,12 +68,7 @@ module _3gpp-5gc-nrm-amffunction { type string{ pattern '^[A-Fa-f0-9]+$'; } - description "This represents the identifier of the TNGF ID as specified in clause 9.3.1.161 of - 3GPP TS 38.413 in hexadecimal representation. Each character in the string shall take a value - of "0" to "9", "a" to "f" or "A" to "F" and shall represent 4 bits. The most significant - character representing the 4 most significant bits of the TNGF ID shall appear first in - the string, and the character representing the 4 least significant bit of the TNGF ID - shall appear last in the string."; + description "This represents the identifier of the TNGF ID as specified in clause 9.3.1.161 of 3GPP TS 38.413 in hexadecimal representation."; mandatory true; } } @@ -96,12 +86,7 @@ module _3gpp-5gc-nrm-amffunction { type string{ pattern '^[A-Fa-f0-9]+$'; } - description "This represents the identifier of the W-AGF ID as specified in clause 9.3.1.162 of - 3GPP TS 38.413 in hexadecimal representation. Each character in the string shall take a - value of "0" to "9", "a" to "f" or "A" to "F" and shall represent 4 bits. The most - significant character representing the 4 most significant bits of the W-AGF ID shall - appear first in the string, and the character representing the 4 least significant bit - of the W-AGF ID shall appear last in the string."; + description "This represents the identifier of the W-AGF ID as specified in clause 9.3.1.162 of 3GPP TS 38.413 in hexadecimal representation."; mandatory true; } } -- GitLab From 9cfdac9fbfac7d654778f232585622924b6a14b7 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 01:07:06 +0000 Subject: [PATCH 34/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 2e2b3b5f1..0c30c049b 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -25,11 +25,7 @@ module _3gpp-5gc-nrm-amffunction { revision 2019-05-31 { reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision"; } - grouping satelliteBackhaulInfo{ - description "Defines information related to satellite backhaul category - and corresponding information of gNB."; - reference "3GPP TS 23.501"; - + grouping GlobalRanNodeIDGrp{ choice GlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; reference "3GPP TS 38.413"; @@ -91,6 +87,18 @@ module _3gpp-5gc-nrm-amffunction { } } } + } + + grouping satelliteBackhaulInfo{ + description "Defines information related to satellite backhaul category + and corresponding information of gNB."; + reference "3GPP TS 23.501"; + + leaf GlobalRanNodeID{ + description "Unique identifier of an NG-RAN node."; + uses GlobalRanNodeIDGrp; + mandatory true; + } leaf satelliteBackhaulCategory{ description "Satellite backhaul category refers to the type of the -- GitLab From 9064ea775396ab53a89e1e0fb11d43698c1afdb3 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 01:11:28 +0000 Subject: [PATCH 35/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 0c30c049b..9d9f0972b 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -96,7 +96,7 @@ module _3gpp-5gc-nrm-amffunction { leaf GlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; - uses GlobalRanNodeIDGrp; + type GlobalRanNodeIDGrp; mandatory true; } -- GitLab From c4388b4833684719e690822dacd7d585de700460 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 01:18:05 +0000 Subject: [PATCH 36/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 9d9f0972b..6381f02fa 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -26,6 +26,15 @@ module _3gpp-5gc-nrm-amffunction { revision 2018-08-07 { reference "Initial revision"; } grouping GlobalRanNodeIDGrp{ + + list plmnId { + description "PLMN Identity."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + choice GlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; reference "3GPP TS 38.413"; @@ -94,10 +103,12 @@ module _3gpp-5gc-nrm-amffunction { and corresponding information of gNB."; reference "3GPP TS 23.501"; - leaf GlobalRanNodeID{ + list GlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; - type GlobalRanNodeIDGrp; - mandatory true; + uses GlobalRanNodeIDGrp; + min-elements 1; + max-elements 1; + key "plmnId"; } leaf satelliteBackhaulCategory{ -- GitLab From 60ea1311f1e2e26d89b758726e2a4698cf0d5be6 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 01:59:00 +0000 Subject: [PATCH 37/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 6381f02fa..7b4b73577 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -27,11 +27,9 @@ module _3gpp-5gc-nrm-amffunction { grouping GlobalRanNodeIDGrp{ - list plmnId { + leaf plmnId { description "PLMN Identity."; - min-elements 1; - max-elements 1; - key "mcc mnc"; + mandatory true; uses types3gpp:PLMNId; } @@ -195,6 +193,10 @@ module _3gpp-5gc-nrm-amffunction { description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; key GlobalRanNodeID; + leaf GlobalRanNodeID{ + type string; + description "this relies on the choice of GlobalRanNodeID" + } min-elements 1; uses satelliteBackhaulInfo; } -- GitLab From d666abe6f2aec4ebd36ef3a31778020706770c59 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 02:00:23 +0000 Subject: [PATCH 38/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 7b4b73577..4c3979c3b 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -195,7 +195,7 @@ module _3gpp-5gc-nrm-amffunction { key GlobalRanNodeID; leaf GlobalRanNodeID{ type string; - description "this relies on the choice of GlobalRanNodeID" + description "this relies on the choice of GlobalRanNodeID"; } min-elements 1; uses satelliteBackhaulInfo; -- GitLab From 9fa55ba51bd524c212b36fce6917d91a39696bc0 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 02:04:36 +0000 Subject: [PATCH 39/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 4c3979c3b..fcd70baa3 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -30,7 +30,7 @@ module _3gpp-5gc-nrm-amffunction { leaf plmnId { description "PLMN Identity."; mandatory true; - uses types3gpp:PLMNId; + type types3gpp:PLMNId; } choice GlobalRanNodeID{ @@ -192,8 +192,8 @@ module _3gpp-5gc-nrm-amffunction { list satelliteBackhaulInfoList{ description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; - key GlobalRanNodeID; - leaf GlobalRanNodeID{ + key GlobalRanNodeIDValue; + leaf GlobalRanNodeIDValue{ type string; description "this relies on the choice of GlobalRanNodeID"; } -- GitLab From a3b0b7d99edc2fe11d5ce7a4252de9d4e642ff3b Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 02:14:12 +0000 Subject: [PATCH 40/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index fcd70baa3..a899b6559 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -27,12 +27,6 @@ module _3gpp-5gc-nrm-amffunction { grouping GlobalRanNodeIDGrp{ - leaf plmnId { - description "PLMN Identity."; - mandatory true; - type types3gpp:PLMNId; - } - choice GlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; reference "3GPP TS 38.413"; @@ -49,9 +43,11 @@ module _3gpp-5gc-nrm-amffunction { case ng-eNB{ leaf Globalng-eNBID{ type string{ - pattern '^(MacroNGeNB-[A-Fa-f0-9]{5}|LMacroNGeNB-[A-Fa-f0-9]{6}|SMacroNGeNB-[A-Fa-f0-9]{5})$'; + pattern '^(MacroNGeNB-[A-Fa-f0-9]{5}|LMacroNGeNB-[A-Fa-f0-9]{6}|SMacroNGeNB + -[A-Fa-f0-9]{5})$'; } - description "This represents the identifier of the ng-eNB ID as specified in clause 9.3.1.8 of 3GPP TS 38.413."; + description "This represents the identifier of the ng-eNB ID as specified in + clause 9.3.1.8 of 3GPP TS 38.413."; mandatory true; } } @@ -61,7 +57,8 @@ module _3gpp-5gc-nrm-amffunction { type string{ pattern '^[A-Fa-f0-9]+$'; } - description "This IE shall contain the N3IWF identifier received over NGAP and shall be encoded as a string of hexadecimal characters."; + description "This IE shall contain the N3IWF identifier received over NGAP and + shall be encoded as a string of hexadecimal characters."; mandatory true; } } @@ -71,7 +68,8 @@ module _3gpp-5gc-nrm-amffunction { type string{ pattern '^[A-Fa-f0-9]+$'; } - description "This represents the identifier of the TNGF ID as specified in clause 9.3.1.161 of 3GPP TS 38.413 in hexadecimal representation."; + description "This represents the identifier of the TNGF ID as specified in clause + 9.3.1.161 of 3GPP TS 38.413 in hexadecimal representation."; mandatory true; } } @@ -79,7 +77,8 @@ module _3gpp-5gc-nrm-amffunction { case TWIF{ leaf TWIFID{ type string; - description "This represents the TWIF identification as specified in clause 9.3.1.163 of TS 38.413"; + description "This represents the TWIF identification as specified in clause + 9.3.1.163 of TS 38.413"; mandatory true; } } @@ -89,7 +88,8 @@ module _3gpp-5gc-nrm-amffunction { type string{ pattern '^[A-Fa-f0-9]+$'; } - description "This represents the identifier of the W-AGF ID as specified in clause 9.3.1.162 of 3GPP TS 38.413 in hexadecimal representation."; + description "This represents the identifier of the W-AGF ID as specified in + clause 9.3.1.162 of 3GPP TS 38.413 in hexadecimal representation."; mandatory true; } } @@ -106,7 +106,11 @@ module _3gpp-5gc-nrm-amffunction { uses GlobalRanNodeIDGrp; min-elements 1; max-elements 1; - key "plmnId"; + leaf GlobalRanNodeIDValue{ + type string; + description "this relies on the choice of GlobalRanNodeID"; + } + key "GlobalRanNodeIDValue"; } leaf satelliteBackhaulCategory{ @@ -193,10 +197,6 @@ module _3gpp-5gc-nrm-amffunction { description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; key GlobalRanNodeIDValue; - leaf GlobalRanNodeIDValue{ - type string; - description "this relies on the choice of GlobalRanNodeID"; - } min-elements 1; uses satelliteBackhaulInfo; } -- GitLab From 1dd244fb867b725278e82522a560721cae0bb764 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 02:15:35 +0000 Subject: [PATCH 41/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index a899b6559..43149a22e 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -196,7 +196,11 @@ module _3gpp-5gc-nrm-amffunction { list satelliteBackhaulInfoList{ description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; - key GlobalRanNodeIDValue; + leaf GlobalRanNodeIDValue{ + type string; + description "this relies on the choice of GlobalRanNodeID"; + } + key "GlobalRanNodeIDValue"; min-elements 1; uses satelliteBackhaulInfo; } -- GitLab From 836639bc61b81590ed9ebfff504f645cbe8f57f4 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 02:17:26 +0000 Subject: [PATCH 42/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 43149a22e..1a8990caf 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -43,10 +43,12 @@ module _3gpp-5gc-nrm-amffunction { case ng-eNB{ leaf Globalng-eNBID{ type string{ - pattern '^(MacroNGeNB-[A-Fa-f0-9]{5}|LMacroNGeNB-[A-Fa-f0-9]{6}|SMacroNGeNB + pattern '^(MacroNGeNB-[A-Fa-f0-9]{5}|LMacroNGeNB- + [A-Fa-f0-9]{6}|SMacroNGeNB -[A-Fa-f0-9]{5})$'; } - description "This represents the identifier of the ng-eNB ID as specified in + description "This represents the identifier of + the ng-eNB ID as specified in clause 9.3.1.8 of 3GPP TS 38.413."; mandatory true; } @@ -57,8 +59,10 @@ module _3gpp-5gc-nrm-amffunction { type string{ pattern '^[A-Fa-f0-9]+$'; } - description "This IE shall contain the N3IWF identifier received over NGAP and - shall be encoded as a string of hexadecimal characters."; + description "This IE shall contain the N3IWF + identifier received over NGAP and + shall be encoded as a string of + hexadecimal characters."; mandatory true; } } @@ -68,8 +72,10 @@ module _3gpp-5gc-nrm-amffunction { type string{ pattern '^[A-Fa-f0-9]+$'; } - description "This represents the identifier of the TNGF ID as specified in clause - 9.3.1.161 of 3GPP TS 38.413 in hexadecimal representation."; + description "This represents the identifier of + the TNGF ID as specified in clause + 9.3.1.161 of 3GPP TS 38.413 in hexadecimal + representation."; mandatory true; } } @@ -77,7 +83,8 @@ module _3gpp-5gc-nrm-amffunction { case TWIF{ leaf TWIFID{ type string; - description "This represents the TWIF identification as specified in clause + description "This represents the TWIF identification + as specified in clause 9.3.1.163 of TS 38.413"; mandatory true; } @@ -88,8 +95,10 @@ module _3gpp-5gc-nrm-amffunction { type string{ pattern '^[A-Fa-f0-9]+$'; } - description "This represents the identifier of the W-AGF ID as specified in - clause 9.3.1.162 of 3GPP TS 38.413 in hexadecimal representation."; + description "This represents the identifier of + the W-AGF ID as specified in + clause 9.3.1.162 of 3GPP TS 38.413 + in hexadecimal representation."; mandatory true; } } -- GitLab From e91b0fb574a7fc71f9f6393e3f78e8122b7cfa2e Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 02:23:49 +0000 Subject: [PATCH 43/57] Update file _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 1a8990caf..eb3a3e1ef 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -26,7 +26,17 @@ module _3gpp-5gc-nrm-amffunction { revision 2018-08-07 { reference "Initial revision"; } grouping GlobalRanNodeIDGrp{ - + + list pLMNId { + description "The PLMN Identifier is composed of + a Mobile Country Code (MCC) and + a Mobile Network Code (MNC)."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + choice GlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; reference "3GPP TS 38.413"; -- GitLab From 6af053ce4619a224dd14d88029139351a6b47604 Mon Sep 17 00:00:00 2001 From: qiwen Date: Wed, 17 Jan 2024 23:50:49 +0000 Subject: [PATCH 44/57] Update file _3gpp-5gc-nrm-nfprofile.yang --- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 8f6155866..003d34a95 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -981,6 +981,34 @@ module _3gpp-5gc-nrm-nfprofile { mandatory true; type string; } + + leaf-list dnaiList { + description "List of Data network access identifiers supported by the SMF for this DNN. + The absence of this attribute indicates that the SMF can be selected for this DNN for any DNAI."; + min-elements 1; + type string; //dnai is the type but its only a string with desc: DNAI (Data network access identifier), is this needed as its own typedef or string is ok + } + + list dnaiSatelliteMappingList { + description "List of the mapping relationship between satellite ID and at least one DNAI."; + min-elements 1; + key "satelliteid"; + uses dnaiSatelliteMapping; + } + } + + grouping dnaiSatelliteMapping { + leaf-list dnaiList { + description "List of Data network access identifiers supported by the SMF for this DNN. + The absence of this attribute indicates that the SMF can be selected for this DNN for any DNAI."; + min-elements 1; + type string; //dnai is the type but its only a string with desc: DNAI (Data network access identifier), is this needed as its own typedef or string is ok + } + + leaf satelliteid { + description "Unique identifier of a GEO satellite."; + type string; + } } grouping PlmnSnssai { -- GitLab From 417e9a3feba3ccf028d88489f36558cc22f3a595 Mon Sep 17 00:00:00 2001 From: qiwen Date: Wed, 17 Jan 2024 23:58:50 +0000 Subject: [PATCH 45/57] Update file _3gpp-5gc-nrm-nfprofile.yang --- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 003d34a95..ad82477b6 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -983,14 +983,16 @@ module _3gpp-5gc-nrm-nfprofile { } leaf-list dnaiList { - description "List of Data network access identifiers supported by the SMF for this DNN. - The absence of this attribute indicates that the SMF can be selected for this DNN for any DNAI."; + description "List of Data network access identifiers supported by + the SMF for this DNN. The absence of this attribute indicates that + the SMF can be selected for this DNN for any DNAI."; min-elements 1; - type string; //dnai is the type but its only a string with desc: DNAI (Data network access identifier), is this needed as its own typedef or string is ok + type string; } list dnaiSatelliteMappingList { - description "List of the mapping relationship between satellite ID and at least one DNAI."; + description "List of the mapping relationship between + satellite ID and at least one DNAI."; min-elements 1; key "satelliteid"; uses dnaiSatelliteMapping; @@ -999,10 +1001,9 @@ module _3gpp-5gc-nrm-nfprofile { grouping dnaiSatelliteMapping { leaf-list dnaiList { - description "List of Data network access identifiers supported by the SMF for this DNN. - The absence of this attribute indicates that the SMF can be selected for this DNN for any DNAI."; + description "List of Data network access identifiers."; min-elements 1; - type string; //dnai is the type but its only a string with desc: DNAI (Data network access identifier), is this needed as its own typedef or string is ok + type string; } leaf satelliteid { -- GitLab From 7845b41ee8f1f3299818b5a41517f42ece4ee891 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 18 Jan 2024 00:12:36 +0000 Subject: [PATCH 46/57] Update file _3gpp-5gc-nrm-nfprofile.yang --- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 300 +++++++++++++++-------- 1 file changed, 200 insertions(+), 100 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index ad82477b6..40d9ce029 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -10,6 +10,7 @@ module _3gpp-5gc-nrm-nfprofile { import _3gpp-5gc-nrm-nfservice { prefix nfs3gpp; } organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF profile class. Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; @@ -40,16 +41,19 @@ module _3gpp-5gc-nrm-nfprofile { } leaf heartBeatTimer { - description "Time in seconds expected between 2 consecutive heart-beat messages from - an NF Instance to the NRF. It may be included in the registration request. - When present in the request it shall contain the heartbeat time proposed by the NF service consumer."; + description "Time in seconds expected between 2 consecutive + heart-beat messages from an NF Instance to the NRF. + It may be included in the registration request. + When present in the request it shall contain the + heartbeat time proposed by the NF service consumer."; type uint16; } list plmnList { description "PLMN(s) of the Network Function. - This IE shall be present if this information is available for the NF. - If not provided, PLMN ID(s) of the PLMN of the NRF are assumed for the NF."; + This IE shall be present if this information + is available for the NF. If not provided, PLMN ID(s) + of the PLMN of the NRF are assumed for the NF."; min-elements 1; key "mcc mnc"; @@ -57,17 +61,21 @@ module _3gpp-5gc-nrm-nfprofile { } list sNssais { - description "S-NSSAIs of the Network Function. If not provided, the NF can serve any S-NSSAI. - When present this IE represents the list of S-NSSAIs supported in all the PLMNs listed in the plmnList IE."; + description "S-NSSAIs of the Network Function. If not + provided, the NF can serve any S-NSSAI. When present + this IE represents the list of S-NSSAIs supported in + all the PLMNs listed in the plmnList IE."; min-elements 1; key "sst sd"; uses Snssai; } list perPlmnSnssaiList { - description "This IE may be included when the list of S-NSSAIs supported by the NF for each PLMN it is supporting is different. - When present, this IE shall include the S-NSSAIs supported by the Network Function - for each PLMN supported by the Network Function. When present, this IE shall override sNssais IE."; + description "This IE may be included when the list of + S-NSSAIs supported by the NF for each PLMN it is supporting + is different. When present, this IE shall include the S-NSSAIs + supported by the Network Function for each PLMN supported by + the Network Function. When present, this IE shall override sNssais IE."; min-elements 1; key idx; leaf idx { type uint32; } @@ -82,14 +90,15 @@ module _3gpp-5gc-nrm-nfprofile { } leaf fqdn { - description "FQDN of the Network Function. For AMF, the FQDN registered with the NRF - shall be that of the AMF Name."; + description "FQDN of the Network Function. For AMF, the + FQDN registered with the NRF shall be that of the AMF Name."; type inet:domain-name; } leaf interPlmnFqdn { - description "If the NF needs to be discoverable by other NFs in a different PLMN, - then an FQDN that is used for inter-PLMN routing is specified."; + description "If the NF needs to be discoverable by other + NFs in a different PLMN, then an FQDN that is used + for inter-PLMN routing is specified."; type inet:domain-name; } @@ -122,8 +131,9 @@ module _3gpp-5gc-nrm-nfprofile { } leaf-list allowedNfDomains { - description "Pattern representing the NF domain names allowed to access the NF instance. - If not provided, any NF domain is allowed to access the NF."; + description "Pattern representing the NF domain names allowed + to access the NF instance. If not provided, + any NF domain is allowed to access the NF."; min-elements 1; type string; } @@ -137,27 +147,33 @@ module _3gpp-5gc-nrm-nfprofile { } leaf priority { - description "Priority (relative to other NFs of the same type) in the range of 0-65535, to be used for NF selection; - lower values indicate a higher priority. If priority is also present in the nfServiceList parameters, - those will have precedence over this value. The NRF may overwrite the received priority value when exposing + description "Priority (relative to other NFs of the same type) + in the range of 0-65535, to be used for NF selection; + lower values indicate a higher priority. + If priority is also present in the nfServiceList parameters, + those will have precedence over this value. + The NRF may overwrite the received priority value when exposing an NFProfile with the Nnrf_NFDiscovery service."; type uint16; } leaf capacity { - description "Static capacity information in the range of 0-65535, expressed as a weight - relative to other NF instances of the same type; if capacity is also present - in the nfServiceList parameters, those will have precedence over this value."; + description "Static capacity information in the range of 0-65535, + expressed as a weight relative to other NF instances of + the same type; if capacity is also present in the nfServiceList + parameters, those will have precedence over this value."; type uint16; } leaf load { - description "Dynamic load information, ranged from 0 to 100, indicates the current load percentage of the NF."; + description "Dynamic load information, ranged from 0 to 100, + indicates the current load percentage of the NF."; type types3gpp:Load; } leaf locality { - description "Operator defined information about the location of the NF instance (e.g. geographic location, data center)."; + description "Operator defined information about the location + of the NF instance (e.g. geographic location, data center)."; type string; } @@ -170,21 +186,24 @@ module _3gpp-5gc-nrm-nfprofile { } list supiRanges { - description "List of ranges of SUPI's whose profile data is available in the UDR instance."; + description "List of ranges of SUPI's whose profile data + is available in the UDR instance."; key "start end pattern"; min-elements 1; uses SupiRange; } list gpsiRanges { - description "List of ranges of GPSIs whose profile data is available in the UDR instance."; + description "List of ranges of GPSIs whose profile data is + available in the UDR instance."; key "start end pattern"; min-elements 1; uses IdentityRange; } list externalGroupIdentifiersRanges { - description "List of ranges of external groups whose profile data is available in the UDR instance."; + description "List of ranges of external groups whose profile + data is available in the UDR instance."; key "start end pattern"; min-elements 1; uses IdentityRange; @@ -201,35 +220,41 @@ module _3gpp-5gc-nrm-nfprofile { grouping udmInfo { leaf groupId { - description "Identity of the UDM group that is served by the UDM instance. - If not provided, the UDM instance does not pertain to any UDM group."; + description "Identity of the UDM group that is served by the + UDM instance. If not provided, the UDM instance does + not pertain to any UDM group."; type string; } list supiRanges { - description "List of ranges of SUPI's whose profile data is available in the UDM instance."; + description "List of ranges of SUPI's whose profile data is + available in the UDM instance."; key "start end pattern"; min-elements 1; uses SupiRange; } list gpsiRanges { - description "List of ranges of GPSIs whose profile data is available in the UDM instance."; + description "List of ranges of GPSIs whose profile data is + available in the UDM instance."; key "start end pattern"; min-elements 1; uses IdentityRange; } list externalGroupIdentifiersRanges { - description "List of ranges of external groups whose profile data is available in the UDM instance."; + description "List of ranges of external groups whose profile + data is available in the UDM instance."; key "start end pattern"; min-elements 1; uses IdentityRange; } leaf-list routingIndicators { - description "List of Routing Indicator information that allows to route network signalling with SUCI - to the UDM instance. If not provided, the UDM can serve any Routing Indicator. + description "List of Routing Indicator information that allows + to route network signalling with SUCI + to the UDM instance. If not provided, + the UDM can serve any Routing Indicator. Pattern: '^[0-9]{1,4}$'."; min-elements 1; type string; @@ -239,20 +264,24 @@ module _3gpp-5gc-nrm-nfprofile { grouping ausfInfo { leaf groupId { - description "Identity of the AUSF group. If not provided, the AUSF instance does not pertain to any AUSF group."; + description "Identity of the AUSF group. If not provided, + the AUSF instance does not pertain to any AUSF group."; type string; } list supiRanges { - description "List of ranges of SUPIs that can be served by the AUSF instance. If not provided, the AUSF can serve any SUPI."; + description "List of ranges of SUPIs that can be served by + the AUSF instance. If not provided, the AUSF can serve any SUPI."; key "start end pattern"; min-elements 1; uses SupiRange; } leaf-list routingIndicators { - description "List of Routing Indicator information that allows to route network signalling with SUCI - to the AUSF instance. If not provided, the AUSF can serve any Routing Indicator. + description "List of Routing Indicator information that allows + to route network signalling with SUCI + to the AUSF instance. If not provided, + the AUSF can serve any Routing Indicator. Pattern: '^[0-9]{1,4}$'."; min-elements 1; type string; @@ -282,8 +311,10 @@ module _3gpp-5gc-nrm-nfprofile { } list taiList { - description "The list of TAIs the AMF can serve. It may contain the non-3GPP access TAI. - The absence of this attribute and the taiRangeList attribute indicate that + description "The list of TAIs the AMF can serve. + It may contain the non-3GPP access TAI. + The absence of this attribute and + the taiRangeList attribute indicate that the AMF can be selected for any TAI in the serving network."; key idx; @@ -294,8 +325,10 @@ module _3gpp-5gc-nrm-nfprofile { } list taiRangeList { - description "The range of TAIs the AMF can serve. The absence of this attribute and the taiList - attribute indicate that the AMF can be selected for any TAI in the serving network."; + description "The range of TAIs the AMF can serve. + The absence of this attribute and the taiList + attribute indicate that the AMF can be selected + for any TAI in the serving network."; min-elements 1; key idx; leaf idx { type uint32; } @@ -303,7 +336,8 @@ module _3gpp-5gc-nrm-nfprofile { } list backupInfoAmfFailure { - description "List of GUAMIs for which the AMF acts as a backup for AMF failure."; + description "List of GUAMIs for which the AMF acts + as a backup for AMF failure."; key idx; leaf idx { type uint32; } @@ -313,7 +347,8 @@ module _3gpp-5gc-nrm-nfprofile { } list backupInfoAmfRemoval { - description "List of GUAMIs for which the AMF acts as a backup for planned AMF removal."; + description "List of GUAMIs for which the AMF acts + as a backup for planned AMF removal."; key idx; leaf idx { type uint32; } @@ -323,8 +358,10 @@ module _3gpp-5gc-nrm-nfprofile { } list n2InterfaceAmfInfo { - description "N2 interface information of the AMF. This information needs not be sent in NF Discovery responses. - It may be used by the NRF to update the DNS for AMF discovery by the 5G Access Network."; + description "N2 interface information of the AMF. + This information needs not be sent in NF Discovery responses. + It may be used by the NRF to update the DNS for + AMF discovery by the 5G Access Network."; max-elements 1; key idx; @@ -344,7 +381,8 @@ module _3gpp-5gc-nrm-nfprofile { } list taiList { - description "The list of TAIs the SMF can serve. It may contain the non-3GPP access TAI. + description "The list of TAIs the SMF can serve. + It may contain the non-3GPP access TAI. The absence of this attribute and the taiRangeList attribute indicate that the SMF can be selected for any TAI in the serving network."; @@ -356,8 +394,10 @@ module _3gpp-5gc-nrm-nfprofile { } list taiRangeList { - description "The range of TAIs the SMF can serve. The absence of this attribute and the taiList - attribute indicate that the SMF can be selected for any TAI in the serving network."; + description "The range of TAIs the SMF can serve. + The absence of this attribute and the taiList + attribute indicate that the SMF can be selected + for any TAI in the serving network."; min-elements 1; key idx; leaf idx { type uint32; } @@ -370,7 +410,8 @@ module _3gpp-5gc-nrm-nfprofile { } leaf-list accessType { - description "If included, this IE shall contain the access type (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF. + description "If included, this IE shall contain the access type + (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF. If not included, it shall be assumed the both access types are supported."; min-elements 1; @@ -398,7 +439,8 @@ module _3gpp-5gc-nrm-nfprofile { } list interfaceUpfInfo { - description "List of User Plane interfaces configured on the UPF. When this IE is provided in the NF Discovery response, + description "List of User Plane interfaces configured on the UPF. + When this IE is provided in the NF Discovery response, the NF Service Consumer (e.g. SMF) may use this information for UPF selection."; key idx; @@ -417,7 +459,8 @@ module _3gpp-5gc-nrm-nfprofile { } leaf-list pduSessionTypes { - description "List of PDU session type(s) supported by the UPF. The absence of this attribute indicates that the UPF can be selected + description "List of PDU session type(s) supported by the UPF. + The absence of this attribute indicates that the UPF can be selected for any PDU session type."; min-elements 1; @@ -436,7 +479,8 @@ module _3gpp-5gc-nrm-nfprofile { } list supiRanges { - description "List of ranges of SUPIs that can be served by the PCF instance. If not provided, the PCF can serve any SUPI."; + description "List of ranges of SUPIs that can be served by + the PCF instance. If not provided, the PCF can serve any SUPI."; key "start end pattern"; min-elements 1; uses SupiRange; @@ -444,7 +488,8 @@ module _3gpp-5gc-nrm-nfprofile { leaf rxDiamHost { description "This IE shall be present if the PCF supports Rx interface. - When present, this IE shall indicate the Diameter host of the Rx interface for the PCF. + When present, this IE shall indicate the Diameter host + of the Rx interface for the PCF. Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'."; type string; @@ -452,7 +497,8 @@ module _3gpp-5gc-nrm-nfprofile { leaf rxDiamRealm { description "This IE shall be present if the PCF supports Rx interface. - When present, this IE shall indicate the Diameter realm of the Rx interface for the PCF. + When present, this IE shall indicate the Diameter realm + of the Rx interface for the PCF. Pattern: '^([A-Za-z0-9]+(-[A-Za-z0-9]+).)+[a-z]{2,}$'."; type string; @@ -477,7 +523,8 @@ module _3gpp-5gc-nrm-nfprofile { } leaf-list ipDomainList { - description "List of IPv4 address domains, as described in subclause 6.2 of 3GPP TS 29.513, handled by the BSF. + description "List of IPv4 address domains, as described in + subclause 6.2 of 3GPP TS 29.513, handled by the BSF. If not provided, the BSF can serve any IP domain."; min-elements 1; type string; @@ -494,21 +541,24 @@ module _3gpp-5gc-nrm-nfprofile { grouping chfInfo { list supiRangeList { - description "List of ranges of SUPIs that can be served by the CHF instance. If not provided, the CHF can serve any SUPI."; + description "List of ranges of SUPIs that can be served by + the CHF instance. If not provided, the CHF can serve any SUPI."; key "start end pattern"; min-elements 1; uses SupiRange; } list gpsiRangeList { - description "List of ranges of GPSI that can be served by the CHF instance. If not provided, the CHF can serve any GPSI."; + description "List of ranges of GPSI that can be served + by the CHF instance. If not provided, the CHF can serve any GPSI."; key "start end pattern"; min-elements 1; uses IdentityRange; } list plmnRangeList { - description "List of ranges of PLMNs (including the PLMN IDs of the CHF instance) that can be served by the CHF instance. + description "List of ranges of PLMNs (including the PLMN + IDs of the CHF instance) that can be served by the CHF instance. If not provided, the CHF can serve any PLMN."; min-elements 1; @@ -520,7 +570,8 @@ module _3gpp-5gc-nrm-nfprofile { grouping nrfInfoGrp { list servedUdrInfo { - description "This attribute contains all the udrInfo attributes locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the udrInfo attributes + locally configured in the NRF or the NRF received during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -533,7 +584,8 @@ module _3gpp-5gc-nrm-nfprofile { } list servedUdmInfo { - description "This attribute contains all the udmInfo attributes locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the udmInfo attributes + locally configured in the NRF or the NRF received during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -546,7 +598,8 @@ module _3gpp-5gc-nrm-nfprofile { } list servedAusfInfo { - description "This attribute contains all the ausfInfo attributes locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the ausfInfo attributes + locally configured in the NRF or the NRF received during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -559,7 +612,8 @@ module _3gpp-5gc-nrm-nfprofile { } list servedAmfInfo { - description "This attribute contains all the amfInfo attributes locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the amfInfo attributes + locally configured in the NRF or the NRF received during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -572,7 +626,8 @@ module _3gpp-5gc-nrm-nfprofile { } list servedSmfInfo { - description "This attribute contains all the smfInfo attributes locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the smfInfo attributes + locally configured in the NRF or the NRF received during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -585,7 +640,8 @@ module _3gpp-5gc-nrm-nfprofile { } list servedUpfInfo { - description "This attribute contains all the upfInfo attributes locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the upfInfo attributes + locally configured in the NRF or the NRF received during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -598,7 +654,8 @@ module _3gpp-5gc-nrm-nfprofile { } list servedPcfInfo { - description "This attribute contains all the pcfInfo attributes locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the pcfInfo attributes + locally configured in the NRF or the NRF received during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -611,7 +668,8 @@ module _3gpp-5gc-nrm-nfprofile { } list servedBsfInfo { - description "This attribute contains all the bsfInfo attributes locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the bsfInfo attributes + locally configured in the NRF or the NRF received during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -624,7 +682,8 @@ module _3gpp-5gc-nrm-nfprofile { } list servedChfInfo { - description "This attribute contains all the bsfInfo attributes locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the bsfInfo attributes + locally configured in the NRF or the NRF received during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -655,31 +714,42 @@ module _3gpp-5gc-nrm-nfprofile { } leaf nfServicePersistence { - description "If present, and set to true, it indicates that the different service instances of a same NF Service in this NF instance, - supporting a same API version, are capable to persist their resource state in shared storage and therefore these resources - are available after a new NF service instance supporting the same API version is selected by a NF Service Consumer (see 3GPP TS 23.527). - Otherwise, it indicates that the NF Service Instances of a same NF Service are not capable to share resource state inside the NF Instance."; + description "If present, and set to true, it indicates that the different + service instances of a same NF Service in this NF instance, + supporting a same API version, are capable to persist + their resource state in shared storage and therefore these resources + are available after a new NF service instance supporting + the same API version is selected by a NF Service Consumer (see 3GPP TS 23.527). + Otherwise, it indicates that the NF Service Instances of + a same NF Service are not capable to share resource state inside the NF Instance."; type boolean; } list nfServices { - description "List of NF Service Instances. It shall include the services produced by the NF that can be discovered by other NFs."; + description "List of NF Service Instances. It shall include + the services produced by the NF that can be discovered by other NFs."; key serviceInstanceID; min-elements 1; uses nfs3gpp:NFServiceGrp; } leaf nfProfileChangesSupportInd { - description "NF Profile Changes Support Indicator. This IE may be present in the NFRegister or NFUpdate (NF Profile Complete Replacement) request and shall be absent in the response. - true: the NF Service Consumer supports receiving NF Profile Changes in the response. - false (default): the NF Service Consumer does not support receiving NF Profile Changes in the response."; + description "NF Profile Changes Support Indicator. This IE may be present + in the NFRegister or NFUpdate (NF Profile Complete Replacement) request + and shall be absent in the response. + true: the NF Service Consumer supports receiving NF Profile + Changes in the response. + false (default): the NF Service Consumer does not support + receiving NF Profile Changes in the response."; type boolean; } leaf nfProfileChangesInd { - description "NF Profile Changes Indicator. This IE shall be absent in the request to the NRF and may be included by the NRF in NFRegister or NFUpdate (NF Profile Complete Replacement) response. + description "NF Profile Changes Indicator. This IE shall be absent + in the request to the NRF and may be included by the NRF + in NFRegister or NFUpdate (NF Profile Complete Replacement) response. true: the NF Profile contains NF Profile changes. false (default): complete NF Profile."; @@ -712,58 +782,74 @@ module _3gpp-5gc-nrm-nfprofile { grouping SupiRange { leaf start { - description "First value identifying the start of a SUPI range. To be used when the range of SUPI's can be represented as a numeric range (e.g., IMSI ranges)."; + description "First value identifying the start of a SUPI range. + To be used when the range of SUPI's can be represented + as a numeric range (e.g., IMSI ranges)."; type string { pattern '^[0-9]+$'; } } leaf end { - description "Last value identifying the end of a SUPI range. To be used when the range of SUPI's can be represented as a numeric range (e.g. IMSI ranges)."; + description "Last value identifying the end of a SUPI range. + To be used when the range of SUPI's can be represented + as a numeric range (e.g. IMSI ranges)."; type string { pattern '^[0-9]+$'; } } leaf pattern { - description "Pattern representing the set of SUPI's belonging to this range. - A SUPI value is considered part of the range if and only if the SUPI string fully matches the regular expression."; + description "Pattern representing the set of SUPI's belonging + to this range. + A SUPI value is considered part of the range + if and only if the SUPI string fully matches the regular expression."; type string; } } grouping IdentityRange { leaf start { - description "First value identifying the start of an identity range. To be used when the range of identities can be represented as a numeric range (e.g., MSISDN ranges)."; + description "First value identifying the start of an identity range. + To be used when the range of identities can be represented + as a numeric range (e.g., MSISDN ranges)."; type string { pattern '^[0-9]+$'; } } leaf end { - description "Last value identifying the end of an identity range. To be used when the range of identities can be represented as a numeric range (e.g. MSISDN ranges)."; + description "Last value identifying the end of an identity range. + To be used when the range of identities can be represented + as a numeric range (e.g. MSISDN ranges)."; type string { pattern '^[0-9]+$'; } } leaf pattern { - description "Pattern representing the set of identities belonging to this range. - An identity value is considered part of the range if and only if the identity string fully matches the regular expression."; + description "Pattern representing the set of identities + belonging to this range. + An identity value is considered part of the range + if and only if the identity string fully matches the regular expression."; type string; } } grouping TacRange { leaf start { - description "First value identifying the start of a TAC range, to be used when the range of TAC's can be represented as a hexadecimal range (e.g., TAC ranges)."; + description "First value identifying the start of a TAC range, + to be used when the range of TAC's can be represented + as a hexadecimal range (e.g., TAC ranges)."; type string { pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6}$)'; } } leaf end { - description "Last value identifying the end of a TAC range, to be used when the range of TAC's can be represented as a hexadecimal range (e.g. TAC ranges)."; + description "Last value identifying the end of a TAC range, + to be used when the range of TAC's can be represented as + a hexadecimal range (e.g. TAC ranges)."; type string { pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6})$'; } @@ -803,14 +889,19 @@ module _3gpp-5gc-nrm-nfprofile { } leaf-list dnaiList { - description "List of Data network access identifiers supported by the UPF for this DNN. - The absence of this attribute indicates that the UPF can be selected for this DNN for any DNAI."; + description "List of Data network access identifiers supported + by the UPF for this DNN. + The absence of this attribute indicates that the UPF + can be selected for this DNN for any DNAI."; min-elements 1; - type string; //dnai is the type but its only a string with desc: DNAI (Data network access identifier), is this needed as its own typedef or string is ok + type string; //dnai is the type but its only a string with + desc: DNAI (Data network access identifier), + is this needed as its own typedef or string is ok } leaf-list pduSessionTypes { - description "List of PDU session type(s) supported by the UPF for a specific DNN."; + description "List of PDU session type(s) supported by + the UPF for a specific DNN."; min-elements 1; type PduSessionType; } @@ -818,14 +909,17 @@ module _3gpp-5gc-nrm-nfprofile { grouping Snssai { leaf sst { - description "Unsigned integer, within the range 0 to 255, representing the Slice/Service Type. - It indicates the expected Network Slice behaviour in terms of features and services."; + description "Unsigned integer, within the range 0 to 255, + representing the Slice/Service Type. + It indicates the expected Network Slice behaviour + in terms of features and services."; mandatory true; type uint32; } leaf sd { - description "3-octet string, representing the Slice Differentiator, in hexadecimal representation."; + description "3-octet string, representing the Slice Differentiator, + in hexadecimal representation."; type string { pattern '^[A-Fa-f0-9]{6}$'; } @@ -872,7 +966,8 @@ module _3gpp-5gc-nrm-nfprofile { choice address { case ipv4EndpointAddresses { leaf-list ipv4EndpointAddresses { - description "Available endpoint IPv4 address(es) of the User Plane interface."; + description "Available endpoint IPv4 address(es) of + the User Plane interface."; min-elements 1; type inet:ipv4-address; } @@ -880,7 +975,8 @@ module _3gpp-5gc-nrm-nfprofile { case ipv6EndpointAddresses { leaf-list ipv6EndpointAddresses { - description "Available endpoint IPv6 address(es) of the User Plane interface."; + description "Available endpoint IPv6 address(es) of + the User Plane interface."; min-elements 1; type inet:ipv6-address; } @@ -888,14 +984,16 @@ module _3gpp-5gc-nrm-nfprofile { case endpointFqdn { leaf endpointFqdn { - description "FQDN of available endpoint of the User Plane interface."; + description "FQDN of available endpoint of the + User Plane interface."; type inet:domain-name; } } } leaf networkInstance { - description "Network Instance associated to the User Plane interface."; + description "Network Instance associated to the + User Plane interface."; type string; } } @@ -1014,7 +1112,8 @@ module _3gpp-5gc-nrm-nfprofile { grouping PlmnSnssai { list plmnId { - description "PLMN ID for which list of supported S-NSSAI(s) is provided."; + description "PLMN ID for which list of supported S-NSSAI(s) + is provided."; min-elements 1; max-elements 1; key "mcc mnc"; @@ -1022,7 +1121,8 @@ module _3gpp-5gc-nrm-nfprofile { } list sNssaiList { - description "The specific list of S-NSSAIs supported by the given PLMN."; + description "The specific list of S-NSSAIs supported + by the given PLMN."; min-elements 1; key "sst sd"; uses Snssai; -- GitLab From 7faea856bf6e325249ab0c8cfb33ea6734398d0b Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 18 Jan 2024 00:17:15 +0000 Subject: [PATCH 47/57] Update file _3gpp-5gc-nrm-nfprofile.yang --- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 40d9ce029..fd6b6a9b7 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -895,8 +895,8 @@ module _3gpp-5gc-nrm-nfprofile { can be selected for this DNN for any DNAI."; min-elements 1; type string; //dnai is the type but its only a string with - desc: DNAI (Data network access identifier), - is this needed as its own typedef or string is ok + //desc: DNAI (Data network access identifier), + //is this needed as its own typedef or string is ok } leaf-list pduSessionTypes { -- GitLab From 6e21fb311ed22d2d5efd8a0e9f246919d8ea9411 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 18 Jan 2024 00:23:47 +0000 Subject: [PATCH 48/57] Update file _3gpp-5gc-nrm-nfprofile.yang --- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 138 +++++++++++++++-------- 1 file changed, 92 insertions(+), 46 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index fd6b6a9b7..7e5b18e62 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -75,7 +75,8 @@ module _3gpp-5gc-nrm-nfprofile { S-NSSAIs supported by the NF for each PLMN it is supporting is different. When present, this IE shall include the S-NSSAIs supported by the Network Function for each PLMN supported by - the Network Function. When present, this IE shall override sNssais IE."; + the Network Function. When present, this IE shall + override sNssais IE."; min-elements 1; key idx; leaf idx { type uint32; } @@ -150,7 +151,8 @@ module _3gpp-5gc-nrm-nfprofile { description "Priority (relative to other NFs of the same type) in the range of 0-65535, to be used for NF selection; lower values indicate a higher priority. - If priority is also present in the nfServiceList parameters, + If priority is also present in the nfServiceList + parameters, those will have precedence over this value. The NRF may overwrite the received priority value when exposing an NFProfile with the Nnrf_NFDiscovery service."; @@ -180,8 +182,10 @@ module _3gpp-5gc-nrm-nfprofile { grouping udrInfo { leaf groupId { - description "Identity of the UDR group that is served by the UDR instance. - If not provided, the UDR instance does not pertain to any UDR group."; + description "Identity of the UDR group that is served + by the UDR instance. + If not provided, the UDR instance does not pertain + to any UDR group."; type string; } @@ -315,7 +319,8 @@ module _3gpp-5gc-nrm-nfprofile { It may contain the non-3GPP access TAI. The absence of this attribute and the taiRangeList attribute indicate that - the AMF can be selected for any TAI in the serving network."; + the AMF can be selected for any TAI in the + serving network."; key idx; leaf idx { type uint32; } @@ -383,8 +388,10 @@ module _3gpp-5gc-nrm-nfprofile { list taiList { description "The list of TAIs the SMF can serve. It may contain the non-3GPP access TAI. - The absence of this attribute and the taiRangeList attribute indicate that - the SMF can be selected for any TAI in the serving network."; + The absence of this attribute and the taiRangeList + attribute indicate that + the SMF can be selected for any TAI + in the serving network."; key idx; leaf idx { type uint32; } @@ -412,7 +419,8 @@ module _3gpp-5gc-nrm-nfprofile { leaf-list accessType { description "If included, this IE shall contain the access type (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF. - If not included, it shall be assumed the both access types are supported."; + If not included, it shall be assumed the both + access types are supported."; min-elements 1; max-elements 2; @@ -432,7 +440,8 @@ module _3gpp-5gc-nrm-nfprofile { leaf-list smfServingArea { description "The SMF service area(s) the UPF can serve. - If not provided, the UPF can serve any SMF service area."; + If not provided, the UPF can serve any + SMF service area."; min-elements 1; type string; @@ -441,7 +450,8 @@ module _3gpp-5gc-nrm-nfprofile { list interfaceUpfInfo { description "List of User Plane interfaces configured on the UPF. When this IE is provided in the NF Discovery response, - the NF Service Consumer (e.g. SMF) may use this information for UPF selection."; + the NF Service Consumer (e.g. SMF) may use + this information for UPF selection."; key idx; leaf idx { type uint32; } @@ -570,8 +580,10 @@ module _3gpp-5gc-nrm-nfprofile { grouping nrfInfoGrp { list servedUdrInfo { - description "This attribute contains all the udrInfo attributes - locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the udrInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -584,8 +596,10 @@ module _3gpp-5gc-nrm-nfprofile { } list servedUdmInfo { - description "This attribute contains all the udmInfo attributes - locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the udmInfo + attributes + locally configured in the NRF or the NRF + received during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -598,8 +612,10 @@ module _3gpp-5gc-nrm-nfprofile { } list servedAusfInfo { - description "This attribute contains all the ausfInfo attributes - locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the + ausfInfo attributes + locally configured in the NRF or the NRF + received during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -612,8 +628,10 @@ module _3gpp-5gc-nrm-nfprofile { } list servedAmfInfo { - description "This attribute contains all the amfInfo attributes - locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the amfInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -626,8 +644,10 @@ module _3gpp-5gc-nrm-nfprofile { } list servedSmfInfo { - description "This attribute contains all the smfInfo attributes - locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the smfInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -640,8 +660,10 @@ module _3gpp-5gc-nrm-nfprofile { } list servedUpfInfo { - description "This attribute contains all the upfInfo attributes - locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the upfInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -654,8 +676,10 @@ module _3gpp-5gc-nrm-nfprofile { } list servedPcfInfo { - description "This attribute contains all the pcfInfo attributes - locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the pcfInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -668,8 +692,10 @@ module _3gpp-5gc-nrm-nfprofile { } list servedBsfInfo { - description "This attribute contains all the bsfInfo attributes - locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the bsfInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -682,8 +708,10 @@ module _3gpp-5gc-nrm-nfprofile { } list servedChfInfo { - description "This attribute contains all the bsfInfo attributes - locally configured in the NRF or the NRF received during NF registration."; + description "This attribute contains all the bsfInfo + attributes + locally configured in the NRF or the NRF received + during NF registration."; key nfInstanceID; leaf nfInstanceID { @@ -714,29 +742,40 @@ module _3gpp-5gc-nrm-nfprofile { } leaf nfServicePersistence { - description "If present, and set to true, it indicates that the different - service instances of a same NF Service in this NF instance, - supporting a same API version, are capable to persist - their resource state in shared storage and therefore these resources - are available after a new NF service instance supporting - the same API version is selected by a NF Service Consumer (see 3GPP TS 23.527). - Otherwise, it indicates that the NF Service Instances of - a same NF Service are not capable to share resource state inside the NF Instance."; + description "If present, and set to true, it indicates that + the different + service instances of a same NF Service + in this NF instance, + + supporting a same API version, are capable to persist + their resource state in shared storage and + therefore these resources + are available after a new NF service + instance supporting + the same API version is selected by a NF + Service Consumer (see 3GPP TS 23.527). + Otherwise, it indicates that the NF Service + Instances of + a same NF Service are not capable to share + resource state inside the NF Instance."; type boolean; } list nfServices { description "List of NF Service Instances. It shall include - the services produced by the NF that can be discovered by other NFs."; + the services produced by the NF that can be + discovered by other NFs."; key serviceInstanceID; min-elements 1; uses nfs3gpp:NFServiceGrp; } leaf nfProfileChangesSupportInd { - description "NF Profile Changes Support Indicator. This IE may be present - in the NFRegister or NFUpdate (NF Profile Complete Replacement) request + description "NF Profile Changes Support Indicator. + This IE may be present + in the NFRegister or NFUpdate (NF Profile Complete + Replacement) request and shall be absent in the response. true: the NF Service Consumer supports receiving NF Profile Changes in the response. @@ -782,8 +821,10 @@ module _3gpp-5gc-nrm-nfprofile { grouping SupiRange { leaf start { - description "First value identifying the start of a SUPI range. - To be used when the range of SUPI's can be represented + description "First value identifying the start of + a SUPI range. + To be used when the range of SUPI's can be + represented as a numeric range (e.g., IMSI ranges)."; type string { pattern '^[0-9]+$'; @@ -791,8 +832,10 @@ module _3gpp-5gc-nrm-nfprofile { } leaf end { - description "Last value identifying the end of a SUPI range. - To be used when the range of SUPI's can be represented + description "Last value identifying the end of + a SUPI range. + To be used when the range of SUPI's can be + represented as a numeric range (e.g. IMSI ranges)."; type string { pattern '^[0-9]+$'; @@ -802,8 +845,10 @@ module _3gpp-5gc-nrm-nfprofile { leaf pattern { description "Pattern representing the set of SUPI's belonging to this range. - A SUPI value is considered part of the range - if and only if the SUPI string fully matches the regular expression."; + A SUPI value is considered part + of the range + if and only if the SUPI string + fully matches the regular expression."; type string; } } @@ -831,7 +876,8 @@ module _3gpp-5gc-nrm-nfprofile { description "Pattern representing the set of identities belonging to this range. An identity value is considered part of the range - if and only if the identity string fully matches the regular expression."; + if and only if the identity string fully + matches the regular expression."; type string; } } -- GitLab From 902a535fb070750ffbffd102d53facbb0568b0cb Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 18 Jan 2024 00:27:23 +0000 Subject: [PATCH 49/57] Update file _3gpp-5gc-nrm-nfprofile.yang --- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 7e5b18e62..f54e21032 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -154,7 +154,8 @@ module _3gpp-5gc-nrm-nfprofile { If priority is also present in the nfServiceList parameters, those will have precedence over this value. - The NRF may overwrite the received priority value when exposing + The NRF may overwrite the received priority value + when exposing an NFProfile with the Nnrf_NFDiscovery service."; type uint16; } @@ -461,7 +462,8 @@ module _3gpp-5gc-nrm-nfprofile { } leaf iwkEpsInd { - description "Indicates whether interworking with EPS is supported by the UPF. + description "Indicates whether interworking with EPS is + supported by the UPF. true: Supported false (default): Not Supported"; @@ -725,6 +727,7 @@ module _3gpp-5gc-nrm-nfprofile { } list nrfInfo { + description "nrfinfo"; key idx; leaf idx { type uint32; } max-elements 1; -- GitLab From c24d080c7dec7dc749ea784ddde644824ecccbb9 Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 2 Feb 2024 04:03:11 +0000 Subject: [PATCH 50/57] Update 2 files - /yang-models/_3gpp-5gc-nrm-nfprofile.yang - /yang-models/_3gpp-5gc-nrm-smffunction.yang --- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 22 ---------------------- yang-models/_3gpp-5gc-nrm-smffunction.yang | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index f54e21032..44bc03a8e 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -1136,29 +1136,7 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; type string; } - - list dnaiSatelliteMappingList { - description "List of the mapping relationship between - satellite ID and at least one DNAI."; - min-elements 1; - key "satelliteid"; - uses dnaiSatelliteMapping; - } - } - - grouping dnaiSatelliteMapping { - leaf-list dnaiList { - description "List of Data network access identifiers."; - min-elements 1; - type string; - } - leaf satelliteid { - description "Unique identifier of a GEO satellite."; - type string; - } - } - grouping PlmnSnssai { list plmnId { description "PLMN ID for which list of supported S-NSSAI(s) diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang index 1bc7ce5eb..8550fcc3d 100755 --- a/yang-models/_3gpp-5gc-nrm-smffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang @@ -91,6 +91,27 @@ module _3gpp-5gc-nrm-smffunction { description "DN of the Dynamic5QISet that the SMFFunction supports (is associated to)."; } + + list dnaiSatelliteMappingList { + description "List of the mapping relationship between + satellite ID and at least one DNAI."; + min-elements 1; + key "satelliteid"; + uses dnaiSatelliteMapping; + } + } + + grouping dnaiSatelliteMapping { + leaf-list dnaiList { + description "List of Data network access identifiers."; + min-elements 1; + type string; + } + + leaf satelliteid { + description "Unique identifier of a GEO satellite."; + type string; + } } augment "/me3gpp:ManagedElement" { -- GitLab From 1cc9739e4e004e6755d4fb3aee6132a5a788ab2a Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 2 Feb 2024 04:04:30 +0000 Subject: [PATCH 51/57] Update file _3gpp-5gc-nrm-nfprofile.yang --- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 44bc03a8e..43f988955 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -1136,6 +1136,7 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; type string; } + } grouping PlmnSnssai { list plmnId { -- GitLab From 9285f6cf172fce96e2df5498221303858d80177f Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 13 Feb 2024 22:19:16 +0100 Subject: [PATCH 52/57] Locally rebasing and merging MR 988 28.623_Rel18_CR_Specify_notificationFilter into Integration_Rel18_SA5_153_YANG --- yang-models/_3gpp-common-subscription-control.yang | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index a6a1ab477..ed049c654 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -10,7 +10,7 @@ module _3gpp-common-subscription-control { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines IOCs for subscription and heartbeat control. - 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.623 Generic Network Resource Model (NRM) @@ -18,7 +18,7 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; - revision 2024-01-18 { reference CR-0329 ; } + revision 2024-01-18 { reference "CR-0309 CR-0329" ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-10 { reference "CR0257 CR0260"; } revision 2022-10-20 { reference CR-0196; } @@ -100,7 +100,11 @@ module _3gpp-common-subscription-control { If notificationFilter is present, only notifications that pass the filter criteria are forwarded to the notification recipient; all other notifications are discarded. - The filter can be applied to any field of a notification."; + The filter can be applied to any field of a notification. + + The format of the string shall confrm to a + JSON expressions (Jex) 'JexConditionsExpr'"; + reference "3GPP TS 32.161"; } } -- GitLab From 6cd98e62b8498f4c7688624043344c2c2fd90eba Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Wed, 17 Jan 2024 22:58:32 +0000 Subject: [PATCH 53/57] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 60 +++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index a17cdbf98..e640c41b7 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,6 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2024-01-29 { reference "CR-xxxx"; } revision 2023-11-06 { reference "CR-0290 CR-0294"; } revision 2023-11-03 { reference CR-0302 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -1233,6 +1234,33 @@ module _3gpp-common-trace { } } + grouping UEMeasConfigGrp { + description "Represents the UEMeasConfig dataType. + This <> defines the aconfiguration parameters of IOC TraceJob + which are specific for UE level measurements collection."; + + leaf-list ueMeasurements { + type string; + description "It specifies the List of UE level measurements."; + } + + leaf ueMeasGranularityPeriod { + type uint32; + description "It specifies the Granularity period used to produce UE level + measurements. The period is defined in milliseconds (ms)."; + } + + leaf-list objectInstances { + type string; + description "List of object instances."; + } + + leaf-list rootObjectInstances { + type string; + description "List of root object instances."; + } + } + grouping TraceJobGrp { leaf jobType { @@ -1244,6 +1272,10 @@ module _3gpp-common-trace { enum RLF_REPORT_ONLY; enum RCEF_REPORT_ONLY; enum LOGGED_MBSFN_MDT; + enum UE_LEVEL_MEASUREMENTS_ONLY; + enum TRACE_AND_UE_LEVEL_MEASUREMENTS; + enum IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS; + enum TRACE_AND_IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS; } default TRACE_ONLY; description "Specifies the MDT mode and it specifies also whether the @@ -1409,6 +1441,17 @@ module _3gpp-common-trace { leaf idx { type string; } } + list ueMeasConfig { + when '../jobType = "UE_LEVEL_MEASUREMENTS_ONLY"' + + ' or ../jobType = "TRACE_AND_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS"' + key idx; + description "UE level measurements config"; + max-elements 1; + uses UEMeasConfigGrp; + leaf idx { type string; } + } list nPNTarget { description "applicable only for NR and shall be present in case of NPN either a PNI-NPN or a SNPN) and for management-based activation when @@ -1477,14 +1520,15 @@ module _3gpp-common-trace { 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. - In case of TRACE_ONLY, the configuration parameters of attribute - traceConfig shall be applied. In case of IMMEDIATE_MDT_ONLY, - LOGGED_MDT_ONLY, RLF_REPORT_ONLY, RCEF_REPORT_ONLY and - LOGGED_MBSFN_MDT the configuration parameters of attribute - mdtConfig or a subset of these shall be applied. - In case of IMMEDIATE_MDT_AND_TRACE both attributes, traceConfig and - mdtConfig are applicable. + The attribute jobType specifies the kind of data to collect. In case of + Trace only, the configuration parameters of attribute traceConfig shall + be applied. In case of Immediate MDT only, Logged MDT only, RLF reports + only, RCEF reports only and Logged MBSFN MDT, the configuration parameters + of attribute mdtConfig or a subset of these shall be applied. In case of + UE measurements only, the configuration parameters of attribute ueMeasConfig + shall be applied. In case of any combination of Trace, Immediate MDT, + Trace and UE measurements, the configuration parameters of the corresponding + attributes traceConfig, mdtConfig and ueMeasConfig are applicable. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created -- GitLab From 8e670f2dcd532e8e6ea0d6a5e9307a5a5c30fd79 Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Thu, 1 Feb 2024 16:30:03 +0000 Subject: [PATCH 54/57] Update 2 files - /yang-models/_3gpp-nr-nrm-eutrancellrelation.yang - /yang-models/_3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 30 +++++++++++-------- .../_3gpp-nr-nrm-eutrancellrelation.yang | 1 + 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index e640c41b7..b71cae0f1 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1248,6 +1248,11 @@ module _3gpp-common-trace { type uint32; description "It specifies the Granularity period used to produce UE level measurements. The period is defined in milliseconds (ms)."; + } + + leaf-list nfTypeToMeasure { + type string; + description "It specifies the NF types to measure."; } leaf-list objectInstances { @@ -1272,16 +1277,17 @@ module _3gpp-common-trace { enum RLF_REPORT_ONLY; enum RCEF_REPORT_ONLY; enum LOGGED_MBSFN_MDT; - enum UE_LEVEL_MEASUREMENTS_ONLY; - enum TRACE_AND_UE_LEVEL_MEASUREMENTS; - enum IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS; - enum TRACE_AND_IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS; + enum 5GC_UE_LEVEL_MEASUREMENTS_ONLY; + enum TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS; + enum IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; + enum TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; } default TRACE_ONLY; description "Specifies the MDT mode and it specifies also whether the - TraceJob represents only MDT, Logged MBSFN MDT, Trace or a combined - Trace and MDT job. The attribute is applicable for Trace, MDT, RCEF and - RLF reporting."; + TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE level measurement collection, or any combination + of Trace, immediate MDT and 5GC UE level measurement collection. + The attribute is applicable for Trace, MDT, RCEF and + RLF reporting, and 5GC UE level measurement collection."; reference "Clause 5.9a of 3GPP TS 32.422 for additional details on the allowed values."; } @@ -1442,12 +1448,12 @@ module _3gpp-common-trace { } list ueMeasConfig { - when '../jobType = "UE_LEVEL_MEASUREMENTS_ONLY"' - + ' or ../jobType = "TRACE_AND_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = "IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS"' + when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"' + + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' key idx; - description "UE level measurements config"; + description "5GC UE level measurements config"; max-elements 1; uses UEMeasConfigGrp; leaf idx { type string; } diff --git a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang index 8f7d24596..3ec1b8adb 100755 --- a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang @@ -1,3 +1,4 @@ + module _3gpp-nr-nrm-eutrancellrelation { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutrancellrelation"; -- GitLab From 952cb529a71197c4ace25a89b130c405a27390a3 Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Thu, 1 Feb 2024 17:07:48 +0000 Subject: [PATCH 55/57] Update file _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 b71cae0f1..2c2dad93e 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1451,7 +1451,7 @@ module _3gpp-common-trace { when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"' + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' - + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "5GC UE level measurements config"; max-elements 1; -- GitLab From 061ccc0ebcb025877ade80be9eae24d68f48b218 Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Thu, 1 Feb 2024 17:39:43 +0000 Subject: [PATCH 56/57] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 2c2dad93e..cd2a69cb7 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,7 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; - revision 2024-01-29 { reference "CR-xxxx"; } + revision 2024-01-29 { reference "CR-0316"; } revision 2023-11-06 { reference "CR-0290 CR-0294"; } revision 2023-11-03 { reference CR-0302 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -1426,7 +1426,9 @@ module _3gpp-common-trace { list traceConfig { when '../jobType = "TRACE_ONLY"' - + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; + + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' + + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "Trace config"; max-elements 1; @@ -1439,7 +1441,9 @@ module _3gpp-common-trace { + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"' + ' or ../jobType = "RLF_REPORT_ONLY"' + ' or ../jobType = "RCEF_REPORT_ONLY"' - + ' or ../jobType = "LOGGED_MBSFN_MDT"'; + + ' or ../jobType = "LOGGED_MBSFN_MDT"' + + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' + + ' or ../jobType = "TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"'; key idx; description "MDT config"; max-elements 1; -- GitLab From 4093876384f78dcca9206ccde1dbef0a9fecd651 Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Thu, 1 Feb 2024 18:33:10 +0000 Subject: [PATCH 57/57] Update file _3gpp-nr-nrm-eutrancellrelation.yang --- yang-models/_3gpp-nr-nrm-eutrancellrelation.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang index 3ec1b8adb..8f7d24596 100755 --- a/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutrancellrelation.yang @@ -1,4 +1,3 @@ - module _3gpp-nr-nrm-eutrancellrelation { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutrancellrelation"; -- GitLab