From f5b8aedf5f75ce02ce412c56c538155ad495bccb Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 06:50:46 +0000 Subject: [PATCH 01/22] 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 2b0360944082fe01f9ff350d71c7fc82e599d807 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 06:58:59 +0000 Subject: [PATCH 02/22] 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 a38b5a5a504fff42ee1664c1d9f56b6c2c68f460 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 07:12:25 +0000 Subject: [PATCH 03/22] 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 08522e5f3093cde2d9b4c1399802f735ee1d6105 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 07:17:41 +0000 Subject: [PATCH 04/22] 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 49339eaa5607713ba700b4957c392ee7006b980c Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 08:54:57 +0000 Subject: [PATCH 05/22] 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 3ed4088b41101a80209548b846d113dcc3bab740 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 08:56:59 +0000 Subject: [PATCH 06/22] 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 b57a6e186661770eb477ad458ca17d0941fdde3c Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 08:58:33 +0000 Subject: [PATCH 07/22] 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 1e6614e829f5d864a2fb89650d90180f97c77441 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 00:40:28 +0000 Subject: [PATCH 08/22] 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 e604b1773f40b4fcd1be2cadf457233cabffa73a Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 00:45:07 +0000 Subject: [PATCH 09/22] 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 59d05509c7373cf02b1d387a95d984990250ce52 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 00:51:14 +0000 Subject: [PATCH 10/22] 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 589608098bd0d3ff2341d60e3a67dc3bfe96c356 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 00:56:31 +0000 Subject: [PATCH 11/22] 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 edc6705c554266c2f930001ae2e730094aa77fb4 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 00:57:46 +0000 Subject: [PATCH 12/22] 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 0c1c6d7a949c599121d79dbdffce064921c0c438 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 01:07:06 +0000 Subject: [PATCH 13/22] 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 90a0700d30766ed9196e486e0543036dc445ecf6 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 01:11:28 +0000 Subject: [PATCH 14/22] 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 96e6061548ed01d0a05218ea67e850eb464ff23f Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 01:18:05 +0000 Subject: [PATCH 15/22] 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 9618b24f64efc33d2af49116966f5769887687ef Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 01:59:00 +0000 Subject: [PATCH 16/22] 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 16aa9626f6eeb0878ce547cfabe336e89049e648 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 02:00:23 +0000 Subject: [PATCH 17/22] 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 a4c932d8cb8132f1a74f594188a23a8432e4335b Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 02:04:36 +0000 Subject: [PATCH 18/22] 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 96fe3dd00260f8a72294ef6cb985250e250d3d40 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 02:14:12 +0000 Subject: [PATCH 19/22] 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 98d6fb9bc97d7f66ecc1cef55e022722f81690e2 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 02:15:35 +0000 Subject: [PATCH 20/22] 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 97d1fe50db0b1e2cbfbff069a4f1db7bb9549174 Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 02:17:26 +0000 Subject: [PATCH 21/22] 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 f093d72b78b4580e5df21fea2fd59814699a285a Mon Sep 17 00:00:00 2001 From: qiwen Date: Thu, 16 Nov 2023 02:23:49 +0000 Subject: [PATCH 22/22] 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