From 1d28caa8d164356bb57bca5536991904fd0301f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 08:39:35 +0000 Subject: [PATCH 01/22] Edit _3gpp-5g-common-yang-types.yang --- yang-models/_3gpp-5g-common-yang-types.yang | 83 +++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 59ddcb2c3..e0f29e6a3 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -15,6 +15,7 @@ module _3gpp-5g-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-11-01 { reference CR-XXXX; } revision 2025-07-25 { reference CR-1558 ; } revision 2025-03-25 { reference CR-1489 ; } revision 2024-11-01 { reference CR-1405; } @@ -405,4 +406,86 @@ module _3gpp-5g-common-yang-types { } } + grouping MnrOamIPConfigGrp { + description "This data type includes the configutation for OAM connectivity + used for mobile NR node (e.g., IAB-node, MWAB-node) to establish connection with + management system. The configuration attributes include: + Configuration of certification authority (CA/RA) server, + Configuration of security gateway (SeGW), and + Configuration of software configuration server (SCS)"; + + list caraConfiguration { + description "configuration used for mobile NR node (e.g., IAB-node, MWAB-node) + to perform certificate enrolment procedure as specified in TS 28.315."; + uses CaraConfigurationGrp; + max-elements 1; + key caraAddress; + } + + leaf seGwConfiguration { + description "this parameter specifies IP address or + FQDN of security gateway (SeGW) used for mobile NR + node (e.g., IAB-node, MWAB-node) to establish secure connection + as specified in TS 28.315."; + type inet:host; + + } + + leaf scsConfiguration { + description "this parameter specifies IP address or FQDN of + configuration server (SCS) used for mobile NR node + (e.g., IAB-node, MWAB-node) to establish connection as + specified in TS 28.315."; + type inet:host; + } + } + + grouping LocationInfoGrp { + description "This data type contains location information + of mobile NR node (e.g., IAB-node, MWAB-node)."; + + leaf gNBId { + type int64 { range "0..4294967295"; } + description "It is either the gNB ID of the IAB-donor-CU that target IAB-DU + connects to or the gNB Id of the IAB-nonor-CU that serves IAB-MT, or + the gNBId of the gNB that serves MWAB-UE."; + } + + list pLMNId { + uses types3gpp:PLMNId; + max-elements 1; + description "The PLMN ID where IAB-MT or MWAB-UE is connected to"; + key "mcc mnc"; + } + + leaf cellLocalId { + type int32 { range "0..16383"; } + description "Identifies an NR cell where IAB-MT or MWAB-UE + is connected to."; + } + + leaf nRTAC { + type types5g3gpp:NRTAC; + description "It is TAC pertaining to the cells where IAB-MT or MWAB-UE is + connected."; + } + + list tAI { + uses types3gpp:TaiGrp; + key idx; + leaf idx { type string; } + max-elements 1; + description "It is the TAI (see subclause 9.3.3.11 in TS 38.413) pertaining + to the cells where IAB-MT or MWAB-UE is connected"; + } + list geoArea { + uses types3gpp:GeoAreaGrp; + key idx; + leaf idx {type string;} + max-elements 1; + description "It specifies geographical area of mobile NR node + (e.g., IAB-node or MWAB-node)."; + } + } + } \ No newline at end of file -- GitLab From cf503fc5f42e0a3136e6578935984357641e7222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 08:39:39 +0000 Subject: [PATCH 02/22] Edit _3gpp-nr-nrm-mwab.yang --- yang-models/_3gpp-nr-nrm-mwab.yang | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-mwab.yang b/yang-models/_3gpp-nr-nrm-mwab.yang index 9f8af2af9..fd07e97d3 100644 --- a/yang-models/_3gpp-nr-nrm-mwab.yang +++ b/yang-models/_3gpp-nr-nrm-mwab.yang @@ -5,6 +5,7 @@ module _3gpp-nr-nrm-mwab { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-top {} organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -15,10 +16,21 @@ module _3gpp-nr-nrm-mwab { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-01-11 { refence CR-XXXX ; } revision 2025-04-25 { reference CR-1527 ; } grouping MWABGrp { - description "Represets the ExternalENBFunction IOC."; + description "Represents the MWAB IOC."; + + list mnrOamIPConfig { + description "It is IP configutation for OAM connectivity used + by a mobile NR node (e.g., IAB-node, MWAB-node) + to establish connection with management system as specified + in TS 28.314[x] clause 6.1.2"; + key id; + leaf id { type uint32; } + uses types5g3gpp:MnrOamIPConfigGrp ; + } leaf operationalState { description "It indicates the operational state of the MWAB instance. @@ -58,6 +70,13 @@ module _3gpp-nr-nrm-mwab { leaf idx { type uint32 ; } uses types3gpp:TimeWindowGrp; } + list locationInfo { + description "This parameter specifies the current location + of mobile NR node (e.g., IAB-node, MWAB-node)."; + key id; + leaf id { type uint32; } + uses types5g3gpp:LocationInfoGrp; + } } grouping MWABSubTree { -- GitLab From a2cc5040139944dac68e4d59e5a8b25bc4637640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 08:39:43 +0000 Subject: [PATCH 03/22] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 95 +++-------------------- 1 file changed, 9 insertions(+), 86 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 9a16b3d2e..54a534a01 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -18,17 +18,18 @@ module _3gpp-nr-nrm-iabfunction { reference "3GPP TS 28.541; 3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 33.310, IETF RFC 9811"; + revision 2025-11-01 { reference "CR-XXXX" ; } revision 2025-10-01 { reference "CR-1616" ; } revision 2025-08-15 { reference "CR-1598"; } grouping CaraConfigurationGrp { description "This data type represents the configuration used for mobile - NR node (e.g., IAB-node) to perform certificate enrolment procedure with + NR node (e.g., IAB-node, MWAB-node) to perform certificate enrolment procedure with Certification Authority server (CA/RA) as specified in TS 28.315 clause 5.3"; leaf caraAddress { type inet:host; - description "IP address or FQDN of CA/RA server"; + description "IP address or FQDN of the CMP (Certificate Management Protocol) server"; } leaf portNumber { @@ -67,84 +68,6 @@ module _3gpp-nr-nrm-iabfunction { } } - grouping MnrOamIPConfigGrp { - description "This data type includes the configutation for OAM connectivity - used for mobile NR node (e.g., IAB-node) to establish connection with - management system. The configuration attributes include: - Configuration of certification authority (CA/RA) server, - Configuration of security gateway (SeGW), and - Configuration of software configuration server (SCS)"; - - list caraConfiguration { - description "configuration used for mobile NR node (e.g., IAB-node) - to perform certificate enrolment procedure as specified in TS 28.315."; - uses CaraConfigurationGrp; - max-elements 1; - key caraAddress; - } - - leaf seGwConfiguration { - description "configuration of security - gateway (SeGW) used for mobile NR node (e.g., IAB-node) to establish - secure connection as specified in TS 28.315."; - type inet:host; - - } - - leaf scsConfiguration { - description "configuration of software - configuration server (SCS) used for mobile NR node (e.g., IAB-node) - to establish connection to SCS as specified in TS 28.315."; - type inet:host; - } - } - - grouping LocationInfoGrp { - description "This data type contains location information - of mobile NR node (e.g., IAB-node)."; - - leaf gNBId { - type int64 { range "0..4294967295"; } - description "It is either the gNB ID of the IAB-donor-CU that target IAB-DU - connects to or the gNB Id of the IAB-nonor-CU that serves IAB-MT"; - } - - list pLMNId { - uses types3gpp:PLMNId; - max-elements 1; - description "The PLMN ID where IAB-MT or MWAB-UE is connected to"; - key "mcc mnc"; - } - - leaf cellLocalId { - type int32 { range "0..16383"; } - description "Identifies an NR cell where IAB-MT or MWAB-UE - is connected to."; - } - - leaf nRTAC { - type types5g3gpp:NRTAC; - description "It is TAC pertaining to the cells where IAB-MT or MWAB-UE is - connected."; - } - - list tAI { - uses types3gpp:TaiGrp; - key idx; - leaf idx { type string; } - max-elements 1; - description "It is the TAI (see subclause 9.3.3.11 in TS 38.413) pertaining - to the cells where IAB-MT or MWAB-UE is connected"; - } - list geoArea { - uses types3gpp:GeoAreaGrp; - key idx; - leaf idx {type string;} - max-elements 1; - description "It specifies geographical area of mobile NR node - (e.g., IAB-node or MWAB)."; - } - } grouping IABGrp { description "IAB-node architecture is specified in TS 38.401. This IOC @@ -152,23 +75,23 @@ module _3gpp-nr-nrm-iabfunction { contained by SubNetwork or ManagedElement"; list mnrOamIPConfig { - description "It is IP configutation for OAM connectivity used IAB-node + description "It is IP configutation for OAM connectivity used + by a mobile NR node (e.g., IAB-node, MWAB-node) to establish connection with management system as specified in TS 28.314[x] clause 6.1.2"; key id; leaf id { type uint32; } - uses MnrOamIPConfigGrp ; + uses types5g3gpp:MnrOamIPConfigGrp ; } list locationInfo { - description "It is Location information of IAB-node that is used for - IAB-node OAM connection and IAB configuration as specified in - TS 28.314 clause 6.1.2 and TS 28.531 clause 5.1.27"; + description "This parameter specifies the current location + of mobile NR node (e.g., IAB-node, MWAB-node)."; key id; leaf id { type uint32; } - uses LocationInfoGrp; + uses types5g3gpp:LocationInfoGrp; } } -- GitLab From 9cbf2b22473714d1562394cb8572340681b78cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 08:44:17 +0000 Subject: [PATCH 04/22] Edit _3gpp-5g-common-yang-types.yang --- yang-models/_3gpp-5g-common-yang-types.yang | 47 +++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index e0f29e6a3..500392a73 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -406,6 +406,53 @@ module _3gpp-5g-common-yang-types { } } + + grouping CaraConfigurationGrp { + description "This data type represents the configuration used for mobile + NR node (e.g., IAB-node, MWAB-node) to perform certificate enrolment procedure with + Certification Authority server (CA/RA) as specified in TS 28.315 clause 5.3"; + + leaf caraAddress { + type inet:host; + description "IP address or FQDN of the CMP (Certificate Management Protocol) server"; + } + + leaf portNumber { + type inet:port-number; + description "This parameter specifies the port number used by + CMP (Certificate Management Protocol) server. The port for HTTP/HTTPSs + transfer of CMP messages is not explicitly given in RFC 9811, therefore + this parameter is required. The port number is usually + represented as 2 octets."; + } + + leaf path { + type inet:uri; + mandatory true; + description "This parameter specifies the path (in ASCII string) to + the CMP server directory. A CMP server may be located in an + arbitrary path other than root."; + } + + leaf subjectName { + type string; + mandatory true; + description "This parameter specifies the subject name (in ASCII + string) of the CA/RA. The use is described in 3GPP TS 33.310 + clause 9.5.3."; + } + + leaf protocol { + type enumeration { + enum HTTP; + enum HTTPS; + } + description "This parameter specifies the protocol (HTTP or HTTPS) + to be used for certificate enrolment. The use is described in + 3GPP TS 33.310 clause 9.6."; + } + } + grouping MnrOamIPConfigGrp { description "This data type includes the configutation for OAM connectivity used for mobile NR node (e.g., IAB-node, MWAB-node) to establish connection with -- GitLab From bc982d116ccd3ed6d36a97e69d5eef244e8b4276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 08:47:21 +0000 Subject: [PATCH 05/22] Edit _3gpp-5g-common-yang-types.yang --- yang-models/_3gpp-5g-common-yang-types.yang | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 500392a73..b9e485f6d 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -5,7 +5,6 @@ module _3gpp-5g-common-yang-types { import ietf-yang-types { prefix yang; } import ietf-inet-types { prefix inet; } - import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -15,7 +14,7 @@ module _3gpp-5g-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2025-11-01 { reference CR-XXXX; } + revision 2025-11-01 { reference CR-XXXX ; } revision 2025-07-25 { reference CR-1558 ; } revision 2025-03-25 { reference CR-1489 ; } revision 2024-11-01 { reference CR-1405; } @@ -115,7 +114,7 @@ module _3gpp-5g-common-yang-types { min-elements 1; max-elements 1; key "sst sd"; - uses types5g3gpp:SNssai; + uses SNssai; } list dnnSmfInfoList { -- GitLab From d886851e5468b4b0787e7391a3c7438adf456bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 08:50:02 +0000 Subject: [PATCH 06/22] Edit _3gpp-5g-common-yang-types.yang --- yang-models/_3gpp-5g-common-yang-types.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index b9e485f6d..09d704e8c 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -5,6 +5,7 @@ module _3gpp-5g-common-yang-types { import ietf-yang-types { prefix yang; } import ietf-inet-types { prefix inet; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; -- GitLab From aa24f65abad3db30497fbbf5d72164539054aade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 08:53:18 +0000 Subject: [PATCH 07/22] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 46 ----------------------- 1 file changed, 46 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 54a534a01..0062510a0 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -4,7 +4,6 @@ module _3gpp-nr-nrm-iabfunction { prefix "iab3gpp"; import ietf-inet-types { prefix inet; } - import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } @@ -22,51 +21,6 @@ module _3gpp-nr-nrm-iabfunction { revision 2025-10-01 { reference "CR-1616" ; } revision 2025-08-15 { reference "CR-1598"; } - grouping CaraConfigurationGrp { - description "This data type represents the configuration used for mobile - NR node (e.g., IAB-node, MWAB-node) to perform certificate enrolment procedure with - Certification Authority server (CA/RA) as specified in TS 28.315 clause 5.3"; - - leaf caraAddress { - type inet:host; - description "IP address or FQDN of the CMP (Certificate Management Protocol) server"; - } - - leaf portNumber { - type inet:port-number; - description "This parameter specifies the port number used by - CMP (Certificate Management Protocol) server. The port for HTTP/HTTPSs - transfer of CMP messages is not explicitly given in RFC 9811, therefore - this parameter is required. The port number is usually - represented as 2 octets."; - } - - leaf path { - type inet:uri; - mandatory true; - description "This parameter specifies the path (in ASCII string) to - the CMP server directory. A CMP server may be located in an - arbitrary path other than root."; - } - - leaf subjectName { - type string; - mandatory true; - description "This parameter specifies the subject name (in ASCII - string) of the CA/RA. The use is described in 3GPP TS 33.310 - clause 9.5.3."; - } - - leaf protocol { - type enumeration { - enum HTTP; - enum HTTPS; - } - description "This parameter specifies the protocol (HTTP or HTTPS) - to be used for certificate enrolment. The use is described in - 3GPP TS 33.310 clause 9.6."; - } - } grouping IABGrp { -- GitLab From e08e2ff261958d4f718ec6734e82eae9eb414eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 08:53:22 +0000 Subject: [PATCH 08/22] Edit _3gpp-nr-nrm-mwab.yang --- yang-models/_3gpp-nr-nrm-mwab.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-mwab.yang b/yang-models/_3gpp-nr-nrm-mwab.yang index fd07e97d3..d1feecdfd 100644 --- a/yang-models/_3gpp-nr-nrm-mwab.yang +++ b/yang-models/_3gpp-nr-nrm-mwab.yang @@ -5,7 +5,7 @@ module _3gpp-nr-nrm-mwab { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-common-top {} + import _3gpp-common-5g-yang-types { prefix types5g3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -16,7 +16,7 @@ module _3gpp-nr-nrm-mwab { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-01-11 { refence CR-XXXX ; } + revision 2025-11-01 { reference CR-XXXX ; } revision 2025-04-25 { reference CR-1527 ; } grouping MWABGrp { -- GitLab From 485df8b38dd5a82daa2e0809de9e817dd48d9d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 08:54:53 +0000 Subject: [PATCH 09/22] Edit _3gpp-5g-common-yang-types.yang -- GitLab From f4b7795f09d9ea72c5d77c4575b112287b86a8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 09:10:43 +0000 Subject: [PATCH 10/22] Edit _3gpp-nr-nrm-mwab.yang -- GitLab From 43b4d4cb55a49ded024c1133eb2debc42771574a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 09:10:46 +0000 Subject: [PATCH 11/22] Edit _3gpp-nr-nrm-iabfunction.yang -- GitLab From efa5f2efbccb0cdee98021ff84d01d3be28632ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 09:12:41 +0000 Subject: [PATCH 12/22] Edit _3gpp-nr-nrm-mwab.yang --- yang-models/_3gpp-nr-nrm-mwab.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-mwab.yang b/yang-models/_3gpp-nr-nrm-mwab.yang index d1feecdfd..718ad6a7f 100644 --- a/yang-models/_3gpp-nr-nrm-mwab.yang +++ b/yang-models/_3gpp-nr-nrm-mwab.yang @@ -5,7 +5,7 @@ module _3gpp-nr-nrm-mwab { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-common-5g-yang-types { prefix types5g3gpp; } + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; -- GitLab From 60e9b206e07b57482a47f265685a8980b2ef4ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 09:12:55 +0000 Subject: [PATCH 13/22] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 0062510a0..2796ea241 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -3,7 +3,6 @@ module _3gpp-nr-nrm-iabfunction { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-iabfunction"; prefix "iab3gpp"; - import ietf-inet-types { prefix inet; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } -- GitLab From 9e4ef38484fcf09c921eeaf776cbecef6af5e370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 09:40:31 +0000 Subject: [PATCH 14/22] Edit _3gpp-nr-nrm-mwab.yang --- yang-models/_3gpp-nr-nrm-mwab.yang | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-mwab.yang b/yang-models/_3gpp-nr-nrm-mwab.yang index 718ad6a7f..12e335dda 100644 --- a/yang-models/_3gpp-nr-nrm-mwab.yang +++ b/yang-models/_3gpp-nr-nrm-mwab.yang @@ -6,6 +6,9 @@ module _3gpp-nr-nrm-mwab { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -93,4 +96,23 @@ module _3gpp-nr-nrm-mwab { } } } + + feature MWABUnderManagedElement { + description "The MWAB shall be available under ManagedElement"; + } + + augment /me3gpp:ManagedElement { + if-feature MWABUnderManagedElement; + uses MWABSubTree; + } + + feature MWABUnderSubNetwork { + description "The MWAB shall be available under SubNetwork"; + } + + augment /subnet3gpp:SubNetwork { + if-feature MWABUnderSubNetwork; + uses MWABSubTree; + } + } -- GitLab From 540690f6427ca6ccba9bf0ffd84b930e57c35640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Nov 2025 09:42:34 +0000 Subject: [PATCH 15/22] Edit _3gpp-nr-nrm-mwab.yang --- yang-models/_3gpp-nr-nrm-mwab.yang | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-mwab.yang b/yang-models/_3gpp-nr-nrm-mwab.yang index 12e335dda..1d19ace4d 100644 --- a/yang-models/_3gpp-nr-nrm-mwab.yang +++ b/yang-models/_3gpp-nr-nrm-mwab.yang @@ -6,9 +6,6 @@ module _3gpp-nr-nrm-mwab { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } - import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -97,22 +94,4 @@ module _3gpp-nr-nrm-mwab { } } - feature MWABUnderManagedElement { - description "The MWAB shall be available under ManagedElement"; - } - - augment /me3gpp:ManagedElement { - if-feature MWABUnderManagedElement; - uses MWABSubTree; - } - - feature MWABUnderSubNetwork { - description "The MWAB shall be available under SubNetwork"; - } - - augment /subnet3gpp:SubNetwork { - if-feature MWABUnderSubNetwork; - uses MWABSubTree; - } - } -- GitLab From 9684035108b89cf9ad4898c9e82d3778589babe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 7 Nov 2025 15:03:19 +0000 Subject: [PATCH 16/22] Edit _3gpp-5g-common-yang-types.yang --- yang-models/_3gpp-5g-common-yang-types.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 09d704e8c..ef3af9c24 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -15,7 +15,7 @@ module _3gpp-5g-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2025-11-01 { reference CR-XXXX ; } + revision 2025-11-01 { reference CR-1657 ; } revision 2025-07-25 { reference CR-1558 ; } revision 2025-03-25 { reference CR-1489 ; } revision 2024-11-01 { reference CR-1405; } -- GitLab From 391cbb466769e956d7da621cf1e0c51706c0afa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 7 Nov 2025 15:03:42 +0000 Subject: [PATCH 17/22] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 2796ea241..8a6d8d8e8 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -16,7 +16,7 @@ module _3gpp-nr-nrm-iabfunction { reference "3GPP TS 28.541; 3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 33.310, IETF RFC 9811"; - revision 2025-11-01 { reference "CR-XXXX" ; } + revision 2025-11-01 { reference "CR-1657" ; } revision 2025-10-01 { reference "CR-1616" ; } revision 2025-08-15 { reference "CR-1598"; } -- GitLab From 7f52314fa3f5d8431223e919dd1d1b0be3d8c56b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 7 Nov 2025 15:04:31 +0000 Subject: [PATCH 18/22] Edit _3gpp-nr-nrm-mwab.yang --- yang-models/_3gpp-nr-nrm-mwab.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-mwab.yang b/yang-models/_3gpp-nr-nrm-mwab.yang index 1d19ace4d..604df33a5 100644 --- a/yang-models/_3gpp-nr-nrm-mwab.yang +++ b/yang-models/_3gpp-nr-nrm-mwab.yang @@ -16,7 +16,7 @@ module _3gpp-nr-nrm-mwab { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-11-01 { reference CR-XXXX ; } + revision 2025-11-01 { reference CR-1656 ; } revision 2025-04-25 { reference CR-1527 ; } grouping MWABGrp { -- GitLab From cc38ff05beed111ac484097a19e2b908f51f6a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 21 Nov 2025 04:51:40 +0000 Subject: [PATCH 19/22] Edit _3gpp-5g-common-yang-types.yang --- yang-models/_3gpp-5g-common-yang-types.yang | 22 ++++++++++----------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index ef3af9c24..594fe19d3 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -408,8 +408,7 @@ module _3gpp-5g-common-yang-types { grouping CaraConfigurationGrp { - description "This data type represents the configuration used for mobile - NR node (e.g., IAB-node, MWAB-node) to perform certificate enrolment procedure with + description "This data type represents the configuration used for an IAB-node or MWAB-gNB, to perform certificate enrolment procedure with Certification Authority server (CA/RA) as specified in TS 28.315 clause 5.3"; leaf caraAddress { @@ -455,15 +454,16 @@ module _3gpp-5g-common-yang-types { grouping MnrOamIPConfigGrp { description "This data type includes the configutation for OAM connectivity - used for mobile NR node (e.g., IAB-node, MWAB-node) to establish connection with + used for an IAB-node or MWAB-gNB, to establish connection with management system. The configuration attributes include: Configuration of certification authority (CA/RA) server, Configuration of security gateway (SeGW), and Configuration of software configuration server (SCS)"; list caraConfiguration { - description "configuration used for mobile NR node (e.g., IAB-node, MWAB-node) - to perform certificate enrolment procedure as specified in TS 28.315."; + description "configuration used for an IAB-node or MWAB-gNB, + to perform certificate enrolment procedure as specified in + TS 28.315."; uses CaraConfigurationGrp; max-elements 1; key caraAddress; @@ -471,25 +471,23 @@ module _3gpp-5g-common-yang-types { leaf seGwConfiguration { description "this parameter specifies IP address or - FQDN of security gateway (SeGW) used for mobile NR - node (e.g., IAB-node, MWAB-node) to establish secure connection - as specified in TS 28.315."; + FQDN of security gateway (SeGW) used for an IAB-node or MWAB-gNB, + to establish secure connection as specified in TS 28.315."; type inet:host; } leaf scsConfiguration { description "this parameter specifies IP address or FQDN of - configuration server (SCS) used for mobile NR node - (e.g., IAB-node, MWAB-node) to establish connection as - specified in TS 28.315."; + configuration server (SCS) used for an IAB-node or MWAB-gNB, + to establish connection as specified in TS 28.315."; type inet:host; } } grouping LocationInfoGrp { description "This data type contains location information - of mobile NR node (e.g., IAB-node, MWAB-node)."; + of an IAB-node or MWAB-gNB."; leaf gNBId { type int64 { range "0..4294967295"; } -- GitLab From 5b1caaea019f8b5c9ad5e0da0e334c91e5b4a55a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 21 Nov 2025 04:54:42 +0000 Subject: [PATCH 20/22] Edit _3gpp-5g-common-yang-types.yang --- yang-models/_3gpp-5g-common-yang-types.yang | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 594fe19d3..ac80719e2 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -408,7 +408,8 @@ module _3gpp-5g-common-yang-types { grouping CaraConfigurationGrp { - description "This data type represents the configuration used for an IAB-node or MWAB-gNB, to perform certificate enrolment procedure with + description "This data type represents the configuration used for + an NR mobile node (e.g., IAB-node or MWAB), to perform certificate enrolment procedure with Certification Authority server (CA/RA) as specified in TS 28.315 clause 5.3"; leaf caraAddress { @@ -454,14 +455,14 @@ module _3gpp-5g-common-yang-types { grouping MnrOamIPConfigGrp { description "This data type includes the configutation for OAM connectivity - used for an IAB-node or MWAB-gNB, to establish connection with + used for an NR mobile node (e.g., IAB-node or MWAB), to establish connection with management system. The configuration attributes include: Configuration of certification authority (CA/RA) server, Configuration of security gateway (SeGW), and Configuration of software configuration server (SCS)"; list caraConfiguration { - description "configuration used for an IAB-node or MWAB-gNB, + description "configuration used for an NR mobile node (e.g., IAB-node or MWAB), to perform certificate enrolment procedure as specified in TS 28.315."; uses CaraConfigurationGrp; @@ -471,7 +472,8 @@ module _3gpp-5g-common-yang-types { leaf seGwConfiguration { description "this parameter specifies IP address or - FQDN of security gateway (SeGW) used for an IAB-node or MWAB-gNB, + FQDN of security gateway (SeGW) used for an + an NR mobile node (e.g., IAB-node or MWAB) to establish secure connection as specified in TS 28.315."; type inet:host; @@ -479,7 +481,8 @@ module _3gpp-5g-common-yang-types { leaf scsConfiguration { description "this parameter specifies IP address or FQDN of - configuration server (SCS) used for an IAB-node or MWAB-gNB, + configuration server (SCS) used for + an NR mobile node (e.g., IAB-node or MWAB) to establish connection as specified in TS 28.315."; type inet:host; } @@ -487,7 +490,7 @@ module _3gpp-5g-common-yang-types { grouping LocationInfoGrp { description "This data type contains location information - of an IAB-node or MWAB-gNB."; + of an NR mobile node (e.g., IAB-node or MWAB)."; leaf gNBId { type int64 { range "0..4294967295"; } -- GitLab From 75f3d9dce3bf2d96409571364042e18f870b54c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 21 Nov 2025 04:55:50 +0000 Subject: [PATCH 21/22] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 8a6d8d8e8..df170cf81 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -38,7 +38,7 @@ module _3gpp-nr-nrm-iabfunction { uses types5g3gpp:MnrOamIPConfigGrp ; } - list locationInfo { + list currentLocation { description "This parameter specifies the current location of mobile NR node (e.g., IAB-node, MWAB-node)."; -- GitLab From 054ae0cf744da268be581b93d8dc81f03519f89a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 21 Nov 2025 04:56:19 +0000 Subject: [PATCH 22/22] Edit _3gpp-nr-nrm-mwab.yang --- yang-models/_3gpp-nr-nrm-mwab.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-mwab.yang b/yang-models/_3gpp-nr-nrm-mwab.yang index 604df33a5..b2538897f 100644 --- a/yang-models/_3gpp-nr-nrm-mwab.yang +++ b/yang-models/_3gpp-nr-nrm-mwab.yang @@ -70,7 +70,7 @@ module _3gpp-nr-nrm-mwab { leaf idx { type uint32 ; } uses types3gpp:TimeWindowGrp; } - list locationInfo { + list currentLocation { description "This parameter specifies the current location of mobile NR node (e.g., IAB-node, MWAB-node)."; key id; -- GitLab