From bcd44c934b1c18b52c853d4717a9e046b61589b1 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 22 Jul 2025 10:53:57 -0500 Subject: [PATCH 01/52] Update file _3gpp-iab-nrm-iabfunction --- yang-models/_3gpp-iab-nrm-iabfunction | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 yang-models/_3gpp-iab-nrm-iabfunction diff --git a/yang-models/_3gpp-iab-nrm-iabfunction b/yang-models/_3gpp-iab-nrm-iabfunction new file mode 100644 index 000000000..b03016ac2 --- /dev/null +++ b/yang-models/_3gpp-iab-nrm-iabfunction @@ -0,0 +1,14 @@ +module _3gpp-iab-nrm-iabfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-iab-nrm-iab"; + prefix "iab3gpp"; + + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This IOC represents the IAB function defined in 3GPP TS 28.541. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.315; 3GPP TS 28.541"; + + revision 2025-08-07 { reference "CR-000x"; } +} \ No newline at end of file -- GitLab From b9c9e485feddcea979cf03f753d63ea4b78706ab Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 22 Jul 2025 12:56:28 -0500 Subject: [PATCH 02/52] Update file _3gpp-iab-nrm-iabfunction --- yang-models/_3gpp-iab-nrm-iabfunction | 185 +++++++++++++++++++++++++- 1 file changed, 183 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-iab-nrm-iabfunction b/yang-models/_3gpp-iab-nrm-iabfunction index b03016ac2..8f27d63bb 100644 --- a/yang-models/_3gpp-iab-nrm-iabfunction +++ b/yang-models/_3gpp-iab-nrm-iabfunction @@ -3,12 +3,193 @@ module _3gpp-iab-nrm-iabfunction { namespace "urn:3gpp:sa5:_3gpp-iab-nrm-iab"; prefix "iab3gpp"; + 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"; description "This IOC represents the IAB function defined in 3GPP TS 28.541. Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; - reference "3GPP TS 28.315; 3GPP TS 28.541"; + reference "3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 28.541"; + + revision 2025-08-07 { reference "CR-000x"; } + + grouping OAMIPConfigGrp { + description "This IOC contains IP configutation for OAM connectivity used + for IAB-node to establish connection with management system as specified + in TS 28.314 clause 6.1.2. The configuration attributes include: + - Configuration of certification authority (CA/RA) server + - Configuration of security gateway (SeGW) + - Configuration of software configuration server (SCS)"; + + leaf caraConfiguration { + description "This data type represents the configuration used for + IAB-node to perform certificate enrolment procedure as specified + in TS 28.315 clause 5.3"; + uses CaraConfigurationGrp; + } + + leaf seGwConfiguration { + uses SeGwConfigurationGrp; + description "This data type represents the configuration of security + gateway (SeGW) used for IAB-node to establish secure connection as + specified in TS 28.315 [117] clause 5.4."; + } + + leaf scsConfiguration { + uses ScsConfigurationGrp; + description "This data type represents the configuration of software + configuration server (SCS) used for IAB-node to establish connection + to SCS as specified in TS 28.315 clause 5.5"; + } + } + + grouping CaraConfigurationGrp { + description "This data type represents the configuration used for IAB-node + to perform certificate enrolment procedure as specified in TS 28.315 + clause 5.3"; + + choice CaraConfigurationChoice { + leaf ipAddress { + type inet:ip-address; + description "IP address of Cara server"; + } + + leaf FQDN { + type inet:domain-name; + description "FQDN of Cara server"; + } + } + + leaf portNumber { + type inet:port-number; + description "This parameter specifies the port number used by CMP + server. The port for HTTP/HTTPSs transfer of CMP messages is not + explicitly given in RFC 6712, therefore this parameter is required. + The port number is usually represented as 2 octets."; + } + + leaf path { + type inet:uri; + 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; + 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 SeGwConfigurationGrp { + description "This data type represents the configuration of security + gateway (SeGW) used for IAB-node to establish secure connection as + specified in TS 28.315 clause 5.4"; + + choice SeGwConfigurationChoice { + leaf ipAddress { + type inet:ip-address; + description "IP address of SeGW server"; + } + + leaf FQDN { + type inet:domain-name; + description "FQDN of SeGW server"; + } + } + } + + grouping ScsConfigurationGrp { + description "This data type represents the configuration of software + configuration server (SCS) used for IAB-node to establish connection + to SCS as specified in TS 28.315 clause 5.5"; + + choice ScsConfigurationChoice { + leaf ipAddress { + type inet:ip-address; + description "IP address of SCS server"; + } + + leaf FQDN { + type inet:domain-name; + description "FQDN of SCS server"; + } + } + } + + grouping locationInfo { + description "This IOC contains 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 [26] clause 5.1.27"; + + leaf gNBId { + type int32 { range "0..4294967295"; } + description "The gNB ID where IAB-MT is connected to"; + } + + leaf pLMNId { + type types3gpp:PLMNId; + description "The PLMN ID where IAB-MT is connected to"; + } + + leaf cellLocalId { + type int32 { range "0..16383"; } + description "Identifies an NR cell where IAB-MT is connected to."; + reference "NCI in 3GPP TS 38.300"; + } + + leaf nRTAC { + uses types3gpp:Tac; + description "It is TAC pertaining to the cells where IAB-MT is + connected."; + } + + leaf tAI { + uses types3gpp:TaiGrp; + description "Indicates the TAI (see subclause 9.3.3.11 in TS 38.413) + including pLMNId ID and nRTAC"; + } + } + + grouping iabfunctionSubTree { + description "Contains classes that manage IAB function management"; + + leaf OAMIPConfig { + description "This IOC represents the IAB node Configuration + parameters. It can be name-contained by SubNetwork, ManagedElement, + or ManagedFunction."; + + key id; + uses top3gpp:Top_Grp ; + container attributes { + uses OAMIPConfigGrp ; + } + } + + leaf IabLocation { + description "This IOC represents the IAB node location information. + It can be name-contained by SubNetwork, ManagedElement, + or ManagedFunction."; - revision 2025-08-07 { reference "CR-000x"; } + key id; + uses top3gpp:Top_Grp ; + container attributes { + uses locationInfo; + } + } + } } \ No newline at end of file -- GitLab From e4478dfe4e55d1e6c2c2558be0a97af924be3545 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 22 Jul 2025 13:01:25 -0500 Subject: [PATCH 03/52] Update 2 files - /yang-models/_3gpp-iab-nrm-iabfunction - /yang-models/_3gpp-iab-nrm-iabfunction.yang --- .../{_3gpp-iab-nrm-iabfunction => _3gpp-iab-nrm-iabfunction.yang} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename yang-models/{_3gpp-iab-nrm-iabfunction => _3gpp-iab-nrm-iabfunction.yang} (100%) diff --git a/yang-models/_3gpp-iab-nrm-iabfunction b/yang-models/_3gpp-iab-nrm-iabfunction.yang similarity index 100% rename from yang-models/_3gpp-iab-nrm-iabfunction rename to yang-models/_3gpp-iab-nrm-iabfunction.yang -- GitLab From 6ef2a9a6343f86dba6765ce53b1482257dddc11e Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 22 Jul 2025 13:04:17 -0500 Subject: [PATCH 04/52] Update file _3gpp-iab-nrm-iabfunction.yang --- yang-models/_3gpp-iab-nrm-iabfunction.yang | 60 +++++++++++----------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/yang-models/_3gpp-iab-nrm-iabfunction.yang b/yang-models/_3gpp-iab-nrm-iabfunction.yang index 8f27d63bb..99de384b5 100644 --- a/yang-models/_3gpp-iab-nrm-iabfunction.yang +++ b/yang-models/_3gpp-iab-nrm-iabfunction.yang @@ -15,36 +15,6 @@ module _3gpp-iab-nrm-iabfunction { revision 2025-08-07 { reference "CR-000x"; } - grouping OAMIPConfigGrp { - description "This IOC contains IP configutation for OAM connectivity used - for IAB-node to establish connection with management system as specified - in TS 28.314 clause 6.1.2. The configuration attributes include: - - Configuration of certification authority (CA/RA) server - - Configuration of security gateway (SeGW) - - Configuration of software configuration server (SCS)"; - - leaf caraConfiguration { - description "This data type represents the configuration used for - IAB-node to perform certificate enrolment procedure as specified - in TS 28.315 clause 5.3"; - uses CaraConfigurationGrp; - } - - leaf seGwConfiguration { - uses SeGwConfigurationGrp; - description "This data type represents the configuration of security - gateway (SeGW) used for IAB-node to establish secure connection as - specified in TS 28.315 [117] clause 5.4."; - } - - leaf scsConfiguration { - uses ScsConfigurationGrp; - description "This data type represents the configuration of software - configuration server (SCS) used for IAB-node to establish connection - to SCS as specified in TS 28.315 clause 5.5"; - } - } - grouping CaraConfigurationGrp { description "This data type represents the configuration used for IAB-node to perform certificate enrolment procedure as specified in TS 28.315 @@ -131,6 +101,36 @@ module _3gpp-iab-nrm-iabfunction { } } + grouping OAMIPConfigGrp { + description "This IOC contains IP configutation for OAM connectivity used + for IAB-node to establish connection with management system as specified + in TS 28.314 clause 6.1.2. The configuration attributes include: + - Configuration of certification authority (CA/RA) server + - Configuration of security gateway (SeGW) + - Configuration of software configuration server (SCS)"; + + leaf caraConfiguration { + description "This data type represents the configuration used for + IAB-node to perform certificate enrolment procedure as specified + in TS 28.315 clause 5.3"; + uses CaraConfigurationGrp; + } + + leaf seGwConfiguration { + uses SeGwConfigurationGrp; + description "This data type represents the configuration of security + gateway (SeGW) used for IAB-node to establish secure connection as + specified in TS 28.315 [117] clause 5.4."; + } + + leaf scsConfiguration { + uses ScsConfigurationGrp; + description "This data type represents the configuration of software + configuration server (SCS) used for IAB-node to establish connection + to SCS as specified in TS 28.315 clause 5.5"; + } + } + grouping locationInfo { description "This IOC contains location information of IAB-node that is used for IAB-node OAM connection and IAB configuration as specified in -- GitLab From 1029c810fa6bb83d4cf56b16421fce9c2aa7d745 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 22 Jul 2025 13:08:01 -0500 Subject: [PATCH 05/52] Update file _3gpp-iab-nrm-iabfunction.yang --- yang-models/_3gpp-iab-nrm-iabfunction.yang | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-iab-nrm-iabfunction.yang b/yang-models/_3gpp-iab-nrm-iabfunction.yang index 99de384b5..a9790f155 100644 --- a/yang-models/_3gpp-iab-nrm-iabfunction.yang +++ b/yang-models/_3gpp-iab-nrm-iabfunction.yang @@ -1,19 +1,19 @@ module _3gpp-iab-nrm-iabfunction { yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-iab-nrm-iab"; + namespace "urn:3gpp:sa5:_3gpp-iab-nrm-iabfunction"; prefix "iab3gpp"; 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"; - description "This IOC represents the IAB function defined in 3GPP TS 28.541. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC). All rights reserved."; - reference "3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 28.541"; +contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; +description "This IOC represents the IAB function defined in 3GPP TS 28.541. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; +reference "3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 28.541"; - revision 2025-08-07 { reference "CR-000x"; } +revision 2025-08-07 { reference "CR-000x"; } grouping CaraConfigurationGrp { description "This data type represents the configuration used for IAB-node -- GitLab From 23d5f67569bb943bae2571017dca2f966c110d1a Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 22 Jul 2025 13:13:34 -0500 Subject: [PATCH 06/52] Update file _3gpp-iab-nrm-iabfunction.yang --- yang-models/_3gpp-iab-nrm-iabfunction.yang | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-iab-nrm-iabfunction.yang b/yang-models/_3gpp-iab-nrm-iabfunction.yang index a9790f155..80e3dd2c8 100644 --- a/yang-models/_3gpp-iab-nrm-iabfunction.yang +++ b/yang-models/_3gpp-iab-nrm-iabfunction.yang @@ -109,22 +109,25 @@ revision 2025-08-07 { reference "CR-000x"; } - Configuration of security gateway (SeGW) - Configuration of software configuration server (SCS)"; - leaf caraConfiguration { + list caraConfiguration { description "This data type represents the configuration used for IAB-node to perform certificate enrolment procedure as specified in TS 28.315 clause 5.3"; uses CaraConfigurationGrp; + max-elements 1; } - leaf seGwConfiguration { + list seGwConfiguration { uses SeGwConfigurationGrp; + max-elements 1; description "This data type represents the configuration of security gateway (SeGW) used for IAB-node to establish secure connection as specified in TS 28.315 [117] clause 5.4."; } - leaf scsConfiguration { + list scsConfiguration { uses ScsConfigurationGrp; + max-elements 1; description "This data type represents the configuration of software configuration server (SCS) used for IAB-node to establish connection to SCS as specified in TS 28.315 clause 5.5"; @@ -152,14 +155,16 @@ revision 2025-08-07 { reference "CR-000x"; } reference "NCI in 3GPP TS 38.300"; } - leaf nRTAC { + list nRTAC { uses types3gpp:Tac; + max-elements 1; description "It is TAC pertaining to the cells where IAB-MT is connected."; } - leaf tAI { + list tAI { uses types3gpp:TaiGrp; + max-elements 1; description "Indicates the TAI (see subclause 9.3.3.11 in TS 38.413) including pLMNId ID and nRTAC"; } @@ -168,7 +173,7 @@ revision 2025-08-07 { reference "CR-000x"; } grouping iabfunctionSubTree { description "Contains classes that manage IAB function management"; - leaf OAMIPConfig { + list OAMIPConfig { description "This IOC represents the IAB node Configuration parameters. It can be name-contained by SubNetwork, ManagedElement, or ManagedFunction."; @@ -180,7 +185,7 @@ revision 2025-08-07 { reference "CR-000x"; } } } - leaf IabLocation { + list IabLocation { description "This IOC represents the IAB node location information. It can be name-contained by SubNetwork, ManagedElement, or ManagedFunction."; -- GitLab From ee7e103f361b69f0e1f40d634ceae7c75f2f4783 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 22 Jul 2025 13:19:59 -0500 Subject: [PATCH 07/52] Update file _3gpp-iab-nrm-iabfunction.yang --- yang-models/_3gpp-iab-nrm-iabfunction.yang | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-iab-nrm-iabfunction.yang b/yang-models/_3gpp-iab-nrm-iabfunction.yang index 80e3dd2c8..b8545ff7a 100644 --- a/yang-models/_3gpp-iab-nrm-iabfunction.yang +++ b/yang-models/_3gpp-iab-nrm-iabfunction.yang @@ -5,6 +5,7 @@ module _3gpp-iab-nrm-iabfunction { import ietf-inet-types { prefix inet; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-top { prefix top3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -104,10 +105,10 @@ revision 2025-08-07 { reference "CR-000x"; } grouping OAMIPConfigGrp { description "This IOC contains IP configutation for OAM connectivity used for IAB-node to establish connection with management system as specified - in TS 28.314 clause 6.1.2. The configuration attributes include: - - Configuration of certification authority (CA/RA) server - - Configuration of security gateway (SeGW) - - Configuration of software configuration server (SCS)"; + in TS 28.314 clause 6.1.2. 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 "This data type represents the configuration used for @@ -140,12 +141,13 @@ revision 2025-08-07 { reference "CR-000x"; } TS 28.314 clause 6.1.2 and TS 28.531 [26] clause 5.1.27"; leaf gNBId { - type int32 { range "0..4294967295"; } + type int64 { range "0..4294967295"; } description "The gNB ID where IAB-MT is connected to"; } - leaf pLMNId { - type types3gpp:PLMNId; + list pLMNId { + uses types3gpp:PLMNId; + max-elements 1; description "The PLMN ID where IAB-MT is connected to"; } @@ -155,9 +157,8 @@ revision 2025-08-07 { reference "CR-000x"; } reference "NCI in 3GPP TS 38.300"; } - list nRTAC { - uses types3gpp:Tac; - max-elements 1; + leaf nRTAC { + type types3gpp:Tac; description "It is TAC pertaining to the cells where IAB-MT is connected."; } -- GitLab From c5381962fab60a9a95708dd439f4b2ceef9abb05 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 22 Jul 2025 13:25:38 -0500 Subject: [PATCH 08/52] Update file _3gpp-iab-nrm-iabfunction.yang --- yang-models/_3gpp-iab-nrm-iabfunction.yang | 400 ++++++++++----------- 1 file changed, 200 insertions(+), 200 deletions(-) diff --git a/yang-models/_3gpp-iab-nrm-iabfunction.yang b/yang-models/_3gpp-iab-nrm-iabfunction.yang index b8545ff7a..48266ce3f 100644 --- a/yang-models/_3gpp-iab-nrm-iabfunction.yang +++ b/yang-models/_3gpp-iab-nrm-iabfunction.yang @@ -1,201 +1,201 @@ -module _3gpp-iab-nrm-iabfunction { - yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-iab-nrm-iabfunction"; - prefix "iab3gpp"; - - import ietf-inet-types { prefix inet; } - import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-common-top { prefix top3gpp; } - - organization "3gpp SA5"; -contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; -description "This IOC represents the IAB function defined in 3GPP TS 28.541. - Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC). All rights reserved."; -reference "3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 28.541"; - -revision 2025-08-07 { reference "CR-000x"; } - - grouping CaraConfigurationGrp { - description "This data type represents the configuration used for IAB-node - to perform certificate enrolment procedure as specified in TS 28.315 - clause 5.3"; - - choice CaraConfigurationChoice { - leaf ipAddress { - type inet:ip-address; - description "IP address of Cara server"; - } - - leaf FQDN { - type inet:domain-name; - description "FQDN of Cara server"; - } - } - - leaf portNumber { - type inet:port-number; - description "This parameter specifies the port number used by CMP - server. The port for HTTP/HTTPSs transfer of CMP messages is not - explicitly given in RFC 6712, therefore this parameter is required. - The port number is usually represented as 2 octets."; - } - - leaf path { - type inet:uri; - 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; - 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 SeGwConfigurationGrp { - description "This data type represents the configuration of security - gateway (SeGW) used for IAB-node to establish secure connection as - specified in TS 28.315 clause 5.4"; - - choice SeGwConfigurationChoice { - leaf ipAddress { - type inet:ip-address; - description "IP address of SeGW server"; - } - - leaf FQDN { - type inet:domain-name; - description "FQDN of SeGW server"; - } - } - } - - grouping ScsConfigurationGrp { - description "This data type represents the configuration of software - configuration server (SCS) used for IAB-node to establish connection - to SCS as specified in TS 28.315 clause 5.5"; - - choice ScsConfigurationChoice { - leaf ipAddress { - type inet:ip-address; - description "IP address of SCS server"; - } - - leaf FQDN { - type inet:domain-name; - description "FQDN of SCS server"; - } - } - } - - grouping OAMIPConfigGrp { - description "This IOC contains IP configutation for OAM connectivity used - for IAB-node to establish connection with management system as specified - in TS 28.314 clause 6.1.2. 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 "This data type represents the configuration used for - IAB-node to perform certificate enrolment procedure as specified - in TS 28.315 clause 5.3"; - uses CaraConfigurationGrp; - max-elements 1; - } - - list seGwConfiguration { - uses SeGwConfigurationGrp; - max-elements 1; - description "This data type represents the configuration of security - gateway (SeGW) used for IAB-node to establish secure connection as - specified in TS 28.315 [117] clause 5.4."; - } - - list scsConfiguration { - uses ScsConfigurationGrp; - max-elements 1; - description "This data type represents the configuration of software - configuration server (SCS) used for IAB-node to establish connection - to SCS as specified in TS 28.315 clause 5.5"; - } - } - - grouping locationInfo { - description "This IOC contains 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 [26] clause 5.1.27"; - - leaf gNBId { - type int64 { range "0..4294967295"; } - description "The gNB ID where IAB-MT is connected to"; - } - - list pLMNId { - uses types3gpp:PLMNId; - max-elements 1; - description "The PLMN ID where IAB-MT is connected to"; - } - - leaf cellLocalId { - type int32 { range "0..16383"; } - description "Identifies an NR cell where IAB-MT is connected to."; - reference "NCI in 3GPP TS 38.300"; - } - - leaf nRTAC { - type types3gpp:Tac; - description "It is TAC pertaining to the cells where IAB-MT is - connected."; - } - - list tAI { - uses types3gpp:TaiGrp; - max-elements 1; - description "Indicates the TAI (see subclause 9.3.3.11 in TS 38.413) - including pLMNId ID and nRTAC"; - } - } - - grouping iabfunctionSubTree { - description "Contains classes that manage IAB function management"; - - list OAMIPConfig { - description "This IOC represents the IAB node Configuration - parameters. It can be name-contained by SubNetwork, ManagedElement, - or ManagedFunction."; - - key id; - uses top3gpp:Top_Grp ; - container attributes { - uses OAMIPConfigGrp ; - } - } - - list IabLocation { - description "This IOC represents the IAB node location information. - It can be name-contained by SubNetwork, ManagedElement, - or ManagedFunction."; - - key id; - uses top3gpp:Top_Grp ; - container attributes { - uses locationInfo; - } - } - } +module _3gpp-iab-nrm-iabfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-iab-nrm-iabfunction"; + prefix "iab3gpp"; + + import ietf-inet-types { prefix inet; } + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3gpp SA5"; +contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; +description "This IOC represents the IAB function defined in 3GPP TS 28.541. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; +reference "3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 28.541"; + +revision 2025-08-07 { reference "CR-000x"; } + + grouping CaraConfigurationGrp { + description "This data type represents the configuration used for IAB-node + to perform certificate enrolment procedure as specified in TS 28.315 + clause 5.3"; + + choice CaraConfigurationChoice { + leaf ipAddress { + type inet:ip-address; + description "IP address of Cara server"; + } + + leaf FQDN { + type inet:domain-name; + description "FQDN of Cara server"; + } + } + + leaf portNumber { + type inet:port-number; + description "This parameter specifies the port number used by CMP + server. The port for HTTP/HTTPSs transfer of CMP messages is not + explicitly given in RFC 6712, therefore this parameter is required. + The port number is usually represented as 2 octets."; + } + + leaf path { + type inet:uri; + 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; + 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 SeGwConfigurationGrp { + description "This data type represents the configuration of security + gateway (SeGW) used for IAB-node to establish secure connection as + specified in TS 28.315 clause 5.4"; + + choice SeGwConfigurationChoice { + leaf ipAddress { + type inet:ip-address; + description "IP address of SeGW server"; + } + + leaf FQDN { + type inet:domain-name; + description "FQDN of SeGW server"; + } + } + } + + grouping ScsConfigurationGrp { + description "This data type represents the configuration of software + configuration server (SCS) used for IAB-node to establish connection + to SCS as specified in TS 28.315 clause 5.5"; + + choice ScsConfigurationChoice { + leaf ipAddress { + type inet:ip-address; + description "IP address of SCS server"; + } + + leaf FQDN { + type inet:domain-name; + description "FQDN of SCS server"; + } + } + } + + grouping OAMIPConfigGrp { + description "This IOC contains IP configutation for OAM connectivity used + for IAB-node to establish connection with management system as specified + in TS 28.314 clause 6.1.2. 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 "This data type represents the configuration used for + IAB-node to perform certificate enrolment procedure as specified + in TS 28.315 clause 5.3"; + uses CaraConfigurationGrp; + max-elements 1; + } + + list seGwConfiguration { + uses SeGwConfigurationGrp; + max-elements 1; + description "This data type represents the configuration of security + gateway (SeGW) used for IAB-node to establish secure connection as + specified in TS 28.315 [117] clause 5.4."; + } + + list scsConfiguration { + uses ScsConfigurationGrp; + max-elements 1; + description "This data type represents the configuration of software + configuration server (SCS) used for IAB-node to establish connection + to SCS as specified in TS 28.315 clause 5.5"; + } + } + + grouping locationInfo { + description "This IOC contains 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 [26] clause 5.1.27"; + + leaf gNBId { + type int64 { range "0..4294967295"; } + description "The gNB ID where IAB-MT is connected to"; + } + + list pLMNId { + uses types3gpp:PLMNId; + max-elements 1; + description "The PLMN ID where IAB-MT is connected to"; + } + + leaf cellLocalId { + type int32 { range "0..16383"; } + description "Identifies an NR cell where IAB-MT is connected to."; + reference "NCI in 3GPP TS 38.300"; + } + + leaf nRTAC { + type types3gpp:Tac; + description "It is TAC pertaining to the cells where IAB-MT is + connected."; + } + + list tAI { + uses types3gpp:TaiGrp; + max-elements 1; + description "Indicates the TAI (see subclause 9.3.3.11 in TS 38.413) + including pLMNId ID and nRTAC"; + } + } + + grouping iabfunctionSubTree { + description "Contains classes that manage IAB function management"; + + list OAMIPConfig { + description "This IOC represents the IAB node Configuration + parameters. It can be name-contained by SubNetwork, ManagedElement, + or ManagedFunction."; + + key id; + uses top3gpp:Top_Grp ; + container attributes { + uses OAMIPConfigGrp ; + } + } + + list IabLocation { + description "This IOC represents the IAB node location information. + It can be name-contained by SubNetwork, ManagedElement, + or ManagedFunction."; + + key id; + uses top3gpp:Top_Grp ; + container attributes { + uses locationInfo; + } + } + } } \ No newline at end of file -- GitLab From f327f5ec72e990c1e1a431dcaa659a5375547552 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 22 Jul 2025 13:31:58 -0500 Subject: [PATCH 09/52] Update file _3gpp-iab-nrm-iabfunction.yang --- yang-models/_3gpp-iab-nrm-iabfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-iab-nrm-iabfunction.yang b/yang-models/_3gpp-iab-nrm-iabfunction.yang index 48266ce3f..2e6817db6 100644 --- a/yang-models/_3gpp-iab-nrm-iabfunction.yang +++ b/yang-models/_3gpp-iab-nrm-iabfunction.yang @@ -138,7 +138,7 @@ revision 2025-08-07 { reference "CR-000x"; } grouping locationInfo { description "This IOC contains 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 [26] clause 5.1.27"; + TS 28.314 clause 6.1.2 and TS 28.531 clause 5.1.27"; leaf gNBId { type int64 { range "0..4294967295"; } -- GitLab From 56abfbafb12bc40940d8e0b2260fdf777bb9a3fa Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 23 Jul 2025 13:48:33 -0500 Subject: [PATCH 10/52] test --- yang-models/_3gpp-iab-nrm-iabfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-iab-nrm-iabfunction.yang b/yang-models/_3gpp-iab-nrm-iabfunction.yang index 2e6817db6..5dc4f9b60 100644 --- a/yang-models/_3gpp-iab-nrm-iabfunction.yang +++ b/yang-models/_3gpp-iab-nrm-iabfunction.yang @@ -123,7 +123,7 @@ revision 2025-08-07 { reference "CR-000x"; } max-elements 1; description "This data type represents the configuration of security gateway (SeGW) used for IAB-node to establish secure connection as - specified in TS 28.315 [117] clause 5.4."; + specified in TS 28.315 clause 5.4."; } list scsConfiguration { -- GitLab From 1522b6926f1829f9e35d370717d8b74bf15cca79 Mon Sep 17 00:00:00 2001 From: wangjjunf Date: Thu, 24 Jul 2025 13:36:02 +0000 Subject: [PATCH 11/52] Edit _3gpp-iab-nrm-iabfunction.yang --- ...gpp-iab-nrm-iabfunction.yang => _3gpp-nr-nrm-iabfunction.yang} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename yang-models/{_3gpp-iab-nrm-iabfunction.yang => _3gpp-nr-nrm-iabfunction.yang} (100%) diff --git a/yang-models/_3gpp-iab-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang similarity index 100% rename from yang-models/_3gpp-iab-nrm-iabfunction.yang rename to yang-models/_3gpp-nr-nrm-iabfunction.yang -- GitLab From d6714ec6ef100df039866a9f7b3e32093bea9368 Mon Sep 17 00:00:00 2001 From: wangjjunf Date: Thu, 24 Jul 2025 14:36:53 +0000 Subject: [PATCH 12/52] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 5dc4f9b60..063f103b1 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -1,6 +1,6 @@ module _3gpp-iab-nrm-iabfunction { yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-iab-nrm-iabfunction"; + namespace "urn:3gpp:sa5:_3gpp-nr-nrm-iabfunction"; prefix "iab3gpp"; import ietf-inet-types { prefix inet; } @@ -12,7 +12,7 @@ contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the IAB function defined in 3GPP TS 28.541. Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; -reference "3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 28.541"; +reference "3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 28.541; 3GPP TS 33.310, IETF RFC 6712"; revision 2025-08-07 { reference "CR-000x"; } @@ -56,10 +56,7 @@ revision 2025-08-07 { reference "CR-000x"; } } leaf protocol { - type enumeration { - enum HTTP; - enum HTTPS; - } + type string; 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."; @@ -111,7 +108,7 @@ revision 2025-08-07 { reference "CR-000x"; } Configuration of software configuration server (SCS)"; list caraConfiguration { - description "This data type represents the configuration used for + description "configuration used for IAB-node to perform certificate enrolment procedure as specified in TS 28.315 clause 5.3"; uses CaraConfigurationGrp; @@ -121,7 +118,7 @@ revision 2025-08-07 { reference "CR-000x"; } list seGwConfiguration { uses SeGwConfigurationGrp; max-elements 1; - description "This data type represents the configuration of security + description "configuration of security gateway (SeGW) used for IAB-node to establish secure connection as specified in TS 28.315 clause 5.4."; } @@ -129,7 +126,7 @@ revision 2025-08-07 { reference "CR-000x"; } list scsConfiguration { uses ScsConfigurationGrp; max-elements 1; - description "This data type represents the configuration of software + description "configuration of software configuration server (SCS) used for IAB-node to establish connection to SCS as specified in TS 28.315 clause 5.5"; } -- GitLab From 9e4176674e8b8b46e2d91ef2324a4a8f60c26733 Mon Sep 17 00:00:00 2001 From: wangjjunf Date: Thu, 24 Jul 2025 14:44:48 +0000 Subject: [PATCH 13/52] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 063f103b1..1d9882998 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -173,8 +173,7 @@ revision 2025-08-07 { reference "CR-000x"; } list OAMIPConfig { description "This IOC represents the IAB node Configuration - parameters. It can be name-contained by SubNetwork, ManagedElement, - or ManagedFunction."; + parameters. It includes attributes inherited from Top IOC (defined in 3GPP TS 28.622)."; key id; uses top3gpp:Top_Grp ; @@ -185,8 +184,7 @@ revision 2025-08-07 { reference "CR-000x"; } list IabLocation { description "This IOC represents the IAB node location information. - It can be name-contained by SubNetwork, ManagedElement, - or ManagedFunction."; + It includes attributes inherited from Top IOC (defined in 3GPP TS 28.622)."; key id; uses top3gpp:Top_Grp ; -- GitLab From 8453a8ce156c0354cf04645ce105280b9ac399d1 Mon Sep 17 00:00:00 2001 From: wangjjunf Date: Thu, 24 Jul 2025 15:08:32 +0000 Subject: [PATCH 14/52] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 25 +++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 1d9882998..dfaf10f99 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -35,6 +35,7 @@ revision 2025-08-07 { reference "CR-000x"; } leaf portNumber { type inet:port-number; + mandatory true; description "This parameter specifies the port number used by CMP server. The port for HTTP/HTTPSs transfer of CMP messages is not explicitly given in RFC 6712, therefore this parameter is required. @@ -43,6 +44,7 @@ revision 2025-08-07 { reference "CR-000x"; } 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."; @@ -50,6 +52,7 @@ revision 2025-08-07 { reference "CR-000x"; } 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."; @@ -111,24 +114,28 @@ revision 2025-08-07 { reference "CR-000x"; } description "configuration used for IAB-node to perform certificate enrolment procedure as specified in TS 28.315 clause 5.3"; + mandatory true; uses CaraConfigurationGrp; max-elements 1; } list seGwConfiguration { - uses SeGwConfigurationGrp; - max-elements 1; description "configuration of security gateway (SeGW) used for IAB-node to establish secure connection as specified in TS 28.315 clause 5.4."; + mandatory true; + uses SeGwConfigurationGrp; + max-elements 1; + } list scsConfiguration { - uses ScsConfigurationGrp; - max-elements 1; description "configuration of software configuration server (SCS) used for IAB-node to establish connection - to SCS as specified in TS 28.315 clause 5.5"; + to SCS as specified in TS 28.315 clause 5.5"; + mandatory true; + uses ScsConfigurationGrp; + max-elements 1; } } @@ -139,7 +146,8 @@ revision 2025-08-07 { reference "CR-000x"; } leaf gNBId { type int64 { range "0..4294967295"; } - description "The gNB ID where IAB-MT is connected to"; + 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 { @@ -151,7 +159,6 @@ revision 2025-08-07 { reference "CR-000x"; } leaf cellLocalId { type int32 { range "0..16383"; } description "Identifies an NR cell where IAB-MT is connected to."; - reference "NCI in 3GPP TS 38.300"; } leaf nRTAC { @@ -163,8 +170,8 @@ revision 2025-08-07 { reference "CR-000x"; } list tAI { uses types3gpp:TaiGrp; max-elements 1; - description "Indicates the TAI (see subclause 9.3.3.11 in TS 38.413) - including pLMNId ID and nRTAC"; + description "It is the TAI (see subclause 9.3.3.11 in TS 38.413) pertaining + to the cells where IAB-MT is connected"; } } -- GitLab From 60d1b2b3ba8e8099fc94ad05160c8decccf1d784 Mon Sep 17 00:00:00 2001 From: wangjjunf Date: Thu, 24 Jul 2025 15:43:26 +0000 Subject: [PATCH 15/52] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index dfaf10f99..6d21a7565 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -1,4 +1,4 @@ -module _3gpp-iab-nrm-iabfunction { +module _3gpp-nr-nrm-iabfunction { yang-version 1.1; namespace "urn:3gpp:sa5:_3gpp-nr-nrm-iabfunction"; prefix "iab3gpp"; @@ -12,7 +12,8 @@ contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the IAB function defined in 3GPP TS 28.541. Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; -reference "3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 28.541; 3GPP TS 33.310, IETF RFC 6712"; +reference "3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 28.541; 3GPP TS 33.310, + IETF RFC 6712"; revision 2025-08-07 { reference "CR-000x"; } @@ -114,7 +115,6 @@ revision 2025-08-07 { reference "CR-000x"; } description "configuration used for IAB-node to perform certificate enrolment procedure as specified in TS 28.315 clause 5.3"; - mandatory true; uses CaraConfigurationGrp; max-elements 1; } @@ -123,7 +123,6 @@ revision 2025-08-07 { reference "CR-000x"; } description "configuration of security gateway (SeGW) used for IAB-node to establish secure connection as specified in TS 28.315 clause 5.4."; - mandatory true; uses SeGwConfigurationGrp; max-elements 1; @@ -133,7 +132,6 @@ revision 2025-08-07 { reference "CR-000x"; } description "configuration of software configuration server (SCS) used for IAB-node to establish connection to SCS as specified in TS 28.315 clause 5.5"; - mandatory true; uses ScsConfigurationGrp; max-elements 1; } @@ -180,7 +178,8 @@ revision 2025-08-07 { reference "CR-000x"; } list OAMIPConfig { description "This IOC represents the IAB node Configuration - parameters. It includes attributes inherited from Top IOC (defined in 3GPP TS 28.622)."; + parameters. It includes attributes inherited from + Top IOC (defined in 3GPP TS 28.622)."; key id; uses top3gpp:Top_Grp ; @@ -191,7 +190,8 @@ revision 2025-08-07 { reference "CR-000x"; } list IabLocation { description "This IOC represents the IAB node location information. - It includes attributes inherited from Top IOC (defined in 3GPP TS 28.622)."; + It includes attributes inherited from + Top IOC (defined in 3GPP TS 28.622)."; key id; uses top3gpp:Top_Grp ; -- GitLab From 4bd3cb09448f74343ffbc88bc937e2d11c2f1eb9 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Fri, 25 Jul 2025 10:12:51 -0500 Subject: [PATCH 16/52] Update file _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 85 ++++++----------------- 1 file changed, 22 insertions(+), 63 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 6d21a7565..bb2727e17 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -8,30 +8,23 @@ module _3gpp-nr-nrm-iabfunction { import _3gpp-common-top { prefix top3gpp; } organization "3gpp SA5"; -contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; -description "This IOC represents the IAB function defined in 3GPP TS 28.541. + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This IOC represents the IAB function defined in 3GPP TS 28.541. Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; -reference "3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 28.541; 3GPP TS 33.310, + reference "3GPP TS 28.541; 3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 33.310, IETF RFC 6712"; -revision 2025-08-07 { reference "CR-000x"; } + revision 2025-08-07 { reference "CR-000x"; } grouping CaraConfigurationGrp { description "This data type represents the configuration used for IAB-node to perform certificate enrolment procedure as specified in TS 28.315 clause 5.3"; - choice CaraConfigurationChoice { - leaf ipAddress { - type inet:ip-address; - description "IP address of Cara server"; - } - - leaf FQDN { - type inet:domain-name; - description "FQDN of Cara server"; - } + leaf CaraAddress { + type inet:host; + description "IP address of Cara server"; } leaf portNumber { @@ -60,49 +53,16 @@ revision 2025-08-07 { reference "CR-000x"; } } leaf protocol { - type string; + 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 SeGwConfigurationGrp { - description "This data type represents the configuration of security - gateway (SeGW) used for IAB-node to establish secure connection as - specified in TS 28.315 clause 5.4"; - - choice SeGwConfigurationChoice { - leaf ipAddress { - type inet:ip-address; - description "IP address of SeGW server"; - } - - leaf FQDN { - type inet:domain-name; - description "FQDN of SeGW server"; - } - } - } - - grouping ScsConfigurationGrp { - description "This data type represents the configuration of software - configuration server (SCS) used for IAB-node to establish connection - to SCS as specified in TS 28.315 clause 5.5"; - - choice ScsConfigurationChoice { - leaf ipAddress { - type inet:ip-address; - description "IP address of SCS server"; - } - - leaf FQDN { - type inet:domain-name; - description "FQDN of SCS server"; - } - } - } - grouping OAMIPConfigGrp { description "This IOC contains IP configutation for OAM connectivity used for IAB-node to establish connection with management system as specified @@ -120,24 +80,22 @@ revision 2025-08-07 { reference "CR-000x"; } } list seGwConfiguration { - description "configuration of security - gateway (SeGW) used for IAB-node to establish secure connection as - specified in TS 28.315 clause 5.4."; - uses SeGwConfigurationGrp; - max-elements 1; + description "configuration of security + gateway (SeGW) used for IAB-node to establish secure connection as + specified in TS 28.315 clause 5.4."; + type inet:host; } list scsConfiguration { - description "configuration of software - configuration server (SCS) used for IAB-node to establish connection - to SCS as specified in TS 28.315 clause 5.5"; - uses ScsConfigurationGrp; - max-elements 1; + description "configuration of software + configuration server (SCS) used for IAB-node to establish connection + to SCS as specified in TS 28.315 clause 5.5"; + type inet:host; } } - grouping locationInfo { + grouping locationInfoGrp { description "This IOC contains 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"; @@ -152,6 +110,7 @@ revision 2025-08-07 { reference "CR-000x"; } uses types3gpp:PLMNId; max-elements 1; description "The PLMN ID where IAB-MT is connected to"; + add key "mcc mnc"; } leaf cellLocalId { @@ -196,7 +155,7 @@ revision 2025-08-07 { reference "CR-000x"; } key id; uses top3gpp:Top_Grp ; container attributes { - uses locationInfo; + uses locationInfoGrp; } } } -- GitLab From 759a3c50fede9afae28d94f7ef517b6a321575d1 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Fri, 25 Jul 2025 10:14:54 -0500 Subject: [PATCH 17/52] Update file _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 bb2727e17..c1514ca5b 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -110,7 +110,7 @@ module _3gpp-nr-nrm-iabfunction { uses types3gpp:PLMNId; max-elements 1; description "The PLMN ID where IAB-MT is connected to"; - add key "mcc mnc"; + key "mcc mnc"; } leaf cellLocalId { -- GitLab From 8a033f934df0e27eb9f38777bfb26f8a4f8ea735 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Fri, 25 Jul 2025 10:17:01 -0500 Subject: [PATCH 18/52] Update file _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index c1514ca5b..d23b93983 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -79,7 +79,7 @@ module _3gpp-nr-nrm-iabfunction { max-elements 1; } - list seGwConfiguration { + leaf seGwConfiguration { description "configuration of security gateway (SeGW) used for IAB-node to establish secure connection as specified in TS 28.315 clause 5.4."; @@ -87,7 +87,7 @@ module _3gpp-nr-nrm-iabfunction { } - list scsConfiguration { + leaf scsConfiguration { description "configuration of software configuration server (SCS) used for IAB-node to establish connection to SCS as specified in TS 28.315 clause 5.5"; -- GitLab From fa026e97e18ca8c716a7110aee7292e74fc2e47d Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Fri, 25 Jul 2025 10:56:17 -0500 Subject: [PATCH 19/52] Update file _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 70e53be99..d57bc8848 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -16,6 +16,7 @@ module _3gpp-common-managed-element { import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; } import _3gpp-nr-nrm-mwab { prefix mwab3gpp; } + import _3gpp-nr-nrm-iabfunction { prefix iab3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -336,5 +337,8 @@ module _3gpp-common-managed-element { uses mwab3gpp:MWABSubTree { if-feature MWABUnderManagedElement ; } + + uses iab3gpp:iabfunctionSubTree { + } } } -- GitLab From 93339ce2a73a6cab766639be044ae7ec0f6edd02 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Fri, 25 Jul 2025 10:59:19 -0500 Subject: [PATCH 20/52] Update 2 files - /yang-models/_3gpp-nr-nrm-iabfunction.yang - /yang-models/_3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 2 +- yang-models/_3gpp-nr-nrm-iabfunction.yang | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index d57bc8848..768c37de7 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -338,7 +338,7 @@ module _3gpp-common-managed-element { if-feature MWABUnderManagedElement ; } - uses iab3gpp:iabfunctionSubTree { + uses iab3gpp:IabSubTree { } } } diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index d23b93983..49567e9cd 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -132,7 +132,7 @@ module _3gpp-nr-nrm-iabfunction { } } - grouping iabfunctionSubTree { + grouping IabSubTree { description "Contains classes that manage IAB function management"; list OAMIPConfig { -- GitLab From 02241367d21215bb7472c3064229db560ed7d728 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Fri, 25 Jul 2025 11:01:19 -0500 Subject: [PATCH 21/52] Update file _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 49567e9cd..4a02eaf80 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -76,7 +76,8 @@ module _3gpp-nr-nrm-iabfunction { IAB-node to perform certificate enrolment procedure as specified in TS 28.315 clause 5.3"; uses CaraConfigurationGrp; - max-elements 1; + max-elements 1; + key id; } leaf seGwConfiguration { @@ -126,6 +127,7 @@ module _3gpp-nr-nrm-iabfunction { list tAI { uses types3gpp:TaiGrp; + key id; 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 is connected"; -- GitLab From 092cf5598150d8bc87cbcb93af91b0581a4d2c41 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Fri, 25 Jul 2025 11:05:57 -0500 Subject: [PATCH 22/52] Update file _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 4a02eaf80..f0543be6f 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -22,7 +22,7 @@ module _3gpp-nr-nrm-iabfunction { to perform certificate enrolment procedure as specified in TS 28.315 clause 5.3"; - leaf CaraAddress { + leaf caraAddress { type inet:host; description "IP address of Cara server"; } @@ -77,7 +77,7 @@ module _3gpp-nr-nrm-iabfunction { in TS 28.315 clause 5.3"; uses CaraConfigurationGrp; max-elements 1; - key id; + key caraAddress; } leaf seGwConfiguration { @@ -127,7 +127,8 @@ module _3gpp-nr-nrm-iabfunction { list tAI { uses types3gpp:TaiGrp; - key id; + 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 is connected"; -- GitLab From c346eba572254baa416ff73a7347ee5adcf03d78 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Fri, 25 Jul 2025 11:16:55 -0500 Subject: [PATCH 23/52] Update file _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 768c37de7..a62e29c53 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -38,6 +38,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-08-07 { reference "CR-000x"; } revision 2025-04-25 { reference "CR-0532 CR0541" ; } revision 2025-03-25 { reference "CR-0516"; } revision 2024-10-01 { reference "CR-0437,CR-0438" ; } -- GitLab From 8f144c3f51c498f29cede42a44e3399fc3f2aea1 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Fri, 25 Jul 2025 16:55:33 +0000 Subject: [PATCH 24/52] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index f0543be6f..d9fe74390 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -19,21 +19,20 @@ module _3gpp-nr-nrm-iabfunction { grouping CaraConfigurationGrp { description "This data type represents the configuration used for IAB-node - to perform certificate enrolment procedure as specified in TS 28.315 - clause 5.3"; + 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 of Cara server"; + description "IP address or FQDN of Cara server"; } leaf portNumber { - type inet:port-number; - mandatory true; + type inet:port-number; description "This parameter specifies the port number used by CMP server. The port for HTTP/HTTPSs transfer of CMP messages is not - explicitly given in RFC 6712, therefore this parameter is required. - The port number is usually represented as 2 octets."; + explicitly given in RFC 6712. If it is not present, the port number + use the port assigned by IANA (Internet Assigned Numbers Authority)."; } leaf path { @@ -120,7 +119,7 @@ module _3gpp-nr-nrm-iabfunction { } leaf nRTAC { - type types3gpp:Tac; + type types3gpp:NRTAC; description "It is TAC pertaining to the cells where IAB-MT is connected."; } -- GitLab From 8a0149b02f2c67dc99c83a57cd21f1749be86149 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Fri, 25 Jul 2025 17:01:17 +0000 Subject: [PATCH 25/52] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index d9fe74390..c7f50eed0 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -6,6 +6,7 @@ module _3gpp-nr-nrm-iabfunction { 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; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -19,8 +20,8 @@ module _3gpp-nr-nrm-iabfunction { grouping CaraConfigurationGrp { description "This data type represents the configuration used for IAB-node - to perform certificate enrolment procedure with Certification Authority server (CA/RA) - as specified in TS 28.315 clause 5.3"; + 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; @@ -119,7 +120,7 @@ module _3gpp-nr-nrm-iabfunction { } leaf nRTAC { - type types3gpp:NRTAC; + type types5g3gpp:NRTAC; description "It is TAC pertaining to the cells where IAB-MT is connected."; } -- GitLab From 1a702cbc767ca8ae5d295c334907d729d89b4f73 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Wed, 6 Aug 2025 14:27:58 +0000 Subject: [PATCH 26/52] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index c7f50eed0..3ff855612 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -63,7 +63,7 @@ module _3gpp-nr-nrm-iabfunction { } } - grouping OAMIPConfigGrp { + grouping MnrOamIPConfigGrp { description "This IOC contains IP configutation for OAM connectivity used for IAB-node to establish connection with management system as specified in TS 28.314 clause 6.1.2. The configuration attributes include: @@ -146,7 +146,7 @@ module _3gpp-nr-nrm-iabfunction { key id; uses top3gpp:Top_Grp ; container attributes { - uses OAMIPConfigGrp ; + uses MnrOamIPConfigGrp ; } } -- GitLab From 9341b9f076c8b749cf0b0f77de987e1c0a012d9b Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Thu, 7 Aug 2025 14:28:36 +0000 Subject: [PATCH 27/52] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 56 +++++++++++++++-------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 3ff855612..997159c7f 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -64,9 +64,9 @@ module _3gpp-nr-nrm-iabfunction { } grouping MnrOamIPConfigGrp { - description "This IOC contains IP configutation for OAM connectivity used - for IAB-node to establish connection with management system as specified - in TS 28.314 clause 6.1.2. The configuration attributes include: + 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)"; @@ -74,7 +74,7 @@ module _3gpp-nr-nrm-iabfunction { list caraConfiguration { description "configuration used for IAB-node to perform certificate enrolment procedure as specified - in TS 28.315 clause 5.3"; + in TS 28.315."; uses CaraConfigurationGrp; max-elements 1; key caraAddress; @@ -83,7 +83,7 @@ module _3gpp-nr-nrm-iabfunction { leaf seGwConfiguration { description "configuration of security gateway (SeGW) used for IAB-node to establish secure connection as - specified in TS 28.315 clause 5.4."; + specified in TS 28.315."; type inet:host; } @@ -91,15 +91,14 @@ module _3gpp-nr-nrm-iabfunction { leaf scsConfiguration { description "configuration of software configuration server (SCS) used for IAB-node to establish connection - to SCS as specified in TS 28.315 clause 5.5"; + to SCS as specified in TS 28.315."; type inet:host; } } grouping locationInfoGrp { - description "This IOC contains 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 data type contains location information + of mobile NR node (e.g., IAB-node)."; leaf gNBId { type int64 { range "0..4294967295"; } @@ -135,13 +134,16 @@ module _3gpp-nr-nrm-iabfunction { } } - grouping IabSubTree { - description "Contains classes that manage IAB function management"; + grouping IABGrp { + description "IAB-node architecture is specified in TS 38.401 [4], IAB-node + consists of IAB-DU and IAB-UE functions, all functions specified for a gNB-DU + are equally applicable for an IAB-DU. This IOC defines the configuration + information for the IAB-DU"; - list OAMIPConfig { - description "This IOC represents the IAB node Configuration - parameters. It includes attributes inherited from - Top IOC (defined in 3GPP TS 28.622)."; + list mnrOamIPConfig { + description "It is IP configutation for OAM connectivity used IAB-node + to establish connection with management system as specified + in TS 28.314[x] clause 6.1.2"; key id; uses top3gpp:Top_Grp ; @@ -150,10 +152,10 @@ module _3gpp-nr-nrm-iabfunction { } } - list IabLocation { - description "This IOC represents the IAB node location information. - It includes attributes inherited from - Top IOC (defined in 3GPP TS 28.622)."; + 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[x] clause 6.1.2 and TS 28.531 [26] clause 5.1.27"; key id; uses top3gpp:Top_Grp ; @@ -162,4 +164,20 @@ module _3gpp-nr-nrm-iabfunction { } } } + grouping IabSubTree { + description "Contains classes that manage IAB function management"; + + list IAB { + description "IAB-node architecture is specified in TS 38.401 [4], IAB-node + consists of IAB-DU and IAB-UE functions, all functions specified for a gNB-DU + are equally applicable for an IAB-DU. This IOC defines the configuration + information for the IAB-DU"; + + key id; + uses top3gpp:Top_Grp ; + container attributes { + uses IABGrp ; + } + } + } } \ No newline at end of file -- GitLab From 9cfda4ba330f5f0df268a467910ead4e72de65f7 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Thu, 7 Aug 2025 14:33:05 +0000 Subject: [PATCH 28/52] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 997159c7f..cc1655f1d 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -136,9 +136,9 @@ module _3gpp-nr-nrm-iabfunction { grouping IABGrp { description "IAB-node architecture is specified in TS 38.401 [4], IAB-node - consists of IAB-DU and IAB-UE functions, all functions specified for a gNB-DU - are equally applicable for an IAB-DU. This IOC defines the configuration - information for the IAB-DU"; + consists of IAB-DU and IAB-UE functions, all functions specified for + a gNB-DU are equally applicable for an IAB-DU. This IOC defines + the configuration information for the IAB-DU"; list mnrOamIPConfig { description "It is IP configutation for OAM connectivity used IAB-node @@ -168,10 +168,10 @@ module _3gpp-nr-nrm-iabfunction { description "Contains classes that manage IAB function management"; list IAB { - description "IAB-node architecture is specified in TS 38.401 [4], IAB-node - consists of IAB-DU and IAB-UE functions, all functions specified for a gNB-DU - are equally applicable for an IAB-DU. This IOC defines the configuration - information for the IAB-DU"; + description "IAB-node architecture is specified in TS 38.401 [4], + IAB-node consists of IAB-DU and IAB-UE functions, all functions + specified for a gNB-DU are equally applicable for an IAB-DU. + This IOC defines the configuration information for the IAB-DU"; key id; uses top3gpp:Top_Grp ; -- GitLab From 01483bd67a660d0979fd2af748136e1fe1fc57ca Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Thu, 7 Aug 2025 14:48:01 +0000 Subject: [PATCH 29/52] Edit _3gpp-nr-nrm-gnbdufunction.yang --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 5f9de8da5..a1994f124 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -216,6 +216,8 @@ module _3gpp-nr-nrm-gnbdufunction { NRECMappingRule contained by parent, e.g. ManagedElement or SubNetwork, applies."; } + leaf iABRef { + type types3gpp:DistinguishedName; } -- GitLab From b883e65f38f966367a4b94464c44fb9498df34b4 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Thu, 7 Aug 2025 15:10:31 +0000 Subject: [PATCH 30/52] Edit _3gpp-nr-nrm-gnbdufunction.yang --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index a1994f124..aaa6d212a 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -218,6 +218,7 @@ module _3gpp-nr-nrm-gnbdufunction { } leaf iABRef { type types3gpp:DistinguishedName; + } } -- GitLab From dcbf21dff6bec0323f90a1ce2992f1457005c4b3 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Thu, 7 Aug 2025 15:20:03 +0000 Subject: [PATCH 31/52] Edit _3gpp-nr-nrm-gnbdufunction.yang --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index aaa6d212a..9585ecd93 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -18,6 +18,7 @@ module _3gpp-nr-nrm-gnbdufunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-08-07 { reference "CR-000x"; } revision 2025-05-07 { reference "CR-1527 CR-1548"; } revision 2025-02-05 { reference CR-1441; } revision 2024-02-24 { reference CR-1218; } -- GitLab From 2571e0e871cf3554a81cb61048ca3b773eeef07d Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Thu, 7 Aug 2025 16:00:00 +0000 Subject: [PATCH 32/52] Edit _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index cc1655f1d..acc99261d 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -96,7 +96,7 @@ module _3gpp-nr-nrm-iabfunction { } } - grouping locationInfoGrp { + grouping LocationInfoGrp { description "This data type contains location information of mobile NR node (e.g., IAB-node)."; @@ -135,7 +135,7 @@ module _3gpp-nr-nrm-iabfunction { } grouping IABGrp { - description "IAB-node architecture is specified in TS 38.401 [4], IAB-node + description "IAB-node architecture is specified in TS 38.401, IAB-node consists of IAB-DU and IAB-UE functions, all functions specified for a gNB-DU are equally applicable for an IAB-DU. This IOC defines the configuration information for the IAB-DU"; @@ -146,29 +146,23 @@ module _3gpp-nr-nrm-iabfunction { in TS 28.314[x] clause 6.1.2"; key id; - uses top3gpp:Top_Grp ; - container attributes { - uses MnrOamIPConfigGrp ; - } + uses 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[x] clause 6.1.2 and TS 28.531 [26] clause 5.1.27"; + TS 28.314 clause 6.1.2 and TS 28.531 clause 5.1.27"; key id; - uses top3gpp:Top_Grp ; - container attributes { - uses locationInfoGrp; - } + uses locationInfoGrp; } } grouping IabSubTree { description "Contains classes that manage IAB function management"; list IAB { - description "IAB-node architecture is specified in TS 38.401 [4], + description "IAB-node architecture is specified in TS 38.401, IAB-node consists of IAB-DU and IAB-UE functions, all functions specified for a gNB-DU are equally applicable for an IAB-DU. This IOC defines the configuration information for the IAB-DU"; -- GitLab From 0215d79ba92a50759ec3ea2ffb8ccdbd15d39091 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Thu, 7 Aug 2025 16:04:44 +0000 Subject: [PATCH 33/52] Update file _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index acc99261d..6c24250e7 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -146,6 +146,7 @@ module _3gpp-nr-nrm-iabfunction { in TS 28.314[x] clause 6.1.2"; key id; + leaf id { type uint32; } uses MnrOamIPConfigGrp ; } @@ -155,6 +156,7 @@ module _3gpp-nr-nrm-iabfunction { TS 28.314 clause 6.1.2 and TS 28.531 clause 5.1.27"; key id; + leaf id { type uint32; } uses locationInfoGrp; } } -- GitLab From 587d4d1623a227b407080b858128ce4bb6446b5e Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Thu, 7 Aug 2025 16:07:17 +0000 Subject: [PATCH 34/52] Update file _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 6c24250e7..dca6fa6e8 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -157,7 +157,7 @@ module _3gpp-nr-nrm-iabfunction { key id; leaf id { type uint32; } - uses locationInfoGrp; + uses LocationInfoGrp; } } grouping IabSubTree { -- GitLab From ef36aad536dc2b7a231303b06b6545552ba13e07 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Thu, 7 Aug 2025 16:24:30 +0000 Subject: [PATCH 35/52] Update file _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index dca6fa6e8..1865b3cc7 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -19,9 +19,9 @@ module _3gpp-nr-nrm-iabfunction { revision 2025-08-07 { reference "CR-000x"; } grouping CaraConfigurationGrp { - description "This data type represents the configuration used for IAB-node - to perform certificate enrolment procedure with Certification Authority - server (CA/RA) as specified in TS 28.315 clause 5.3"; + description "This data type represents the configuration used for mobile + NR node (e.g., IAB-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; @@ -72,9 +72,8 @@ module _3gpp-nr-nrm-iabfunction { Configuration of software configuration server (SCS)"; list caraConfiguration { - description "configuration used for - IAB-node to perform certificate enrolment procedure as specified - in TS 28.315."; + 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; @@ -82,16 +81,16 @@ module _3gpp-nr-nrm-iabfunction { leaf seGwConfiguration { description "configuration of security - gateway (SeGW) used for IAB-node to establish secure connection as - specified in TS 28.315."; + 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 IAB-node to establish connection - to SCS as specified in TS 28.315."; + 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; } } @@ -138,7 +137,8 @@ module _3gpp-nr-nrm-iabfunction { description "IAB-node architecture is specified in TS 38.401, IAB-node consists of IAB-DU and IAB-UE functions, all functions specified for a gNB-DU are equally applicable for an IAB-DU. This IOC defines - the configuration information for the IAB-DU"; + the configuration information for the IAB-DU, it is name contained + by SubNetwork or ManagedElement"; list mnrOamIPConfig { description "It is IP configutation for OAM connectivity used IAB-node -- GitLab From 3fb29d8b066dff9dcc12a92b022bf682e946ff4f Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Fri, 8 Aug 2025 14:34:19 +0000 Subject: [PATCH 36/52] Update 2 files - /yang-models/_3gpp-common-managed-element.yang - /yang-models/_3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-common-managed-element.yang | 5 ++--- yang-models/_3gpp-nr-nrm-iabfunction.yang | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index a62e29c53..ef6abc2e5 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -16,7 +16,7 @@ module _3gpp-common-managed-element { import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; } import _3gpp-nr-nrm-mwab { prefix mwab3gpp; } - import _3gpp-nr-nrm-iabfunction { prefix iab3gpp; } + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -339,7 +339,6 @@ module _3gpp-common-managed-element { if-feature MWABUnderManagedElement ; } - uses iab3gpp:IabSubTree { - } + } } diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 1865b3cc7..f6fd869af 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -7,6 +7,8 @@ module _3gpp-nr-nrm-iabfunction { 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"; @@ -176,4 +178,22 @@ module _3gpp-nr-nrm-iabfunction { } } } + + feature IABUnderManagedElement { + description "The IAB shall be available under ManagedElement"; + } + + augment /me3gpp:ManagedElement { + if-feature IABUnderManagedElement; + uses IabSubTree; + } + + feature IABUnderSubNetwork { + description "The IAB shall be available under SubNetwork"; + } + + augment /subnet3gpp:SubNetwork { + if-feature IABUnderSubNetwork; + uses IabSubTree; + } } \ No newline at end of file -- GitLab From 72308d34481f890a9f50dbf9d23ee99bb9ea30d8 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Fri, 8 Aug 2025 14:42:11 +0000 Subject: [PATCH 37/52] Update file _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 3 --- 1 file changed, 3 deletions(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index ef6abc2e5..c295f2908 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -17,7 +17,6 @@ module _3gpp-common-managed-element { import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; } import _3gpp-nr-nrm-mwab { prefix mwab3gpp; } - organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -38,7 +37,6 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2025-08-07 { reference "CR-000x"; } revision 2025-04-25 { reference "CR-0532 CR0541" ; } revision 2025-03-25 { reference "CR-0516"; } revision 2024-10-01 { reference "CR-0437,CR-0438" ; } @@ -339,6 +337,5 @@ module _3gpp-common-managed-element { if-feature MWABUnderManagedElement ; } - } } -- GitLab From 39a85565b9edd2a586cb3d0d027710381b55a4e7 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Fri, 8 Aug 2025 14:45:07 +0000 Subject: [PATCH 38/52] Update file _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index c295f2908..70e53be99 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -336,6 +336,5 @@ module _3gpp-common-managed-element { uses mwab3gpp:MWABSubTree { if-feature MWABUnderManagedElement ; } - } } -- GitLab From 151c30e08de135800c9d90e6f1d9c9e2d8b96209 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Fri, 8 Aug 2025 15:00:29 +0000 Subject: [PATCH 39/52] Update file _3gpp-nr-nrm-gnbdufunction.yang --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 9585ecd93..f17a4c333 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -219,6 +219,7 @@ module _3gpp-nr-nrm-gnbdufunction { } leaf iABRef { type types3gpp:DistinguishedName; + description "DN of the referenced IAB." } } -- GitLab From 9b72e881a879736460c4991f6a9ae08bbecea865 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Fri, 8 Aug 2025 15:03:47 +0000 Subject: [PATCH 40/52] Update file _3gpp-nr-nrm-gnbdufunction.yang --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index f17a4c333..c895bdf76 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -219,7 +219,7 @@ module _3gpp-nr-nrm-gnbdufunction { } leaf iABRef { type types3gpp:DistinguishedName; - description "DN of the referenced IAB." + description "DN of the referenced IAB." ; } } -- GitLab From a0e6ce0e6763631aa8ab794c1f150456964a4415 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Mon, 11 Aug 2025 15:15:36 +0000 Subject: [PATCH 41/52] Update file _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 25 ++++++++++------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index f6fd869af..3ab3eaac9 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 { Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541; 3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 33.310, - IETF RFC 6712"; + IETF RFC 9811"; revision 2025-08-07 { reference "CR-000x"; } @@ -32,10 +32,11 @@ module _3gpp-nr-nrm-iabfunction { leaf portNumber { type inet:port-number; - description "This parameter specifies the port number used by CMP - server. The port for HTTP/HTTPSs transfer of CMP messages is not - explicitly given in RFC 6712. If it is not present, the port number - use the port assigned by IANA (Internet Assigned Numbers Authority)."; + 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. + If it is not present, the port number use the port assigned + by IANA (Internet Assigned Numbers Authority)."; } leaf path { @@ -136,11 +137,9 @@ module _3gpp-nr-nrm-iabfunction { } grouping IABGrp { - description "IAB-node architecture is specified in TS 38.401, IAB-node - consists of IAB-DU and IAB-UE functions, all functions specified for - a gNB-DU are equally applicable for an IAB-DU. This IOC defines - the configuration information for the IAB-DU, it is name contained - by SubNetwork or ManagedElement"; + description "IAB-node architecture is specified in TS 38.401. This IOC + defines the configuration information for the IAB management, it is name + contained by SubNetwork or ManagedElement"; list mnrOamIPConfig { description "It is IP configutation for OAM connectivity used IAB-node @@ -166,10 +165,8 @@ module _3gpp-nr-nrm-iabfunction { description "Contains classes that manage IAB function management"; list IAB { - description "IAB-node architecture is specified in TS 38.401, - IAB-node consists of IAB-DU and IAB-UE functions, all functions - specified for a gNB-DU are equally applicable for an IAB-DU. - This IOC defines the configuration information for the IAB-DU"; + description "IAB-node architecture is specified in TS 38.401. + This IOC defines the configuration information for the IAB management"; key id; uses top3gpp:Top_Grp ; -- GitLab From fce7872b8956258d9c17b7c1ebb3089ed5cf050c Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Wed, 13 Aug 2025 20:03:04 +0000 Subject: [PATCH 42/52] Update file _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 3ab3eaac9..fdb6a4e68 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -34,9 +34,9 @@ module _3gpp-nr-nrm-iabfunction { 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. - If it is not present, the port number use the port assigned - by IANA (Internet Assigned Numbers Authority)."; + 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 { -- GitLab From d0bf5eb9b8c6cf62544f5b856569edc9d4eb683d Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Fri, 15 Aug 2025 14:54:13 +0000 Subject: [PATCH 43/52] Update 2 files - /yang-models/_3gpp-nr-nrm-gnbdufunction.yang - /yang-models/_3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 2 +- yang-models/_3gpp-nr-nrm-iabfunction.yang | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index c895bdf76..dbe336331 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -18,7 +18,7 @@ module _3gpp-nr-nrm-gnbdufunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-08-07 { reference "CR-000x"; } + revision 2025-08-15 { reference "CR-1598"; } revision 2025-05-07 { reference "CR-1527 CR-1548"; } revision 2025-02-05 { reference CR-1441; } revision 2024-02-24 { reference CR-1218; } diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index fdb6a4e68..21a6e1ef7 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -18,7 +18,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-08-07 { reference "CR-000x"; } + revision 2025-08-15 { reference "CR-1598"; } grouping CaraConfigurationGrp { description "This data type represents the configuration used for mobile @@ -27,7 +27,7 @@ module _3gpp-nr-nrm-iabfunction { leaf caraAddress { type inet:host; - description "IP address or FQDN of Cara server"; + description "IP address or FQDN of CA/RA server"; } leaf portNumber { -- GitLab From 3db9f1ad1f3fb5d5cf09053f14fa226c47664117 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Wed, 27 Aug 2025 10:34:59 +0000 Subject: [PATCH 44/52] Update file _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 21a6e1ef7..e3a81256b 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -133,6 +133,10 @@ module _3gpp-nr-nrm-iabfunction { 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 is connected"; + } + leaf geoArea { + type inet:GeoArea; + description "It specifies geographical area of mobile NR node."; } } -- GitLab From 23fb5ffcef61be6000ae85f4dabec567a60cf610 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Wed, 27 Aug 2025 11:05:35 +0000 Subject: [PATCH 45/52] Update file _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 e3a81256b..3b4494084 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -135,7 +135,7 @@ module _3gpp-nr-nrm-iabfunction { to the cells where IAB-MT is connected"; } leaf geoArea { - type inet:GeoArea; + type types3gpp:GeoArea; description "It specifies geographical area of mobile NR node."; } } -- GitLab From 31b06af943520ae15100fb517819ba71a9a09863 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Wed, 27 Aug 2025 11:11:06 +0000 Subject: [PATCH 46/52] Update file _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 3b4494084..cab0a9046 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -135,7 +135,7 @@ module _3gpp-nr-nrm-iabfunction { to the cells where IAB-MT is connected"; } leaf geoArea { - type types3gpp:GeoArea; + type types3gpp:GeoAreaGrp; description "It specifies geographical area of mobile NR node."; } } -- GitLab From c786b4fc0610b4dc8a754baa804f340173db3481 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Wed, 27 Aug 2025 11:21:12 +0000 Subject: [PATCH 47/52] Update file _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index cab0a9046..713c8f3ad 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -111,18 +111,18 @@ module _3gpp-nr-nrm-iabfunction { list pLMNId { uses types3gpp:PLMNId; max-elements 1; - description "The PLMN ID where IAB-MT is connected to"; + 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 is connected to."; + 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 is + description "It is TAC pertaining to the cells where IAB-MT or MWAB-UE is connected."; } @@ -132,11 +132,12 @@ module _3gpp-nr-nrm-iabfunction { 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 is connected"; + to the cells where IAB-MT or MWAB-UE is connected"; } leaf geoArea { type types3gpp:GeoAreaGrp; - description "It specifies geographical area of mobile NR node."; + description "It specifies geographical area of mobile NR node + (e.g., IAB-node or MWAB)."; } } -- GitLab From 1457c2e095cf5b3744a8da47f21555a80c1d1df2 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Wed, 27 Aug 2025 11:29:53 +0000 Subject: [PATCH 48/52] Update file _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 713c8f3ad..34208de44 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -117,7 +117,8 @@ module _3gpp-nr-nrm-iabfunction { leaf cellLocalId { type int32 { range "0..16383"; } - description "Identifies an NR cell where IAB-MT or MWAB-UE is connected to."; + description "Identifies an NR cell where IAB-MT or MWAB-UE + is connected to."; } leaf nRTAC { -- GitLab From 96987c824ad168928b8d441142e478b3b4a1178c Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Wed, 27 Aug 2025 11:31:24 +0000 Subject: [PATCH 49/52] Update file _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 34208de44..224279a36 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -136,7 +136,7 @@ module _3gpp-nr-nrm-iabfunction { to the cells where IAB-MT or MWAB-UE is connected"; } leaf geoArea { - type types3gpp:GeoAreaGrp; + type types3gpp:GeoArea; description "It specifies geographical area of mobile NR node (e.g., IAB-node or MWAB)."; } -- GitLab From b4086f859c6764bd635b475d334770784810a721 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Wed, 27 Aug 2025 11:33:18 +0000 Subject: [PATCH 50/52] Update file _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 224279a36..34208de44 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -136,7 +136,7 @@ module _3gpp-nr-nrm-iabfunction { to the cells where IAB-MT or MWAB-UE is connected"; } leaf geoArea { - type types3gpp:GeoArea; + type types3gpp:GeoAreaGrp; description "It specifies geographical area of mobile NR node (e.g., IAB-node or MWAB)."; } -- GitLab From 952298eeae51c690adb0dc2325aed0a43c7b19c1 Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Wed, 27 Aug 2025 11:48:54 +0000 Subject: [PATCH 51/52] Update file _3gpp-nr-nrm-iabfunction.yang --- yang-models/_3gpp-nr-nrm-iabfunction.yang | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang index 34208de44..51bf8f2a1 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -135,8 +135,11 @@ module _3gpp-nr-nrm-iabfunction { 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"; } - leaf geoArea { - type types3gpp:GeoAreaGrp; + 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)."; } -- GitLab From 61e34a459d20ead7f6c13c98f27b0cdf80e4b6db Mon Sep 17 00:00:00 2001 From: Junfeng Wang Date: Wed, 27 Aug 2025 11:50:55 +0000 Subject: [PATCH 52/52] Update file _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 51bf8f2a1..12592ba49 100644 --- a/yang-models/_3gpp-nr-nrm-iabfunction.yang +++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang @@ -135,7 +135,7 @@ module _3gpp-nr-nrm-iabfunction { 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 { + list geoArea { uses types3gpp:GeoAreaGrp; key idx; leaf idx {type string;} -- GitLab